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

Further improvements on the CLI.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-28 19:16:39 -07:00
parent 3a049c15df
commit 05528c50ec
2 changed files with 114 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
nomsu.lua
View File

@ -950,33 +950,39 @@ do
end end
if arg and debug_getinfo(2).func ~= require then if arg and debug_getinfo(2).func ~= require then
colors = require('consolecolors') colors = require('consolecolors')
local parser = re.compile([[ args <- {| {:flags: flags? :} (input ";" (output / print_file)*)? (";")? |} !. local parser = re.compile([[ args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} |} ";"? !.
flags <- (({| ({flag} ";")* |}) -> set) flag <-
flag <- "-i" / "-O" / "-f" / "--help" / "-h" / "-s" / "-p" {:interactive: ("-i" -> true) :}
input <- {:input: file :} / {:verbose: ("-v" -> true) :}
output <- "-o;" {:output: file :} / {:optimized: ("-O" -> true) :}
print_file <- "-p;" {:print_file: file :} / {:format: ("-f" -> true) :}
/ {:syntax: ("-s" -> true) :}
/ {:print_file: "-p" ";" {file} :}
/ {:output_file: "-o" ";" {file} :}
/ {:help: (("-h" / "--help") -> true) :}
file <- "-" / [^;]+ file <- "-" / [^;]+
]], { ]], {
set = set ["true"] = function()
return true
end
}) })
local args = concat(arg, ";") .. ";" local args = concat(arg, ";") .. ";"
args = parser:match(args) or { } args = parser:match(args)
if not args or not args.flags or args.flags["--help"] or args.flags["-h"] 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] [input [-o output] [-p print_file]] Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [-o output] [-p print_file] file1 file2...
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)
-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.
-v Verbose -v Verbose mode.
-h/--help Print this message. -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) -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.
]=]) ]=])
os.exit() os.exit()
end end
@ -1118,17 +1124,25 @@ OPTIONS
end end
local run local run
run = function() run = function()
if args.flags["-v"] then if args.verbose then
nomsu.debug = true nomsu.debug = true
end end
if args.input == "-" then for i, input in ipairs(args.inputs) do
args.input = STDIN if input == "-" then
args.inputs[i] = STDIN
end
end
if #args.inputs == 0 and not args.interactive then
args.inputs = {
"core"
}
args.interactive = true
end end
local output_file local output_file
if args.output == "-" then if args.output_file == "-" then
output_file = io.stdout output_file = io.stdout
elseif args.output then elseif args.output_file then
output_file = io.open(args.output, 'w') output_file = io.open(args.output_file, 'w')
end end
local print_file local print_file
if args.print_file == "-" then if args.print_file == "-" then
@ -1140,40 +1154,42 @@ OPTIONS
else else
print_file = io.stdout print_file = io.stdout
end end
nomsu.skip_precompiled = not args.flags["-O"] nomsu.skip_precompiled = not args.optimized
if args.input then local compile_fn = nil
local compile_fn = nil if print_file == nil then
if print_file == nil then nomsu.environment.print = function() end
nomsu.environment.print = function() end elseif print_file ~= io.stdout then
elseif print_file ~= io.stdout then nomsu.environment.print = function(...)
nomsu.environment.print = function(...) local N = select("#", ...)
local N = select("#", ...) if N > 0 then
if N > 0 then print_file:write(tostring(select(1, ...)))
print_file:write(tostring(select(1, ...))) for i = 2, N do
for i = 2, N do print_file:write('\t', tostring(select(1, ...)))
print_file:write('\t', tostring(select(1, ...)))
end
end end
print_file:write('\n')
return print_file:flush()
end end
print_file:write('\n')
return print_file:flush()
end end
if output_file then end
compile_fn = function(code) if output_file then
output_file:write("local IMMEDIATE = true;\n" .. tostring(code)) compile_fn = function(code)
return output_file:flush() output_file:write("local IMMEDIATE = true;\n" .. tostring(code))
end return output_file:flush()
end end
if args.flags["-s"] then end
for input_file in all_files(args.input) do local _list_0 = args.inputs
for _index_0 = 1, #_list_0 do
local input = _list_0[_index_0]
if args.syntax then
for input_file in all_files(input) do
nomsu:parse(io.open(input_file):read("*a")) nomsu:parse(io.open(input_file):read("*a"))
end end
if print_file then if print_file then
print_file:write("Success!\n") print_file:write("All files parsed successfully!\n")
print_file:flush() print_file:flush()
end end
elseif args.flags["-f"] then elseif args.format then
for input_file in all_files(args.input) do for input_file in all_files(input) do
local tree = nomsu:parse(io.open(input_file):read("*a")) local tree = nomsu:parse(io.open(input_file):read("*a"))
local formatted = tostring(tree:as_nomsu()) local formatted = tostring(tree:as_nomsu())
if output_file then if output_file then
@ -1185,14 +1201,13 @@ OPTIONS
print_file:flush() print_file:flush()
end end
end end
elseif args.input == STDIN then elseif input == STDIN then
nomsu:run(io.input():read("*a"), compile_fn) nomsu:run(io.input():read("*a"), compile_fn)
else else
nomsu:run_file(args.input, compile_fn) nomsu:run_file(input, compile_fn)
end end
end end
if not args.input or args.flags["-i"] then if args.interactive then
nomsu:run('use "core"')
while true do while true do
io.write(colored.bright(colored.yellow(">> "))) io.write(colored.bright(colored.yellow(">> ")))
local buff = "" local buff = ""

96
nomsu.moon
View File

@ -663,32 +663,36 @@ if arg and debug_getinfo(2).func != require
export colors export colors
colors = require 'consolecolors' colors = require 'consolecolors'
parser = re.compile([[ parser = re.compile([[
args <- {| {:flags: flags? :} (input ";" (output / print_file)*)? (";")? |} !. args <- {| (flag ";")* {:inputs: {| ({file} ";")* |} :} |} ";"? !.
flags <- (({| ({flag} ";")* |}) -> set) flag <-
flag <- "-i" / "-O" / "-f" / "--help" / "-h" / "-s" / "-p" {:interactive: ("-i" -> true) :}
input <- {:input: file :} / {:verbose: ("-v" -> true) :}
output <- "-o;" {:output: file :} / {:optimized: ("-O" -> true) :}
print_file <- "-p;" {:print_file: file :} / {:format: ("-f" -> true) :}
/ {:syntax: ("-s" -> true) :}
/ {:print_file: "-p" ";" {file} :}
/ {:output_file: "-o" ";" {file} :}
/ {:help: (("-h" / "--help") -> true) :}
file <- "-" / [^;]+ file <- "-" / [^;]+
]], {:set}) ]], {true: -> true})
args = concat(arg, ";")..";" args = concat(arg, ";")..";"
args = parser\match(args) or {} args = parser\match(args)
if not args or not args.flags or args.flags["--help"] or args.flags["-h"] if not args or args.help
print [=[ print [=[
Nomsu Compiler Nomsu Compiler
Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [input [-o output] [-p print_file]] Usage: (lua nomsu.lua | moon nomsu.moon) [-i] [-O] [-f] [-s] [--help] [-o output] [-p print_file] file1 file2...
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)
-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.
-v Verbose -v Verbose mode.
-h/--help Print this message. -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) -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.
]=] ]=]
os.exit! os.exit!
@ -779,49 +783,54 @@ OPTIONS
io.stderr\flush! io.stderr\flush!
run = -> run = ->
if args.flags["-v"] if args.verbose
nomsu.debug = true nomsu.debug = true
if args.input == "-" then args.input = STDIN for i,input in ipairs args.inputs
if input == "-" then args.inputs[i] = STDIN
output_file = if args.output == "-" then io.stdout if #args.inputs == 0 and not args.interactive
elseif args.output then io.open(args.output, 'w') args.inputs = {"core"}
args.interactive = true
output_file = if args.output_file == "-" then io.stdout
elseif args.output_file then io.open(args.output_file, 'w')
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 output_file == io.stdout then nil elseif output_file == io.stdout then nil
else io.stdout else io.stdout
nomsu.skip_precompiled = not args.flags["-O"] nomsu.skip_precompiled = not args.optimized
if args.input compile_fn = nil
compile_fn = nil if print_file == nil
if print_file == nil nomsu.environment.print = ->
nomsu.environment.print = -> elseif print_file != io.stdout
elseif print_file != io.stdout nomsu.environment.print = (...)->
nomsu.environment.print = (...)-> N = select("#",...)
N = select("#",...) if N > 0
if N > 0 print_file\write(tostring(select(1,...)))
print_file\write(tostring(select(1,...))) for i=2,N
for i=2,N print_file\write('\t',tostring(select(1,...)))
print_file\write('\t',tostring(select(1,...))) print_file\write('\n')
print_file\write('\n') print_file\flush!
print_file\flush!
if output_file
compile_fn = (code)->
output_file\write("local IMMEDIATE = true;\n"..tostring(code))
output_file\flush!
if args.flags["-s"] if output_file
compile_fn = (code)->
output_file\write("local IMMEDIATE = true;\n"..tostring(code))
output_file\flush!
for input in *args.inputs
if args.syntax
-- Check syntax: -- Check syntax:
for input_file in all_files(args.input) for input_file in all_files(input)
nomsu\parse(io.open(input_file)\read("*a")) nomsu\parse(io.open(input_file)\read("*a"))
if print_file if print_file
print_file\write("Success!\n") print_file\write("All files parsed successfully!\n")
print_file\flush! print_file\flush!
elseif args.flags["-f"] elseif args.format
-- Auto-format -- Auto-format
for input_file in all_files(args.input) for input_file in all_files(input)
tree = nomsu\parse(io.open(input_file)\read("*a")) tree = nomsu\parse(io.open(input_file)\read("*a"))
formatted = tostring(tree\as_nomsu!) formatted = tostring(tree\as_nomsu!)
if output_file if output_file
@ -830,14 +839,13 @@ OPTIONS
if print_file if print_file
print_file\write(formatted, "\n") print_file\write(formatted, "\n")
print_file\flush! print_file\flush!
elseif args.input == STDIN elseif input == STDIN
nomsu\run(io.input!\read("*a"), compile_fn) nomsu\run(io.input!\read("*a"), compile_fn)
else else
nomsu\run_file(args.input, compile_fn) nomsu\run_file(input, compile_fn)
if not args.input or args.flags["-i"] if args.interactive
-- REPL -- REPL
nomsu\run('use "core"')
while true while true
io.write(colored.bright colored.yellow ">> ") io.write(colored.bright colored.yellow ">> ")
buff = "" buff = ""