Added some support for auto-upgrade, tidied up a bit
This commit is contained in:
parent
3d2db69148
commit
08fe139a4a
@ -64,6 +64,9 @@ local math_expression = re.compile([[ (([*/^+-] / [0-9]+) " ")* [*/^+-] !. ]])
|
||||
local MAX_LINE = 80
|
||||
local compile
|
||||
compile = function(self, tree)
|
||||
if tree.version and tree.version < self.NOMSU_VERSION:up_to(#tree.version) and self._1_upgraded_from_2_to then
|
||||
tree = self._1_upgraded_from_2_to(tree, tree.version, self.NOMSU_VERSION)
|
||||
end
|
||||
local _exp_0 = tree.type
|
||||
if "Action" == _exp_0 then
|
||||
local stub = tree.stub
|
||||
@ -141,7 +144,7 @@ compile = function(self, tree)
|
||||
if arg.type == "Block" and #arg > 1 then
|
||||
arg_lua = LuaCode:from(arg.source, "(function()\n ", arg_lua, "\nend)()")
|
||||
end
|
||||
if lua:trailing_line_len() + #arg_lua:text() > MAX_LINE then
|
||||
if lua:trailing_line_len() + #arg_lua > MAX_LINE then
|
||||
lua:add(argnum > 1 and ",\n " or "\n ")
|
||||
elseif argnum > 1 then
|
||||
lua:add(", ")
|
||||
@ -193,7 +196,7 @@ compile = function(self, tree)
|
||||
if arg.type == "Block" and #arg > 1 then
|
||||
arg_lua = LuaCode:from(arg.source, "(function()\n ", arg_lua, "\nend)()")
|
||||
end
|
||||
if lua:trailing_line_len() + #arg_lua:text() > MAX_LINE then
|
||||
if lua:trailing_line_len() + #arg_lua > MAX_LINE then
|
||||
lua:add(argnum > 1 and ",\n " or "\n ")
|
||||
elseif argnum > 1 then
|
||||
lua:add(", ")
|
||||
@ -234,7 +237,7 @@ compile = function(self, tree)
|
||||
if needs_comma then
|
||||
lua:add(",")
|
||||
end
|
||||
if lua:trailing_line_len() + #(entry_lua:text():match("^[\n]*")) > MAX_LINE then
|
||||
if lua:trailing_line_len() + #(entry_lua:match("^[\n]*")) > MAX_LINE then
|
||||
lua:add("\n ")
|
||||
elseif needs_comma then
|
||||
lua:add(" ")
|
||||
@ -250,7 +253,11 @@ compile = function(self, tree)
|
||||
if i > 1 then
|
||||
lua:add("\n")
|
||||
end
|
||||
lua:add(self:compile(line))
|
||||
local line_lua = self:compile(line)
|
||||
lua:add(line_lua)
|
||||
if not (line_lua:last(1) == ";" or line_lua:last(4):match("[^a-zA-Z0-9]end$")) then
|
||||
lua:add(";")
|
||||
end
|
||||
end
|
||||
return lua
|
||||
elseif "Text" == _exp_0 then
|
||||
@ -325,7 +332,9 @@ compile = function(self, tree)
|
||||
lua:add(" + ")
|
||||
end
|
||||
lua:add(typename, "(function(", (tree.type == 'List' and "add" or ("add, " .. ("add 1 ="):as_lua_id())), ")")
|
||||
lua:add("\n ", self:compile(tree[i]), "\nend)")
|
||||
local body = self:compile(tree[i])
|
||||
body:declare_locals()
|
||||
lua:add("\n ", body, "\nend)")
|
||||
chunks = chunks + 1
|
||||
i = i + 1
|
||||
else
|
||||
@ -339,7 +348,7 @@ compile = function(self, tree)
|
||||
break
|
||||
end
|
||||
local item_lua = self:compile(tree[i])
|
||||
if item_lua:text():match("^%.[a-zA-Z_]") then
|
||||
if item_lua:match("^%.[a-zA-Z_]") then
|
||||
item_lua = item_lua:text():sub(2)
|
||||
end
|
||||
if tree.type == 'Dict' and tree[i].type == 'Index' then
|
||||
@ -350,9 +359,9 @@ compile = function(self, tree)
|
||||
items_lua:add("\n")
|
||||
sep = ''
|
||||
elseif items_lua:trailing_line_len() > MAX_LINE then
|
||||
sep = items_lua:text():sub(-1) == ";" and "\n " or ",\n "
|
||||
sep = items_lua:last(1) == ";" and "\n " or ",\n "
|
||||
else
|
||||
sep = items_lua:text():sub(-1) == ";" and " " or ", "
|
||||
sep = items_lua:last(1) == ";" and " " or ", "
|
||||
end
|
||||
i = i + 1
|
||||
end
|
||||
@ -367,10 +376,10 @@ compile = function(self, tree)
|
||||
return lua
|
||||
elseif "Index" == _exp_0 then
|
||||
local key_lua = self:compile(tree[1])
|
||||
local key_str = match(key_lua:text(), '^"([a-zA-Z_][a-zA-Z0-9_]*)"$')
|
||||
local key_str = key_lua:match('^"([a-zA-Z_][a-zA-Z0-9_]*)"$')
|
||||
if key_str and key_str:is_lua_id() then
|
||||
return LuaCode:from(tree.source, ".", key_str)
|
||||
elseif sub(key_lua:text(), 1, 1) == "[" then
|
||||
elseif key_lua:first(1) == "[" then
|
||||
return LuaCode:from(tree.source, "[ ", key_lua, "]")
|
||||
else
|
||||
return LuaCode:from(tree.source, "[", key_lua, "]")
|
||||
@ -387,7 +396,7 @@ compile = function(self, tree)
|
||||
return LuaCode:from(tree.source, self:compile(key), "=", (tree[2] and self:compile(tree[2]) or "true"))
|
||||
elseif "IndexChain" == _exp_0 then
|
||||
local lua = self:compile(tree[1])
|
||||
if lua:text():match("['\"}]$") or lua:text():match("]=*]$") then
|
||||
if lua:match("['\"}]$") or lua:match("]=*]$") then
|
||||
lua:parenthesize()
|
||||
end
|
||||
if lua:text() == "..." then
|
||||
|
||||
@ -56,6 +56,10 @@ math_expression = re.compile [[ (([*/^+-] / [0-9]+) " ")* [*/^+-] !. ]]
|
||||
|
||||
MAX_LINE = 80 -- For beautification purposes, try not to make lines much longer than this value
|
||||
compile = (tree)=>
|
||||
-- Automatically upgrade trees from older versions:
|
||||
if tree.version and tree.version < @NOMSU_VERSION\up_to(#tree.version) and @_1_upgraded_from_2_to
|
||||
tree = @._1_upgraded_from_2_to(tree, tree.version, @NOMSU_VERSION)
|
||||
|
||||
switch tree.type
|
||||
when "Action"
|
||||
stub = tree.stub
|
||||
@ -109,7 +113,7 @@ compile = (tree)=>
|
||||
arg_lua = @compile(arg)
|
||||
if arg.type == "Block" and #arg > 1
|
||||
arg_lua = LuaCode\from(arg.source, "(function()\n ", arg_lua, "\nend)()")
|
||||
if lua\trailing_line_len! + #arg_lua\text! > MAX_LINE
|
||||
if lua\trailing_line_len! + #arg_lua > MAX_LINE
|
||||
lua\add(argnum > 1 and ",\n " or "\n ")
|
||||
elseif argnum > 1
|
||||
lua\add ", "
|
||||
@ -157,7 +161,7 @@ compile = (tree)=>
|
||||
arg_lua = @compile(arg)
|
||||
if arg.type == "Block" and #arg > 1
|
||||
arg_lua = LuaCode\from(arg.source, "(function()\n ", arg_lua, "\nend)()")
|
||||
if lua\trailing_line_len! + #arg_lua\text! > MAX_LINE
|
||||
if lua\trailing_line_len! + #arg_lua > MAX_LINE
|
||||
lua\add(argnum > 1 and ",\n " or "\n ")
|
||||
elseif argnum > 1
|
||||
lua\add ", "
|
||||
@ -189,7 +193,7 @@ compile = (tree)=>
|
||||
entry_lua\add("[", as_lua(k), "]= ")
|
||||
entry_lua\add as_lua(v)
|
||||
if needs_comma then lua\add ","
|
||||
if lua\trailing_line_len! + #(entry_lua\text!\match("^[\n]*")) > MAX_LINE
|
||||
if lua\trailing_line_len! + #(entry_lua\match("^[\n]*")) > MAX_LINE
|
||||
lua\add "\n "
|
||||
elseif needs_comma
|
||||
lua\add " "
|
||||
@ -202,7 +206,10 @@ compile = (tree)=>
|
||||
lua = LuaCode\from(tree.source)
|
||||
for i, line in ipairs tree
|
||||
if i > 1 then lua\add "\n"
|
||||
lua\add @compile(line)
|
||||
line_lua = @compile(line)
|
||||
lua\add line_lua
|
||||
unless line_lua\last(1) == ";" or line_lua\last(4)\match("[^a-zA-Z0-9]end$")
|
||||
lua\add ";"
|
||||
return lua
|
||||
|
||||
when "Text"
|
||||
@ -260,7 +267,9 @@ compile = (tree)=>
|
||||
if tree[i].type == 'Block'
|
||||
lua\add " + " if chunks > 0
|
||||
lua\add typename, "(function(", (tree.type == 'List' and "add" or ("add, "..("add 1 =")\as_lua_id!)), ")"
|
||||
lua\add "\n ", @compile(tree[i]), "\nend)"
|
||||
body = @compile(tree[i])
|
||||
body\declare_locals!
|
||||
lua\add "\n ", body, "\nend)"
|
||||
chunks += 1
|
||||
i += 1
|
||||
else
|
||||
@ -271,7 +280,7 @@ compile = (tree)=>
|
||||
if tree[i].type == "Block"
|
||||
break
|
||||
item_lua = @compile tree[i]
|
||||
if item_lua\text!\match("^%.[a-zA-Z_]")
|
||||
if item_lua\match("^%.[a-zA-Z_]")
|
||||
item_lua = item_lua\text!\sub(2)
|
||||
if tree.type == 'Dict' and tree[i].type == 'Index'
|
||||
item_lua = LuaCode\from tree[i].source, item_lua, "=true"
|
||||
@ -280,9 +289,9 @@ compile = (tree)=>
|
||||
items_lua\add "\n"
|
||||
sep = ''
|
||||
elseif items_lua\trailing_line_len! > MAX_LINE
|
||||
sep = items_lua\text!\sub(-1) == ";" and "\n " or ",\n "
|
||||
sep = items_lua\last(1) == ";" and "\n " or ",\n "
|
||||
else
|
||||
sep = items_lua\text!\sub(-1) == ";" and " " or ", "
|
||||
sep = items_lua\last(1) == ";" and " " or ", "
|
||||
i += 1
|
||||
if items_lua\is_multiline!
|
||||
lua\add LuaCode\from items_lua.source, typename, "{\n ", items_lua, "\n}"
|
||||
@ -294,10 +303,10 @@ compile = (tree)=>
|
||||
|
||||
when "Index"
|
||||
key_lua = @compile(tree[1])
|
||||
key_str = match(key_lua\text!, '^"([a-zA-Z_][a-zA-Z0-9_]*)"$')
|
||||
key_str = key_lua\match('^"([a-zA-Z_][a-zA-Z0-9_]*)"$')
|
||||
return if key_str and key_str\is_lua_id!
|
||||
LuaCode\from tree.source, ".", key_str
|
||||
elseif sub(key_lua\text!,1,1) == "["
|
||||
elseif key_lua\first(1) == "["
|
||||
-- NOTE: this *must* use a space after the [ to avoid freaking out
|
||||
-- Lua's parser if the inner expression is a long string. Lua
|
||||
-- parses x[[[y]]] as x("[y]"), not as x["y"]
|
||||
@ -313,7 +322,7 @@ compile = (tree)=>
|
||||
|
||||
when "IndexChain"
|
||||
lua = @compile(tree[1])
|
||||
if lua\text!\match("['\"}]$") or lua\text!\match("]=*]$")
|
||||
if lua\match("['\"}]$") or lua\match("]=*]$")
|
||||
lua\parenthesize!
|
||||
if lua\text! == "..."
|
||||
return LuaCode\from(tree.source, "select(", @compile(tree[2][1]), ", ...)")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user