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

Codegen tweak

Browse Source
This commit is contained in:
Bruce Hill 2018-12-14 19:25:59 -08:00
parent 83a40b7493
commit 2360ada21f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nomsu_compiler.lua
View File

@ -236,15 +236,16 @@ local compile = setmetatable({
end end
local lua = LuaCode:from(tree.source) local lua = LuaCode:from(tree.source)
lua:add((stub):as_lua_id(), "(") lua:add((stub):as_lua_id(), "(")
for i, arg in ipairs(tree:get_args()) do for argnum, arg in ipairs(tree:get_args()) do
local arg_lua = compile(arg) local arg_lua = compile(arg)
if arg.type == "Block" then if arg.type == "Block" then
arg_lua = LuaCode:from(arg.source, "(function()\n ", arg_lua, "\nend)()") arg_lua = LuaCode:from(arg.source, "(function()\n ", arg_lua, "\nend)()")
end end
if i > 1 then if lua:trailing_line_len() + #arg_lua:text() > MAX_LINE then
lua:add(argnum > 1 and ",\n " or "\n ")
elseif argnum > 1 then
lua:add(", ") lua:add(", ")
end end
lua:add(lua:trailing_line_len() + #arg_lua:text() > MAX_LINE and "\n " or " ")
lua:add(arg_lua) lua:add(arg_lua)
end end
lua:add(")") lua:add(")")

8
nomsu_compiler.moon
View File

@ -174,12 +174,14 @@ compile = setmetatable({
lua = LuaCode\from(tree.source) lua = LuaCode\from(tree.source)
lua\add((stub)\as_lua_id!,"(") lua\add((stub)\as_lua_id!,"(")
for i, arg in ipairs tree\get_args! for argnum, arg in ipairs tree\get_args!
arg_lua = compile(arg) arg_lua = compile(arg)
if arg.type == "Block" if arg.type == "Block"
arg_lua = LuaCode\from(arg.source, "(function()\n ", arg_lua, "\nend)()") arg_lua = LuaCode\from(arg.source, "(function()\n ", arg_lua, "\nend)()")
lua\add "," if i > 1 if lua\trailing_line_len! + #arg_lua\text! > MAX_LINE
lua\add(lua\trailing_line_len! + #arg_lua\text! > MAX_LINE and "\n " or " ") lua\add(argnum > 1 and ",\n " or "\n ")
elseif argnum > 1
lua\add ", "
lua\add arg_lua lua\add arg_lua
lua\add ")" lua\add ")"
return lua return lua