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

Fix for REPL not getting launched when nomsu -I lib is run.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-30 14:25:02 -07:00
parent fba035595d
commit 54906c0553
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nomsu.lua
View File

@ -98,11 +98,12 @@ if not arg or debug.getinfo(2).func == require then
end end
local file_queue = { } local file_queue = { }
local sep = "\0" local sep = "\0"
local parser = re.compile([[ args <- {| (flag %sep)* (({~ file ~} -> add_file) %sep)? {:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !. local parser = re.compile([[ args <- {| (flag %sep)* (({~ file ~} -> add_file) {:primary_file: '' -> true :} %sep)?
{:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !.
flag <- flag <-
{:optimization: "-O" (%sep? (([0-9]+) -> tonumber))? :} {:optimization: "-O" (%sep? (([0-9]+) -> tonumber))? :}
/ ("-I" %sep? ({~ file ~} -> add_file)) / ("-I" %sep? ({~ file ~} -> add_file))
/ ("-e" %sep? (({} {~ file ~}) -> add_exec_string)) / ("-e" %sep? (({} {~ file ~}) -> add_exec_string) {:exec_strings: '' -> true :})
/ ({:check_syntax: ("-s" -> true):}) / ({:check_syntax: ("-s" -> true):})
/ ({:compile: ("-c" -> true):}) / ({:compile: ("-c" -> true):})
/ ({:compile: ("-c" -> true):}) / ({:compile: ("-c" -> true):})
@ -283,7 +284,7 @@ run = function()
end end
end end
end end
if #file_queue == 0 then if not (args.primary_file or args.exec_strings) then
nomsu:run([[#!/usr/bin/env nomsu -V2 nomsu:run([[#!/usr/bin/env nomsu -V2
use "lib/consolecolor.nom" use "lib/consolecolor.nom"
action [quit, exit]: lua> "os.exit(0)" action [quit, exit]: lua> "os.exit(0)"

7
nomsu.moon
View File

@ -57,11 +57,12 @@ if not arg or debug.getinfo(2).func == require
file_queue = {} file_queue = {}
sep = "\0" sep = "\0"
parser = re.compile([[ parser = re.compile([[
args <- {| (flag %sep)* (({~ file ~} -> add_file) %sep)? {:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !. args <- {| (flag %sep)* (({~ file ~} -> add_file) {:primary_file: '' -> true :} %sep)?
{:nomsu_args: {| ({(!%sep .)*} %sep)* |} :} %sep? |} !.
flag <- flag <-
{:optimization: "-O" (%sep? (([0-9]+) -> tonumber))? :} {:optimization: "-O" (%sep? (([0-9]+) -> tonumber))? :}
/ ("-I" %sep? ({~ file ~} -> add_file)) / ("-I" %sep? ({~ file ~} -> add_file))
/ ("-e" %sep? (({} {~ file ~}) -> add_exec_string)) / ("-e" %sep? (({} {~ file ~}) -> add_exec_string) {:exec_strings: '' -> true :})
/ ({:check_syntax: ("-s" -> true):}) / ({:check_syntax: ("-s" -> true):})
/ ({:compile: ("-c" -> true):}) / ({:compile: ("-c" -> true):})
/ ({:compile: ("-c" -> true):}) / ({:compile: ("-c" -> true):})
@ -181,7 +182,7 @@ run = ->
-- Just run the file -- Just run the file
run_file filename, (args.verbose and print or nil) run_file filename, (args.verbose and print or nil)
if #file_queue == 0 unless args.primary_file or args.exec_strings
-- Run in interactive mode (REPL) -- Run in interactive mode (REPL)
nomsu\run [[ nomsu\run [[
#!/usr/bin/env nomsu -V2 #!/usr/bin/env nomsu -V2