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

Switched back to using precompiled lua files instead of lua> "..",

Browse Source 
because it's noticeably faster.
This commit is contained in:
Bruce Hill 2018-01-10 13:52:41 -08:00
parent 787c7c5a6c
commit ea05cc155e
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -1,2 +1 @@
*.nomc lib/*.lua
*/*.nomc

4
compile_lib.sh
View File

@ -11,13 +11,13 @@ while getopts ":f" opt; do
esac esac
done done
if [ "$FLUSH" = true ] ; then if [ "$FLUSH" = true ] ; then
for file in $(find lib/ -name "*.nomc") ; do for file in $(find lib/ -name "*.lua") ; do
rm $file rm $file
done done
fi fi
for file in $(cat lib/core.nom | lua -e "for filename in io.read('*a'):gmatch('require \"([^\"]*)\"') do print(filename) end") ; do for file in $(cat lib/core.nom | lua -e "for filename in io.read('*a'):gmatch('require \"([^\"]*)\"') do print(filename) end") ; do
compilefile="${file/\.nom/.nomc}" compilefile="${file/\.nom/.lua}"
if [ ! -e "$compilefile" ] || [ "$file" -nt "$compilefile" ] ; then if [ ! -e "$compilefile" ] || [ "$file" -nt "$compilefile" ] ; then
echo "Compiling $file into $compilefile" echo "Compiling $file into $compilefile"
./nomsu.moon -c $file ./nomsu.moon -c $file

11
nomsu.lua
View File

@ -1324,7 +1324,7 @@ end]]):format(lua_code))
lua_code = "-- Immediately:\n" .. lua_code lua_code = "-- Immediately:\n" .. lua_code
self:run_lua(lua_code, vars) self:run_lua(lua_code, vars)
return { return {
statements = "" statements = lua_code
} }
end) end)
self:defmacro("lua> %code", function(self, vars) self:defmacro("lua> %code", function(self, vars)
@ -1351,7 +1351,10 @@ end]]):format(lua_code))
end end
if vars.filename:match(".*%.nom") then if vars.filename:match(".*%.nom") then
if not self.skip_precompiled then if not self.skip_precompiled then
local file = io.open(vars.filename:gsub("%.nom", ".nomc"), "r") local file = io.open(vars.filename:gsub("%.nom", ".lua"), "r")
if file then
return self:run_lua(file:read("*a"), vars)
end
end end
local file = file or io.open(vars.filename) local file = file or io.open(vars.filename)
if not file then if not file then
@ -1483,7 +1486,7 @@ if arg then
c.skip_precompiled = not args.flags["-O"] c.skip_precompiled = not args.flags["-O"]
if args.input then if args.input then
if args.flags["-c"] and not args.output then if args.flags["-c"] and not args.output then
args.output = args.input:gsub("%.nom", ".nomc") args.output = args.input:gsub("%.nom", ".lua")
end end
local compiled_output = nil local compiled_output = nil
if args.flags["-p"] then if args.flags["-p"] then
@ -1505,7 +1508,7 @@ if arg then
local vars = { } local vars = { }
local retval, code = c:run(input, args.input, vars) local retval, code = c:run(input, args.input, vars)
if args.output then if args.output then
compiled_output:write("lua> \"..\"\n " .. c:indent(code:gsub("\\", "\\\\"), 1)) compiled_output:write(code)
end end
end end
if args.flags["-p"] then if args.flags["-p"] then

10
nomsu.moon
View File

@ -839,7 +839,7 @@ end]]\format(lua_code))
lua_code = lua.statements or (lua.expr..";") lua_code = lua.statements or (lua.expr..";")
lua_code = "-- Immediately:\n"..lua_code lua_code = "-- Immediately:\n"..lua_code
@run_lua(lua_code, vars) @run_lua(lua_code, vars)
return statements:"" return statements:lua_code
@defmacro "lua> %code", (vars)=> @defmacro "lua> %code", (vars)=>
lua = nomsu_string_as_lua(@, vars.code) lua = nomsu_string_as_lua(@, vars.code)
@ -857,7 +857,9 @@ end]]\format(lua_code))
return dofile(vars.filename)(@, vars) return dofile(vars.filename)(@, vars)
if vars.filename\match(".*%.nom") if vars.filename\match(".*%.nom")
if not @skip_precompiled -- Look for precompiled version if not @skip_precompiled -- Look for precompiled version
file = io.open(vars.filename\gsub("%.nom", ".nomc"), "r") file = io.open(vars.filename\gsub("%.nom", ".lua"), "r")
if file
return @run_lua(file\read("*a"), vars)
file = file or io.open(vars.filename) file = file or io.open(vars.filename)
if not file if not file
@error "File does not exist: #{vars.filename}" @error "File does not exist: #{vars.filename}"
@ -901,7 +903,7 @@ if arg
if args.input if args.input
-- Read a file or stdin and output either the printouts or the compiled lua -- Read a file or stdin and output either the printouts or the compiled lua
if args.flags["-c"] and not args.output if args.flags["-c"] and not args.output
args.output = args.input\gsub("%.nom", ".nomc") args.output = args.input\gsub("%.nom", ".lua")
compiled_output = nil compiled_output = nil
if args.flags["-p"] if args.flags["-p"]
_write = c.write _write = c.write
@ -919,7 +921,7 @@ if arg
vars = {} vars = {}
retval, code = c\run(input, args.input, vars) retval, code = c\run(input, args.input, vars)
if args.output if args.output
compiled_output\write("lua> \"..\"\n "..c\indent(code\gsub("\\","\\\\"), 1)) compiled_output\write(code)
if args.flags["-p"] if args.flags["-p"]
c.write = _write c.write = _write