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

Overhaul of command-line API. It's a bit cleaner now.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-28 17:08:28 -07:00
parent d13a945b5f
commit df9a82a971
6 changed files with 197 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compile_lib.sh
View File

@ -18,12 +18,12 @@ fi
for file in core/*.nom; do
printf "Compiling $file ..."
./nomsu.moon -c $file
./nomsu.moon $file -o "$(basename $file .nom).lua"
echo "done."
done
for file in lib/*.nom; do
printf "Compiling $file ..."
./nomsu.moon -c $file
./nomsu.moon $file -o "$(basename $file .nom).lua"
echo "done."
done
#for file in tests/*.nom; do

152
nomsu.lua
View File

@ -46,6 +46,22 @@ FILE_CACHE = setmetatable({ }, {
return contents
end
})
local iterate_single
iterate_single = function(item, prev)
if item == prev then
return nil
else
return item
end
end
local all_files
all_files = function(path)
if path:match("%.nom$") or path:match("%.lua$") then
return iterate_single, path
end
path = path:gsub("\\", "\\\\"):gsub("`", ""):gsub('"', '\\"'):gsub("$", "")
return io.popen("find \"" .. path .. "\" -type f -name \"*.nom\""):lines()
end
local line_counter = re.compile([[ lines <- {| line (%nl line)* |}
line <- {} (!%nl .)*
]], {
@ -361,12 +377,12 @@ do
end
return self:run_lua(lua)
end,
run_file = function(self, path, compile_fn)
run_file = function(self, filename, compile_fn)
if compile_fn == nil then
compile_fn = nil
end
local ret = nil
for filename in io.popen("find " .. path .. " -type f"):lines() do
for filename in all_files(filename) do
local _continue_0 = false
repeat
if filename:match("%.lua$") then
@ -387,8 +403,6 @@ do
error("File does not exist: " .. tostring(filename), 0)
end
ret = self:run(Nomsu(Source(filename), file), compile_fn)
_continue_0 = true
break
else
error("Invalid filetype for " .. tostring(filename), 0)
end
@ -403,24 +417,32 @@ do
use_file = function(self, filename)
local loaded = self.environment.LOADED
if not loaded[filename] then
for i, f in ipairs(self.use_stack) do
if f == filename then
local loop
do
local _accum_0 = { }
local _len_0 = 1
for j = i, #self.use_stack do
_accum_0[_len_0] = self.use_stack[j]
_len_0 = _len_0 + 1
local ret = nil
for filename in all_files(filename) do
if not loaded[filename] then
for i, f in ipairs(self.use_stack) do
if f == filename then
local loop
do
local _accum_0 = { }
local _len_0 = 1
for j = i, #self.use_stack do
_accum_0[_len_0] = self.use_stack[j]
_len_0 = _len_0 + 1
end
loop = _accum_0
end
insert(loop, filename)
error("Circular import, this loops forever: " .. tostring(concat(loop, " -> ")))
end
loop = _accum_0
end
insert(loop, filename)
error("Circular import, this loops forever: " .. tostring(concat(loop, " -> ")))
insert(self.use_stack, filename)
loaded[filename] = self:run_file(filename) or true
ret = loaded[filename]
remove(self.use_stack)
end
end
insert(self.use_stack, filename)
loaded[filename] = self:run_file(filename) or true
loaded[filename] = ret
end
return loaded[filename]
end,
@ -789,10 +811,10 @@ do
self:define_action("run file %filename", get_line_no(), function(_filename)
return nomsu:run_file(_filename)
end)
return self:define_compile_action("use %filename", get_line_no(), function(self, _filename)
local filename = nomsu:tree_to_value(_filename)
nomsu:use_file(filename)
return Lua.Value(self.source, "nomsu:use_file(" .. tostring(repr(filename)) .. ")")
return self:define_compile_action("use %path", get_line_no(), function(self, _path)
local path = nomsu:tree_to_value(_path)
nomsu:use_file(path)
return Lua(self.source, "nomsu:use_file(" .. tostring(repr(path)) .. ");")
end)
end
}
@ -927,18 +949,34 @@ do
end
if arg and debug_getinfo(2).func ~= require then
colors = require('consolecolors')
local parser = re.compile([[ args <- {| {:flags: flags? :} ({:input: input :} ";" ("-o;"{:output: output :} ";")?)? (";")? |} !.
local parser = re.compile([[ args <- {| {:flags: flags? :} (input ";" (output / print_file)*)? (";")? |} !.
flags <- (({| ({flag} ";")* |}) -> set)
flag <- "-c" / "-i" / "-p" / "-O" / "--help" / "-h" / "-v"
input <- "-" / [^;]+
output <- "-" / [^;]+
flag <- "-i" / "-O" / "-f" / "--help" / "-h" / "-s" / "-p"
input <- {:input: file :}
output <- "-o;" {:output: file :}
print_file <- "-p;" {:print_file: file :}
file <- "-" / [^;]+
]], {
set = set
})
local args = concat(arg, ";") .. ";"
args = parser:match(args) or { }
if not args or not args.flags or args.flags["--help"] or args.flags["-h"] then
print("Usage: lua nomsu.lua [-c] [-i] [-p] [-O] [--help] [input [-o output]]")
print([=[Nomsu Compiler
Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [input [-o output] [-p print_file]]
OPTIONS
-i Run the compiler in interactive mode (REPL)
-O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available)
-f Auto-format the given Nomsu file and print the result.
-s Check the program for syntax errors.
-v Verbose
-h/--help Print this message.
<input> Input file can be "-" to use stdin.
-o <file> Output the compiled Lua file to the given file (use "-" to output to stdout; if outputting to stdout and -p is not specified, -p will default to /dev/null)
-p <file> Print to the specified file instead of stdout.
]=])
os.exit()
end
local nomsu = NomsuCompiler()
@ -999,36 +1037,54 @@ if arg and debug_getinfo(2).func ~= require then
if args.flags["-v"] then
nomsu.debug = true
end
if args.input == "-" then
args.input = "/dev/fd/0"
end
if args.output == nil then
args.output = "/dev/null"
elseif args.output == "-" then
args.output = "/dev/fd/1"
end
nomsu.skip_precompiled = not args.flags["-O"]
if args.input then
if args.flags["-c"] and not args.output then
args.output = args.input:gsub("%.nom", ".lua")
end
local compile_fn = nil
if args.flags["-p"] then
nomsu.environment.print = function() end
compile_fn = function(code)
return io.output():write("local IMMEDIATE = true;\n" .. tostring(code))
end
elseif args.output then
compile_fn = function(code)
return io.open(args.output, 'w'):write("local IMMEDIATE = true;\n" .. tostring(code))
end
if args.output == "/dev/fd/1" and not args.print_file then
args.print_file = "/dev/null"
elseif not args.print_file or args.print_file == "-" then
args.print_file = "/dev/fd/1"
end
if args.input:match(".*%.lua") then
local print_file = io.open(args.print_file, "w")
nomsu.environment.print = function(...)
local N = select("#", ...)
if N > 0 then
print_file:write(tostring(select(1, ...)))
for i = 2, N do
print_file:write('\t', tostring(select(1, ...)))
end
end
print_file:write('\n')
return print_file:flush()
end
local output_file = io.open(args.output, 'w')
compile_fn = function(code)
return output_file:write("local IMMEDIATE = true;\n" .. tostring(code))
end
if args.input:match("%.lua$") then
dofile(args.input)(nomsu, { })
else
if args.input == "-" then
nomsu:run(io.read('a'), compile_fn)
else
nomsu:run_file(args.input, compile_fn)
for input_file in all_files(args.input) do
if args.flags["-s"] then
nomsu:parse(io.open(input_file):read("*a"))
elseif args.flags["-f"] then
local tree = nomsu:parse(io.open(input_file):read("*a"))
output_file:write(tostring(tree:as_nomsu()))
else
nomsu:run_file(input_file, compile_fn)
end
end
end
if args.flags["-p"] then
nomsu.environment.print = print
end
end
if args.flags["-i"] then
if not args.input or args.flags["-i"] then
nomsu:run('use "core"')
while true do
io.write(colored.bright(colored.yellow(">> ")))

120
nomsu.moon
View File

@ -49,6 +49,15 @@ FILE_CACHE = setmetatable {}, {
return contents
}
iterate_single = (item, prev) -> if item == prev then nil else item
all_files = (path)->
-- Sanitize path
if path\match("%.nom$") or path\match("%.lua$")
return iterate_single, path
-- TODO: improve sanitization
path = path\gsub("\\","\\\\")\gsub("`","")\gsub('"','\\"')\gsub("$","")
return io.popen("find \""..path.."\" -type f -name \"*.nom\"")\lines!
line_counter = re.compile([[
lines <- {| line (%nl line)* |}
line <- {} (!%nl .)*
@ -321,9 +330,9 @@ class NomsuCompiler
compile_fn(lua)
return @run_lua(lua)
run_file: (path, compile_fn=nil)=>
run_file: (filename, compile_fn=nil)=>
ret = nil
for filename in io.popen("find "..path.." -type f")\lines!
for filename in all_files(filename)
if filename\match("%.lua$")
file = assert(FILE_CACHE[filename], "Could not find file: #{filename}")
ret = @run_lua(Lua(Source(filename), file))
@ -338,7 +347,6 @@ class NomsuCompiler
if not file
error("File does not exist: #{filename}", 0)
ret = @run(Nomsu(Source(filename), file), compile_fn)
continue
else
error("Invalid filetype for #{filename}", 0)
return ret
@ -346,13 +354,19 @@ class NomsuCompiler
use_file: (filename)=>
loaded = @environment.LOADED
if not loaded[filename]
for i,f in ipairs @use_stack
if f == filename
loop = [@use_stack[j] for j=i,#@use_stack]
insert loop, filename
error("Circular import, this loops forever: #{concat loop, " -> "}")
insert @use_stack, filename
loaded[filename] = @run_file(filename) or true
ret = nil
for filename in all_files(filename)
if not loaded[filename]
for i,f in ipairs @use_stack
if f == filename
loop = [@use_stack[j] for j=i,#@use_stack]
insert loop, filename
error("Circular import, this loops forever: #{concat loop, " -> "}")
insert @use_stack, filename
loaded[filename] = @run_file(filename) or true
ret = loaded[filename]
remove @use_stack
loaded[filename] = ret
return loaded[filename]
run_lua: (lua)=>
@ -638,26 +652,43 @@ class NomsuCompiler
@define_action "run file %filename", get_line_no!, (_filename)->
return nomsu\run_file(_filename)
@define_compile_action "use %filename", get_line_no!, (_filename)=>
filename = nomsu\tree_to_value(_filename)
nomsu\use_file(filename)
return Lua.Value(@source, "nomsu:use_file(#{repr filename})")
@define_compile_action "use %path", get_line_no!, (_path)=>
path = nomsu\tree_to_value(_path)
nomsu\use_file(path)
return Lua(@source, "nomsu:use_file(#{repr path});")
-- Only run this code if this file was run directly with command line arguments, and not require()'d:
if arg and debug_getinfo(2).func != require
export colors
colors = require 'consolecolors'
parser = re.compile([[
args <- {| {:flags: flags? :} ({:input: input :} ";" ("-o;"{:output: output :} ";")?)? (";")? |} !.
args <- {| {:flags: flags? :} (input ";" (output / print_file)*)? (";")? |} !.
flags <- (({| ({flag} ";")* |}) -> set)
flag <- "-c" / "-i" / "-p" / "-O" / "--help" / "-h" / "-v"
input <- "-" / [^;]+
output <- "-" / [^;]+
flag <- "-i" / "-O" / "-f" / "--help" / "-h" / "-s" / "-p"
input <- {:input: file :}
output <- "-o;" {:output: file :}
print_file <- "-p;" {:print_file: file :}
file <- "-" / [^;]+
]], {:set})
args = concat(arg, ";")..";"
args = parser\match(args) or {}
if not args or not args.flags or args.flags["--help"] or args.flags["-h"]
print "Usage: lua nomsu.lua [-c] [-i] [-p] [-O] [--help] [input [-o output]]"
print [=[
Nomsu Compiler
Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [input [-o output] [-p print_file]]
OPTIONS
-i Run the compiler in interactive mode (REPL)
-O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available)
-f Auto-format the given Nomsu file and print the result.
-s Check the program for syntax errors.
-v Verbose
-h/--help Print this message.
<input> Input file can be "-" to use stdin.
-o <file> Output the compiled Lua file to the given file (use "-" to output to stdout; if outputting to stdout and -p is not specified, -p will default to /dev/null)
-p <file> Print to the specified file instead of stdout.
]=]
os.exit!
nomsu = NomsuCompiler!
@ -701,31 +732,46 @@ if arg and debug_getinfo(2).func != require
if args.flags["-v"]
nomsu.debug = true
if args.input == "-" then args.input = "/dev/fd/0" -- stdin
if args.output == nil then args.output = "/dev/null"
elseif args.output == "-" then args.output = "/dev/fd/1" -- stdout
nomsu.skip_precompiled = not args.flags["-O"]
if args.input
-- Read a file or stdin and output either the printouts or the compiled lua
if args.flags["-c"] and not args.output
args.output = args.input\gsub("%.nom", ".lua")
compile_fn = nil
if args.flags["-p"]
nomsu.environment.print = ->
compile_fn = (code)->
io.output!\write("local IMMEDIATE = true;\n"..tostring(code))
elseif args.output
compile_fn = (code)->
io.open(args.output, 'w')\write("local IMMEDIATE = true;\n"..tostring(code))
if args.output == "/dev/fd/1" and not args.print_file
args.print_file = "/dev/null"
elseif not args.print_file or args.print_file == "-"
args.print_file = "/dev/fd/1" -- stdout
if args.input\match(".*%.lua")
print_file = io.open(args.print_file, "w")
nomsu.environment.print = (...)->
N = select("#",...)
if N > 0
print_file\write(tostring(select(1,...)))
for i=2,N
print_file\write('\t',tostring(select(1,...)))
print_file\write('\n')
print_file\flush!
output_file = io.open(args.output, 'w')
compile_fn = (code)->
output_file\write("local IMMEDIATE = true;\n"..tostring(code))
if args.input\match("%.lua$")
dofile(args.input)(nomsu, {})
else
if args.input == "-"
nomsu\run(io.read('a'), compile_fn)
else nomsu\run_file(args.input, compile_fn)
for input_file in all_files(args.input)
-- Check syntax:
if args.flags["-s"]
nomsu\parse(io.open(input_file)\read("*a"))
elseif args.flags["-f"]
tree = nomsu\parse(io.open(input_file)\read("*a"))
output_file\write(tostring(tree\as_nomsu!))
else
nomsu\run_file(input_file, compile_fn)
if args.flags["-p"]
nomsu.environment.print = print
if args.flags["-i"]
if not args.input or args.flags["-i"]
-- REPL
nomsu\run('use "core"')
while true

3
nomsu_tree.lua
View File

@ -359,6 +359,9 @@ Tree("Action", {
nomsu:append(next_space, arg_nomsu)
next_space = "\n.."
end
if next_space == " " and #(tostring(nomsu):match("[^\n]*$")) > MAX_LINE then
next_space = "\n.."
end
end
end
return nomsu

3
nomsu_tree.moon
View File

@ -219,6 +219,9 @@ Tree "Action",
next_space = ""
nomsu\append next_space, arg_nomsu
next_space = "\n.."
if next_space == " " and #(tostring(nomsu)\match("[^\n]*$")) > MAX_LINE
next_space = "\n.."
return nomsu

2
tests/inner/inner.nom Normal file
View File

@ -0,0 +1,2 @@
use "core"
say "Inner directory 'use' test passed."