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

Fixed some nomsu codegen bugs

Browse Source
This commit is contained in:
Bruce Hill 2018-06-15 03:30:20 -07:00
parent 9d6932a872
commit fc71b0331b
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nomsu.lua
View File

@ -1067,12 +1067,25 @@ do
if i > 1 then if i > 1 then
nomsu:append(".") nomsu:append(".")
end end
local bit_nomsu = self:tree_to_nomsu(bit, true) local bit_nomsu
if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' then
if (NOMSU_DEFS.ident_char ^ 1):match(bit[1]) then
bit_nomsu = bit[1]
end
end
if not (bit_nomsu) then
bit_nomsu = self:tree_to_nomsu(bit, true)
end
if not (bit_nomsu) then if not (bit_nomsu) then
return nil return nil
end end
if bit.type == "Action" or bit.type == "Block" then local _exp_1 = bit.type
if "Action" == _exp_1 or "Block" == _exp_1 or "IndexChain" == _exp_1 then
bit_nomsu:parenthesize() bit_nomsu:parenthesize()
elseif "Number" == _exp_1 then
if i < #tree then
bit_nomsu:parenthesize()
end
end end
nomsu:append(bit_nomsu) nomsu:append(bit_nomsu)
end end

14
nomsu.moon
View File

@ -865,10 +865,18 @@ class NomsuCompiler
for i, bit in ipairs tree for i, bit in ipairs tree
if i > 1 if i > 1
nomsu\append "." nomsu\append "."
bit_nomsu = @tree_to_nomsu(bit, true) local bit_nomsu
if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string'
if (NOMSU_DEFS.ident_char^1)\match(bit[1])
bit_nomsu = bit[1]
unless bit_nomsu then bit_nomsu = @tree_to_nomsu(bit, true)
return nil unless bit_nomsu return nil unless bit_nomsu
if bit.type == "Action" or bit.type == "Block" switch bit.type
bit_nomsu\parenthesize! when "Action", "Block", "IndexChain"
bit_nomsu\parenthesize!
when "Number"
if i < #tree
bit_nomsu\parenthesize!
nomsu\append bit_nomsu nomsu\append bit_nomsu
return nomsu return nomsu