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

Rebuilt.

Browse Source
This commit is contained in:
Bruce Hill 2017-10-13 18:09:46 -07:00
parent e476bfea52
commit a176c7dfb5
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
nomsu.lua
View File

@ -427,10 +427,10 @@ do
self:errorln(tostring(colored.red("Error occurred in statement:")) .. "\n" .. tostring(colored.bright(colored.yellow(statement.src)))) self:errorln(tostring(colored.red("Error occurred in statement:")) .. "\n" .. tostring(colored.bright(colored.yellow(statement.src))))
self:error(expr) self:error(expr)
end end
local code_for_statement = ([[ return (function(nomsu, vars) local code_for_statement = ([[return (function(nomsu, vars)
%s %s
return %s; return %s;
end);]]):format(statements or "", expr or "ret") end);]]):format(statements or "", expr or "ret")
if self.debug then if self.debug then
self:writeln(tostring(colored.bright("RUNNING LUA:")) .. "\n" .. tostring(colored.blue(colored.bright(code_for_statement)))) self:writeln(tostring(colored.bright("RUNNING LUA:")) .. "\n" .. tostring(colored.blue(colored.bright(code_for_statement))))
end end
@ -443,7 +443,7 @@ do
return ("\n%-3d|"):format(n) return ("\n%-3d|"):format(n)
end end
local code = "1 |" .. code_for_statement:gsub("\n", fn) local code = "1 |" .. code_for_statement:gsub("\n", fn)
error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(code))) .. "\n\n" .. tostring(err) .. "\n\nProduced by statement:\n" .. tostring(colored.bright(colored.yellow(statement.src)))) error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(colored.onblack(code)))) .. "\n\n" .. tostring(err) .. "\n\nProduced by statement:\n" .. tostring(colored.bright(colored.yellow(statement.src))))
end end
local run_statement = lua_thunk() local run_statement = lua_thunk()
local ret local ret
@ -456,16 +456,16 @@ do
self:errorln(debug.traceback()) self:errorln(debug.traceback())
self:error(ret) self:error(ret)
end end
insert(buffer, tostring(statements or '') .. "\n" .. tostring(expr and "ret = " .. tostring(expr) or '')) insert(buffer, tostring(statements or '') .. "\n" .. tostring(expr and "ret = " .. tostring(expr) .. ";" or ''))
end end
if max_operations then if max_operations then
debug.sethook() debug.sethook()
end end
local lua_code = ([[ return (function(nomsu, vars) local lua_code = ([[return (function(nomsu, vars)
local ret; local ret;
%s %s
return ret; return ret;
end);]]):format(concat(buffer, "\n")) end);]]):format(concat(buffer, "\n"))
return return_value, lua_code, vars return return_value, lua_code, vars
end, end,
tree_to_value = function(self, tree, vars) tree_to_value = function(self, tree, vars)
@ -475,7 +475,7 @@ do
end end
local lua_thunk, err = load(code) local lua_thunk, err = load(code)
if not lua_thunk then if not lua_thunk then
self:error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(code))) .. "\n\n" .. tostring(colored.red(err))) self:error("Failed to compile generated code:\n" .. tostring(colored.bright(colored.blue(colored.onblack(code)))) .. "\n\n" .. tostring(colored.red(err)))
end end
return (lua_thunk())(self, vars or { }) return (lua_thunk())(self, vars or { })
end, end,
@ -503,11 +503,11 @@ do
insert(lua_bits, "ret = " .. tostring(expr) .. ";") insert(lua_bits, "ret = " .. tostring(expr) .. ";")
end end
end end
return ([[ (function(nomsu, vars) return ([[(function(nomsu, vars)
local ret; local ret;
%s %s
return ret; return ret;
end)]]):format(concat(lua_bits, "\n")) end)]]):format(concat(lua_bits, "\n"))
elseif "FunctionCall" == _exp_0 then elseif "FunctionCall" == _exp_0 then
local stub = self:get_stub(tree) local stub = self:get_stub(tree)
local def = self.defs[stub] local def = self.defs[stub]