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

Cleaned up/improved the command line interface, and fixed the

Browse Source 
REPL/autoformatting.
This commit is contained in:
Bruce Hill 2018-06-15 03:11:38 -07:00
parent 5629b81f78
commit 9d6932a872
4 changed files with 131 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -11,8 +11,8 @@ Nomsu's only dependencies are [Lua 5.2 or later](https://www.lua.org/) (tested w
## Usage ## Usage
* To get a nomsu [REPL](https://en.wikipedia.org/wiki/Read-eval-print_loop), simply run `lua nomsu.lua`. * To get a nomsu [REPL](https://en.wikipedia.org/wiki/Read-eval-print_loop), simply run `lua nomsu.lua`.
* To run a .nom file with nomsu code, run `lua nomsu.lua your_file.nom`. Or `lua nomsu.lua -` if reading from stdin. * To run a .nom file with nomsu code, run `lua nomsu.lua your_file.nom`.
* (Advanced/optional) To precompile a .nom file into lua, run `lua nomsu.lua -o <output_filename> <input_file>` to precompile your file into lua (by default, saved at `<your_file>.lua`). If you run the compiler with the "-O" (for Optimized) flag, the compiler will run the precompiled lua files directly, instead of parsing and compiling the .nom files before running them. This is not necessary, but it can speed things up if you precompile a bunch of code that involves macros or compile-time activity. * (Advanced/optional) To precompile a .nom file into lua, run `lua nomsu.lua -c <input_file>` to precompile your file into lua (by default, saved in the same location, but with a `.lua` extension instead of `.nom`). If you run the compiler with the "-O" (for Optimized) flag, the compiler will run the precompiled lua files directly, instead of parsing and compiling the .nom files before running them. This is not necessary, but it can speed things up if you precompile a bunch of code that involves macros or compile-time activity.
* More usage options are avilable via `lua nomsu.lua --help`. * More usage options are avilable via `lua nomsu.lua --help`.
## Layout ## Layout

12
compile_lib.sh
View File

@ -4,13 +4,5 @@
set -e set -e
moonc *.moon moonc *.moon
rm -f core/*.lua lib/*.lua rm -f core/*.lua lib/*.lua
for file in core/*.nom; do luajit ./nomsu.lua -c core lib
printf "Compiling $file ..." echo "done."
luajit ./nomsu.lua -O -o "core/$(basename $file .nom).lua" $file
echo "done."
done
for file in lib/*.nom; do
printf "Compiling $file ..."
luajit ./nomsu.lua -O -o "lib/$(basename $file .nom).lua" $file
echo "done."
done

128
nomsu.lua
View File

@ -316,10 +316,7 @@ do
end end
return tree return tree
end, end,
run = function(self, nomsu_code, compile_fn) run = function(self, nomsu_code)
if compile_fn == nil then
compile_fn = nil
end
local tree = assert(self:parse(nomsu_code)) local tree = assert(self:parse(nomsu_code))
if type(tree) == 'number' then if type(tree) == 'number' then
return nil return nil
@ -327,15 +324,12 @@ do
local lua = self:tree_to_lua(tree):as_statements() local lua = self:tree_to_lua(tree):as_statements()
lua:declare_locals() lua:declare_locals()
lua:prepend("-- File: " .. tostring(nomsu_code.source or "") .. "\n") lua:prepend("-- File: " .. tostring(nomsu_code.source or "") .. "\n")
if compile_fn then if self.compile_fn then
compile_fn(lua) self.compile_fn(lua, nomsu_code.source.filename)
end end
return self:run_lua(lua) return self:run_lua(lua)
end, end,
run_file = function(self, filename, compile_fn) run_file = function(self, filename)
if compile_fn == nil then
compile_fn = nil
end
local loaded = self.environment.LOADED local loaded = self.environment.LOADED
if loaded[filename] then if loaded[filename] then
return loaded[filename] return loaded[filename]
@ -384,7 +378,7 @@ do
if not file then if not file then
error("File does not exist: " .. tostring(filename), 0) error("File does not exist: " .. tostring(filename), 0)
end end
ret = self:run(Nomsu(Source(filename, 1, #file), file), compile_fn) ret = self:run(Nomsu(Source(filename, 1, #file), file))
else else
error("Invalid filetype for " .. tostring(filename), 0) error("Invalid filetype for " .. tostring(filename), 0)
end end
@ -1355,7 +1349,8 @@ if arg and debug_getinfo(2).func ~= require then
/ {:format: ("-f" -> true) :} / {:format: ("-f" -> true) :}
/ {:syntax: ("-s" -> true) :} / {:syntax: ("-s" -> true) :}
/ {:print_file: "-p" ";" {file} :} / {:print_file: "-p" ";" {file} :}
/ {:output_file: "-o" ";" {file} :} / {:compile: ("-c" -> true) :}
/ {:verbose: ("-v" -> true) :}
/ {:help: (("-h" / "--help") -> true) :} / {:help: (("-h" / "--help") -> true) :}
file <- "-" / [^;]+ file <- "-" / [^;]+
]], { ]], {
@ -1368,15 +1363,16 @@ if arg and debug_getinfo(2).func ~= require then
if not args or args.help then if not args or args.help then
print([=[Nomsu Compiler print([=[Nomsu Compiler
Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [-o output] [-p print_file] file1 file2... [-- nomsu args...] Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-v] [-c] [-f] [-s] [--help] [-p print_file] file1 file2... [-- nomsu args...]
OPTIONS OPTIONS
-i Run the compiler in interactive mode (REPL) -i Run the compiler in interactive mode (REPL)
-O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available) -O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available)
-v Verbose: print compiled lua code
-c Compile .nom files into .lua files
-f Auto-format the given Nomsu file and print the result. -f Auto-format the given Nomsu file and print the result.
-s Check the program for syntax errors. -s Check the program for syntax errors.
-h/--help Print this message. -h/--help Print this message.
-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. -p <file> Print to the specified file instead of stdout.
<input> Input file can be "-" to use stdin. <input> Input file can be "-" to use stdin.
]=]) ]=])
@ -1613,8 +1609,6 @@ OPTIONS
print_file = io.stdout print_file = io.stdout
elseif args.print_file then elseif args.print_file then
print_file = io.open(args.print_file, 'w') print_file = io.open(args.print_file, 'w')
elseif args.output_file == '-' then
print_file = nil
else else
print_file = io.stdout print_file = io.stdout
end end
@ -1634,55 +1628,64 @@ OPTIONS
return print_file:flush() return print_file:flush()
end end
end end
local compile_fn local input_files = { }
if args.output_file then local to_run = { }
compile_fn = function(code)
local output_file
if args.output_file == "-" then
output_file = io.stdout
elseif args.output_file then
output_file = io.open(args.output_file, 'w')
end
output_file:write("local IMMEDIATE = true;\n" .. tostring(code))
return output_file:flush()
end
else
compile_fn = nil
end
local parse_errs = { }
local _list_0 = args.inputs local _list_0 = args.inputs
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local input = _list_0[_index_0] local input = _list_0[_index_0]
if args.syntax then for f in all_files(input) do
for input_file in all_files(input) do input_files[#input_files + 1] = f
local err to_run[f] = true
ok, err = pcall(nomsu.parse, nomsu, Nomsu(input_file, io.open(input_file):read("*a"))) end
if not ok then end
insert(parse_errs, err) if args.compile or args.verbose then
elseif print_file then nomsu.compile_fn = function(code, from_file)
print_file:write("Parse succeeded: " .. tostring(input_file) .. "\n") if to_run[from_file] then
print_file:flush() if args.verbose then
io.write(tostring(code), "\n")
end end
if args.compile and from_file:match("%.nom$") then
local output_filename = from_file:gsub("%.nom$", ".lua")
local output_file = io.open(output_filename, 'w')
output_file:write("local IMMEDIATE = true;\n", tostring(code))
output_file:flush()
print(("Compiled %-25s -> %s"):format(from_file, output_filename))
return output_file:close()
end
end
end
else
nomsu.compile_fn = nil
end
local parse_errs = { }
for _index_0 = 1, #input_files do
local filename = input_files[_index_0]
if args.syntax then
local err
ok, err = pcall(nomsu.parse, nomsu, Nomsu(filename, io.open(filename):read("*a")))
if not ok then
insert(parse_errs, err)
elseif print_file then
print_file:write("Parse succeeded: " .. tostring(filename) .. "\n")
print_file:flush()
end end
elseif args.format then elseif args.format then
for input_file in all_files(input) do local file = FILE_CACHE[filename]
local tree = nomsu:parse(io.open(input_file):read("*a")) if not file then
local formatted = tostring(self:tree_to_nomsu(tree)) error("File does not exist: " .. tostring(filename), 0)
if output_file then
output_file:write(formatted, "\n")
output_file:flush()
end
if print_file then
print_file:write(formatted, "\n")
print_file:flush()
end
end end
elseif input == STDIN then local tree = nomsu:parse(Nomsu(Source(filename, 1, #file), file))
local formatted = tostring(nomsu:tree_to_nomsu(tree))
if print_file then
print_file:write(formatted, "\n")
print_file:flush()
end
elseif filename == STDIN then
local file = io.input():read("*a") local file = io.input():read("*a")
FILE_CACHE.stdin = file FILE_CACHE.stdin = file
nomsu:run(Nomsu(Source('stdin', 1, #file), file), compile_fn) nomsu:run(Nomsu(Source('stdin', 1, #file), file))
else else
nomsu:run_file(input, compile_fn) nomsu:run_file(filename)
end end
end end
if #parse_errs > 0 then if #parse_errs > 0 then
@ -1693,9 +1696,9 @@ OPTIONS
os.exit(true, true) os.exit(true, true)
end end
if args.interactive then if args.interactive then
while true do for repl_line = 1, math.huge do
io.write(colored.bright(colored.yellow(">> "))) io.write(colored.bright(colored.yellow(">> ")))
local buff = "" local buff = { }
while true do while true do
local line = io.read("*L") local line = io.read("*L")
if line == "\n" or not line then if line == "\n" or not line then
@ -1705,14 +1708,21 @@ OPTIONS
break break
end end
line = line:gsub("\t", " ") line = line:gsub("\t", " ")
buff = buff .. line insert(buff, line)
io.write(colored.dim(colored.yellow(".. "))) io.write(colored.dim(colored.yellow(".. ")))
end end
if #buff == 0 then if #buff == 0 then
break break
end end
buff = concat(buff)
FILE_CACHE["REPL#" .. repl_line] = buff
local code = Nomsu(Source("REPL#" .. repl_line, 1, #buff), buff)
local err_hand
err_hand = function(error_message)
return print_err_msg(error_message)
end
local ret local ret
ok, ret = pcall(nomsu.run, nomsu, buff) ok, ret = xpcall(nomsu.run, err_hand, nomsu, code)
if ok and ret ~= nil then if ok and ret ~= nil then
print("= " .. repr(ret)) print("= " .. repr(ret))
elseif not ok then elseif not ok then

98
nomsu.moon
View File

@ -9,7 +9,7 @@
-- nomsu = Nomsu() -- nomsu = Nomsu()
-- nomsu:run(your_nomsu_code) -- nomsu:run(your_nomsu_code)
-- Or from the command line: -- Or from the command line:
-- lua nomsu.lua [input_file [output_file or -]] -- lua nomsu.lua your_file.nom
export lpeg, re export lpeg, re
_pairs, _ipairs = pairs, ipairs _pairs, _ipairs = pairs, ipairs
if jit if jit
@ -324,19 +324,19 @@ class NomsuCompiler
return tree return tree
run: (nomsu_code, compile_fn=nil)=> run: (nomsu_code)=>
tree = assert(@parse(nomsu_code)) tree = assert(@parse(nomsu_code))
if type(tree) == 'number' -- Happens if pattern matches, but there are no captures, e.g. an empty string if type(tree) == 'number' -- Happens if pattern matches, but there are no captures, e.g. an empty string
return nil return nil
lua = @tree_to_lua(tree)\as_statements! lua = @tree_to_lua(tree)\as_statements!
lua\declare_locals! lua\declare_locals!
lua\prepend "-- File: #{nomsu_code.source or ""}\n" lua\prepend "-- File: #{nomsu_code.source or ""}\n"
if compile_fn if @compile_fn
compile_fn(lua) self.compile_fn(lua, nomsu_code.source.filename)
return @run_lua(lua) return @run_lua(lua)
_running_files = {} -- For detecting circular imports _running_files = {} -- For detecting circular imports
run_file: (filename, compile_fn=nil)=> run_file: (filename)=>
loaded = @environment.LOADED loaded = @environment.LOADED
if loaded[filename] if loaded[filename]
return loaded[filename] return loaded[filename]
@ -367,7 +367,7 @@ class NomsuCompiler
file = file or FILE_CACHE[filename] file = file or FILE_CACHE[filename]
if not file if not file
error("File does not exist: #{filename}", 0) error("File does not exist: #{filename}", 0)
ret = @run(Nomsu(Source(filename,1,#file), file), compile_fn) ret = @run(Nomsu(Source(filename,1,#file), file))
else else
error("Invalid filetype for #{filename}", 0) error("Invalid filetype for #{filename}", 0)
loaded[filename] = ret or true loaded[filename] = ret or true
@ -966,7 +966,8 @@ if arg and debug_getinfo(2).func != require
/ {:format: ("-f" -> true) :} / {:format: ("-f" -> true) :}
/ {:syntax: ("-s" -> true) :} / {:syntax: ("-s" -> true) :}
/ {:print_file: "-p" ";" {file} :} / {:print_file: "-p" ";" {file} :}
/ {:output_file: "-o" ";" {file} :} / {:compile: ("-c" -> true) :}
/ {:verbose: ("-v" -> true) :}
/ {:help: (("-h" / "--help") -> true) :} / {:help: (("-h" / "--help") -> true) :}
file <- "-" / [^;]+ file <- "-" / [^;]+
]], {true: -> true}) ]], {true: -> true})
@ -976,15 +977,16 @@ if arg and debug_getinfo(2).func != require
print [=[ print [=[
Nomsu Compiler Nomsu Compiler
Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [-o output] [-p print_file] file1 file2... [-- nomsu args...] Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-v] [-c] [-f] [-s] [--help] [-p print_file] file1 file2... [-- nomsu args...]
OPTIONS OPTIONS
-i Run the compiler in interactive mode (REPL) -i Run the compiler in interactive mode (REPL)
-O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available) -O Run the compiler in optimized mode (use precompiled .lua versions of Nomsu files, when available)
-v Verbose: print compiled lua code
-c Compile .nom files into .lua files
-f Auto-format the given Nomsu file and print the result. -f Auto-format the given Nomsu file and print the result.
-s Check the program for syntax errors. -s Check the program for syntax errors.
-h/--help Print this message. -h/--help Print this message.
-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. -p <file> Print to the specified file instead of stdout.
<input> Input file can be "-" to use stdin. <input> Input file can be "-" to use stdin.
]=] ]=]
@ -1131,7 +1133,6 @@ OPTIONS
print_file = if args.print_file == "-" then io.stdout print_file = if args.print_file == "-" then io.stdout
elseif args.print_file then io.open(args.print_file, 'w') elseif args.print_file then io.open(args.print_file, 'w')
elseif args.output_file == '-' then nil
else io.stdout else io.stdout
nomsu.skip_precompiled = not args.optimized nomsu.skip_precompiled = not args.optimized
@ -1147,42 +1148,53 @@ OPTIONS
print_file\write('\n') print_file\write('\n')
print_file\flush! print_file\flush!
compile_fn = if args.output_file input_files = {}
(code)-> to_run = {}
output_file = if args.output_file == "-" then io.stdout for input in *args.inputs
elseif args.output_file then io.open(args.output_file, 'w') for f in all_files(input)
output_file\write("local IMMEDIATE = true;\n"..tostring(code)) input_files[#input_files+1] = f
output_file\flush! to_run[f] = true
nomsu.compile_fn = if args.compile or args.verbose
(code, from_file)->
if to_run[from_file]
if args.verbose
io.write(tostring(code), "\n")
if args.compile and from_file\match("%.nom$")
output_filename = from_file\gsub("%.nom$", ".lua")
output_file = io.open(output_filename, 'w')
output_file\write("local IMMEDIATE = true;\n", tostring(code))
output_file\flush!
print ("Compiled %-25s -> %s")\format(from_file, output_filename)
output_file\close!
else nil else nil
parse_errs = {} parse_errs = {}
for input in *args.inputs for filename in *input_files
if args.syntax if args.syntax
-- Check syntax: -- Check syntax:
for input_file in all_files(input) ok,err = pcall nomsu.parse, nomsu, Nomsu(filename, io.open(filename)\read("*a"))
ok,err = pcall nomsu.parse, nomsu, Nomsu(input_file, io.open(input_file)\read("*a")) if not ok
if not ok insert parse_errs, err
insert parse_errs, err elseif print_file
elseif print_file print_file\write("Parse succeeded: #{filename}\n")
print_file\write("Parse succeeded: #{input_file}\n") print_file\flush!
print_file\flush!
elseif args.format elseif args.format
-- Auto-format -- Auto-format
for input_file in all_files(input) file = FILE_CACHE[filename]
tree = nomsu\parse(io.open(input_file)\read("*a")) if not file
formatted = tostring(@tree_to_nomsu(tree)) error("File does not exist: #{filename}", 0)
if output_file tree = nomsu\parse(Nomsu(Source(filename,1,#file), file))
output_file\write(formatted, "\n") formatted = tostring(nomsu\tree_to_nomsu(tree))
output_file\flush! if print_file
if print_file print_file\write(formatted, "\n")
print_file\write(formatted, "\n") print_file\flush!
print_file\flush! elseif filename == STDIN
elseif input == STDIN
file = io.input!\read("*a") file = io.input!\read("*a")
FILE_CACHE.stdin = file FILE_CACHE.stdin = file
nomsu\run(Nomsu(Source('stdin',1,#file), file), compile_fn) nomsu\run(Nomsu(Source('stdin',1,#file), file))
else else
nomsu\run_file(input, compile_fn) nomsu\run_file(filename)
if #parse_errs > 0 if #parse_errs > 0
io.stderr\write concat(parse_errs, "\n\n") io.stderr\write concat(parse_errs, "\n\n")
@ -1193,9 +1205,9 @@ OPTIONS
if args.interactive if args.interactive
-- REPL -- REPL
while true for repl_line=1,math.huge
io.write(colored.bright colored.yellow ">> ") io.write(colored.bright colored.yellow ">> ")
buff = "" buff = {}
while true while true
line = io.read("*L") line = io.read("*L")
if line == "\n" or not line if line == "\n" or not line
@ -1203,11 +1215,17 @@ OPTIONS
io.write("\027[1A\027[2K") io.write("\027[1A\027[2K")
break -- Run buffer break -- Run buffer
line = line\gsub("\t", " ") line = line\gsub("\t", " ")
buff ..= line insert buff, line
io.write(colored.dim colored.yellow ".. ") io.write(colored.dim colored.yellow ".. ")
if #buff == 0 if #buff == 0
break -- Exit break -- Exit
ok, ret = pcall(nomsu.run, nomsu, buff)
buff = concat(buff)
FILE_CACHE["REPL#"..repl_line] = buff
code = Nomsu(Source("REPL#"..repl_line, 1, #buff), buff)
err_hand = (error_message)->
print_err_msg error_message
ok, ret = xpcall(nomsu.run, err_hand, nomsu, code)
if ok and ret != nil if ok and ret != nil
print "= "..repr(ret) print "= "..repr(ret)
elseif not ok elseif not ok