Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched to use more flexible write instead of print.

Browse Source
This commit is contained in:
Bruce Hill 2017-09-15 04:03:42 +00:00
parent 13490a34c8
commit bf01888279
3 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core.nom
View File

@ -147,7 +147,7 @@ rule "%a != %b":
lua expr "((vars.a ~= vars.b) or not utils.equivalent(vars.a, vars.b))" lua expr "((vars.a ~= vars.b) or not utils.equivalent(vars.a, vars.b))"
macro "say %str": macro "say %str":
".."|print(utils.repr(\%str as lua expr\)) ".."|compiler:writeln(utils.repr(\%str as lua expr\))
# Control flow # Control flow
rule "do %action": rule "do %action":
@ -331,7 +331,7 @@ rule "restrict %fn to within %whitelist":
| if fn_info == nil then | if fn_info == nil then
| compiler:error("Undefined function: "..tostring(fn)) | compiler:error("Undefined function: "..tostring(fn))
| elseif not compiler:check_permission(fn) then | elseif not compiler:check_permission(fn) then
| print("You do not have permission to restrict function: "..tostring(fn)) | compiler:writeln("You do not have permission to restrict function: "..tostring(fn))
| else | else
| compiler.defs[fn].whiteset = whiteset | compiler.defs[fn].whiteset = whiteset
| end | end
@ -351,9 +351,9 @@ rule "allow %whitelist to use %fn":
| if fn_info == nil then | if fn_info == nil then
| compiler:error("Undefined function: "..tostring(fn)) | compiler:error("Undefined function: "..tostring(fn))
| elseif fn_info.whiteset == nil then | elseif fn_info.whiteset == nil then
| print("Function is already allowed by everyone: "..tostring(fn)) | compiler:writeln("Function is already allowed by everyone: "..tostring(fn))
| elseif not compiler:check_permission(fn) then | elseif not compiler:check_permission(fn) then
| print("You do not have permission to grant permissions for function: "..tostring(fn)) | compiler:writeln("You do not have permission to grant permissions for function: "..tostring(fn))
| else | else
| for _,w in ipairs(whitelist) do | for _,w in ipairs(whitelist) do
| fn_info.whiteset[w] = true | fn_info.whiteset[w] = true
@ -375,9 +375,9 @@ rule "forbid %blacklist to use %fn":
| if fn_info == nil then | if fn_info == nil then
| compiler:error("Undefined function: "..tostring(fn)) | compiler:error("Undefined function: "..tostring(fn))
| elseif fn_info.whiteset == nil then | elseif fn_info.whiteset == nil then
| print("Cannot remove items from a whitelist when there is no whitelist on function: "..tostring(fn)) | compiler:writeln("Cannot remove items from a whitelist when there is no whitelist on function: "..tostring(fn))
| elseif not compiler:check_permission(fn) then | elseif not compiler:check_permission(fn) then
| print("You do not have permission to restrict function: "..tostring(fn)) | compiler:writeln("You do not have permission to restrict function: "..tostring(fn))
| else | else
| for _,b in ipairs(blacklist) do fn_info.whiteset[b] = nil end | for _,b in ipairs(blacklist) do fn_info.whiteset[b] = nil end
| end | end

44
nomsu.lua
View File

@ -136,6 +136,10 @@ local NomsuCompiler
do do
local _class_0 local _class_0
local _base_0 = { local _base_0 = {
writeln = function(self, ...)
self:write(...)
return self:write("\n")
end,
call = function(self, fn_name, ...) call = function(self, fn_name, ...)
local fn_info = self.defs[fn_name] local fn_info = self.defs[fn_name]
if fn_info == nil then if fn_info == nil then
@ -159,7 +163,7 @@ do
args = _tbl_0 args = _tbl_0
end end
if self.debug then if self.debug then
print("Calling " .. tostring(fn_name) .. " with args: " .. tostring(utils.repr(args))) self:writeln("Calling " .. tostring(fn_name) .. " with args: " .. tostring(utils.repr(args)))
end end
local ret = fn(self, args) local ret = fn(self, args)
table.remove(self.callstack) table.remove(self.callstack)
@ -184,7 +188,7 @@ do
end, end,
def = function(self, spec, fn) def = function(self, spec, fn)
if self.debug then if self.debug then
print("Defining rule: " .. tostring(spec)) self:writeln("Defining rule: " .. tostring(spec))
end end
local invocations, arg_names = self:get_invocations(spec) local invocations, arg_names = self:get_invocations(spec)
local fn_info = { local fn_info = {
@ -247,17 +251,17 @@ do
end, end,
run = function(self, text) run = function(self, text)
if self.debug then if self.debug then
print("RUNNING TEXT:\n" .. tostring(text)) self:writeln("RUNNING TEXT:\n" .. tostring(text))
end end
local code, retval = self:compile(text) local code, retval = self:compile(text)
if self.debug then if self.debug then
print("\nGENERATED LUA CODE:\n" .. tostring(code)) self:writeln("\nGENERATED LUA CODE:\n" .. tostring(code))
end end
return retval return retval
end, end,
parse = function(self, str) parse = function(self, str)
if self.debug then if self.debug then
print("PARSING:\n" .. tostring(str)) self:writeln("PARSING:\n" .. tostring(str))
end end
local lingo = [=[ file <- ({ {| %blank_line* {:body: block :} %blank_line* (errors)? |} }) -> File local lingo = [=[ file <- ({ {| %blank_line* {:body: block :} %blank_line* (errors)? |} }) -> File
errors <- (({.+}) => error_handler) errors <- (({.+}) => error_handler)
@ -320,7 +324,7 @@ do
lingo = make_parser(lingo) lingo = make_parser(lingo)
local tree = lingo:match(str:gsub("\r", "") .. "\n") local tree = lingo:match(str:gsub("\r", "") .. "\n")
if self.debug then if self.debug then
print("\nPARSE TREE:") self:writeln("\nPARSE TREE:")
self:print_tree(tree) self:print_tree(tree)
end end
assert(tree, "Failed to parse: " .. tostring(str)) assert(tree, "Failed to parse: " .. tostring(str))
@ -637,7 +641,7 @@ do
for line in coroutine.wrap(function() for line in coroutine.wrap(function()
return self:_yield_tree(tree) return self:_yield_tree(tree)
end) do end) do
print(line) self:writeln(line)
end end
end, end,
stringify_tree = function(self, tree) stringify_tree = function(self, tree)
@ -654,7 +658,7 @@ do
output_file = nil output_file = nil
end end
if self.debug then if self.debug then
print("COMPILING:\n" .. tostring(src)) self:writeln("COMPILING:\n" .. tostring(src))
end end
local tree = self:parse(src) local tree = self:parse(src)
assert(tree, "Tree failed to compile: " .. tostring(src)) assert(tree, "Tree failed to compile: " .. tostring(src))
@ -666,13 +670,13 @@ do
return code, retval return code, retval
end, end,
error = function(self, ...) error = function(self, ...)
print("ERROR!") self:writeln("ERROR!")
print(...) self:writeln(...)
print("Callstack:") self:writeln("Callstack:")
for i = #self.callstack, 1, -1 do for i = #self.callstack, 1, -1 do
print(" " .. tostring(self.callstack[i])) self:writeln(" " .. tostring(self.callstack[i]))
end end
print(" <top level>") self:writeln(" <top level>")
self.callstack = { } self.callstack = { }
return error() return error()
end, end,
@ -756,7 +760,10 @@ do
}) })
self.callstack = { } self.callstack = { }
self.debug = false self.debug = false
return self:initialize_core() self:initialize_core()
self.write = function(self, ...)
return io.write(...)
end
end, end,
__base = _base_0, __base = _base_0,
__name = "NomsuCompiler" __name = "NomsuCompiler"
@ -796,18 +803,15 @@ end
if arg and arg[1] then if arg and arg[1] then
local c = NomsuCompiler() local c = NomsuCompiler()
local input = io.open(arg[1]):read("*a") local input = io.open(arg[1]):read("*a")
local _print = print local _write = c.write
local _io_write = io.write
if arg[2] == "-" then if arg[2] == "-" then
local nop c.write = function() end
nop = function() end
print, io.write = nop, nop
end end
local code, retval = c:compile(input) local code, retval = c:compile(input)
c.write = _write
if arg[2] then if arg[2] then
local output local output
if arg[2] == "-" then if arg[2] == "-" then
print, io.write = _print, _io_write
output = io.output() output = io.output()
else else
output = io.open(arg[2], 'w') output = io.open(arg[2], 'w')

45
nomsu.moon
View File

@ -96,6 +96,11 @@ class NomsuCompiler
@callstack = {} @callstack = {}
@debug = false @debug = false
@initialize_core! @initialize_core!
@write = (...)=> io.write(...)
writeln:(...)=>
@write(...)
@write("\n")
call: (fn_name,...)=> call: (fn_name,...)=>
fn_info = @defs[fn_name] fn_info = @defs[fn_name]
@ -109,7 +114,7 @@ class NomsuCompiler
{:fn, :arg_names} = fn_info {:fn, :arg_names} = fn_info
args = {name, select(i,...) for i,name in ipairs(arg_names[fn_name])} args = {name, select(i,...) for i,name in ipairs(arg_names[fn_name])}
if @debug if @debug
print "Calling #{fn_name} with args: #{utils.repr(args)}" @writeln "Calling #{fn_name} with args: #{utils.repr(args)}"
ret = fn(self, args) ret = fn(self, args)
table.remove @callstack table.remove @callstack
return ret return ret
@ -126,7 +131,7 @@ class NomsuCompiler
def: (spec, fn)=> def: (spec, fn)=>
if @debug if @debug
print "Defining rule: #{spec}" @writeln "Defining rule: #{spec}"
invocations,arg_names = @get_invocations spec invocations,arg_names = @get_invocations spec
fn_info = {:fn, :arg_names, :invocations, is_macro:false} fn_info = {:fn, :arg_names, :invocations, is_macro:false}
for invocation in *invocations for invocation in *invocations
@ -156,16 +161,16 @@ class NomsuCompiler
run: (text)=> run: (text)=>
if @debug if @debug
print "RUNNING TEXT:\n#{text}" @writeln "RUNNING TEXT:\n#{text}"
-- This will execute each chunk as it goes along -- This will execute each chunk as it goes along
code, retval = @compile(text) code, retval = @compile(text)
if @debug if @debug
print "\nGENERATED LUA CODE:\n#{code}" @writeln "\nGENERATED LUA CODE:\n#{code}"
return retval return retval
parse: (str)=> parse: (str)=>
if @debug if @debug
print("PARSING:\n#{str}") @writeln("PARSING:\n#{str}")
lingo = [=[ lingo = [=[
file <- ({ {| %blank_line* {:body: block :} %blank_line* (errors)? |} }) -> File file <- ({ {| %blank_line* {:body: block :} %blank_line* (errors)? |} }) -> File
errors <- (({.+}) => error_handler) errors <- (({.+}) => error_handler)
@ -229,7 +234,7 @@ class NomsuCompiler
tree = lingo\match(str\gsub("\r","").."\n") tree = lingo\match(str\gsub("\r","").."\n")
if @debug if @debug
print("\nPARSE TREE:") @writeln("\nPARSE TREE:")
@print_tree(tree) @print_tree(tree)
assert tree, "Failed to parse: #{str}" assert tree, "Failed to parse: #{str}"
return tree return tree
@ -470,7 +475,7 @@ class NomsuCompiler
print_tree:(tree)=> print_tree:(tree)=>
for line in coroutine.wrap(-> @_yield_tree(tree)) for line in coroutine.wrap(-> @_yield_tree(tree))
print(line) @writeln(line)
stringify_tree:(tree)=> stringify_tree:(tree)=>
result = {} result = {}
@ -480,7 +485,7 @@ class NomsuCompiler
compile: (src, output_file=nil)=> compile: (src, output_file=nil)=>
if @debug if @debug
print "COMPILING:\n#{src}" @writeln "COMPILING:\n#{src}"
tree = @parse(src) tree = @parse(src)
assert tree, "Tree failed to compile: #{src}" assert tree, "Tree failed to compile: #{src}"
code, retval = @tree_to_lua(tree) code, retval = @tree_to_lua(tree)
@ -490,12 +495,12 @@ class NomsuCompiler
return code, retval return code, retval
error: (...)=> error: (...)=>
print "ERROR!" @writeln "ERROR!"
print(...) @writeln(...)
print("Callstack:") @writeln("Callstack:")
for i=#@callstack,1,-1 for i=#@callstack,1,-1
print " #{@callstack[i]}" @writeln " #{@callstack[i]}"
print " <top level>" @writeln " <top level>"
@callstack = {} @callstack = {}
error! error!
@ -567,19 +572,15 @@ if arg and arg[1]
c = NomsuCompiler() c = NomsuCompiler()
--c.debug = true --c.debug = true
input = io.open(arg[1])\read("*a") input = io.open(arg[1])\read("*a")
-- Kinda hacky, if run via "./nomsu.moon file.nom -", then silence print and io.write -- If run via "./nomsu.moon file.nom -", then silence output and print generated
-- during execution and re-enable them to print out the generated source code -- source code instead.
_print = print _write = c.write
_io_write = io.write
if arg[2] == "-" if arg[2] == "-"
export print c.write = ->
nop = ->
print, io.write = nop, nop
code, retval = c\compile(input) code, retval = c\compile(input)
c.write = _write -- put it back
if arg[2] if arg[2]
output = if arg[2] == "-" output = if arg[2] == "-"
export print
print, io.write = _print, _io_write
io.output() io.output()
else io.open(arg[2], 'w') else io.open(arg[2], 'w')