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

Cleanup of REPL and detection of command-line running.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-30 16:40:05 -08:00
parent 78c15a5d5e
commit 2dbf2d8810
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nomsu.lua
View File

@ -1476,7 +1476,7 @@ do
var_pattern = re.compile("{| %space ((('%' {%varname}) / %word) %space)+ |}", stub_defs) var_pattern = re.compile("{| %space ((('%' {%varname}) / %word) %space)+ |}", stub_defs)
NomsuCompiler = _class_0 NomsuCompiler = _class_0
end end
if arg then if arg and debug.getinfo(2).func ~= require then
colors = require('consolecolors') colors = require('consolecolors')
local parser = re.compile([[ args <- {| {:flags: flags? :} ({:input: input :} ";" ("-o;"{:output: output :} ";")?)? (";")? |} !. local parser = re.compile([[ args <- {| {:flags: flags? :} ({:input: input :} ";" ("-o;"{:output: output :} ";")?)? (";")? |} !.
flags <- (({| ({flag} ";")* |}) -> set) flags <- (({| ({flag} ";")* |}) -> set)
@ -1532,14 +1532,16 @@ if arg then
if args.flags["-i"] then if args.flags["-i"] then
nomsu:run('use "lib/core.nom"', "stdin") nomsu:run('use "lib/core.nom"', "stdin")
while true do while true do
io.write(colored.bright(colored.yellow(">> ")))
local buff = "" local buff = ""
while true do while true do
io.write(">> ")
local line = io.read("*L") local line = io.read("*L")
if line == "\n" or not line then if line == "\n" or not line then
break break
end end
line = line:gsub("\t", " ")
buff = buff .. line buff = buff .. line
io.write(colored.dim(colored.yellow(".. ")))
end end
if #buff == 0 then if #buff == 0 then
break break

7
nomsu.moon
View File

@ -927,7 +927,8 @@ class NomsuCompiler
nomsu\require_file(filename) nomsu\require_file(filename)
return statements:"nomsu:require_file(#{repr filename});" return statements:"nomsu:require_file(#{repr filename});"
if arg -- 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 export colors
colors = require 'consolecolors' colors = require 'consolecolors'
parser = re.compile([[ parser = re.compile([[
@ -979,13 +980,15 @@ if arg
-- REPL -- REPL
nomsu\run('use "lib/core.nom"', "stdin") nomsu\run('use "lib/core.nom"', "stdin")
while true while true
io.write(colored.bright colored.yellow ">> ")
buff = "" buff = ""
while true while true
io.write(">> ")
line = io.read("*L") line = io.read("*L")
if line == "\n" or not line if line == "\n" or not line
break break
line = line\gsub("\t", " ")
buff ..= line buff ..= line
io.write(colored.dim colored.yellow ".. ")
if #buff == 0 if #buff == 0
break break
ok, ret = pcall(-> nomsu\run(buff, "stdin")) ok, ret = pcall(-> nomsu\run(buff, "stdin"))