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

Fixed some minor bugs that made generated nomsu uglier.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-17 16:45:16 -08:00
parent 8bbebb8735
commit 12cc294c7a
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nomsu.lua
View File

@ -600,7 +600,7 @@ do
return nil return nil
end end
buff = buff .. (function() buff = buff .. (function()
if nomsu.type == "Var" or nomsu.type == "List" or nomsu.type == "Dict" then if bit.type == "Var" or bit.type == "List" or bit.type == "Dict" then
return "\\" .. nomsu return "\\" .. nomsu
else else
return "\\(" .. nomsu .. ")" return "\\(" .. nomsu .. ")"
@ -657,8 +657,12 @@ do
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local bit = _list_0[_index_0] local bit = _list_0[_index_0]
nomsu = inline_expression(bit) nomsu = inline_expression(bit)
if line ~= "\n " and #line + #", " + #nomsu > max_line then
buff = buff .. line
line = "\n "
end
local sep = line == "\n " and "" or ", " local sep = line == "\n " and "" or ", "
if nomsu and #nomsu + #line < max_line then if nomsu then
line = line .. (sep .. nomsu) line = line .. (sep .. nomsu)
if #line >= max_line then if #line >= max_line then
buff = buff .. line buff = buff .. line
@ -717,7 +721,7 @@ do
return nil return nil
end end
buff = buff .. (function() buff = buff .. (function()
if nomsu.type == "Var" or nomsu.type == "List" or nomsu.type == "Dict" then if bit.type == "Var" or bit.type == "List" or bit.type == "Dict" then
return "\\" .. nomsu return "\\" .. nomsu
else else
return "\\(" .. nomsu .. ")" return "\\(" .. nomsu .. ")"
@ -750,7 +754,11 @@ do
local _exp_0 = tok.type local _exp_0 = tok.type
if "Block" == _exp_0 then if "Block" == _exp_0 then
if #tok.value == 1 then if #tok.value == 1 then
nomsu = noeol_expression(tok.value[1]) if tok.value[1].type == "FunctionCall" then
nomsu = inline_expression(tok.value[1])
else
nomsu = noeol_expression(tok.value[1])
end
if nomsu and #(nomsu:match("[^\n]*")) < max_line then if nomsu and #(nomsu:match("[^\n]*")) < max_line then
return ": " .. nomsu return ": " .. nomsu
end end

14
nomsu.moon
View File

@ -427,7 +427,7 @@ class NomsuCompiler
else else
nomsu = inline_expression(bit) nomsu = inline_expression(bit)
return nil unless nomsu return nil unless nomsu
buff ..= if nomsu.type == "Var" or nomsu.type == "List" or nomsu.type == "Dict" buff ..= if bit.type == "Var" or bit.type == "List" or bit.type == "Dict"
"\\"..nomsu "\\"..nomsu
else "\\("..nomsu..")" else "\\("..nomsu..")"
if #buff > max_line then return nil if #buff > max_line then return nil
@ -461,8 +461,11 @@ class NomsuCompiler
line = "\n " line = "\n "
for bit in *tok.value for bit in *tok.value
nomsu = inline_expression bit nomsu = inline_expression bit
if line != "\n " and #line + #", " + #nomsu > max_line
buff ..= line
line = "\n "
sep = line == "\n " and "" or ", " sep = line == "\n " and "" or ", "
if nomsu and #nomsu + #line < max_line if nomsu
line ..= sep..nomsu line ..= sep..nomsu
if #line >= max_line if #line >= max_line
buff ..= line buff ..= line
@ -503,7 +506,7 @@ class NomsuCompiler
else else
nomsu = inline_expression(bit) nomsu = inline_expression(bit)
return nil unless nomsu return nil unless nomsu
buff ..= if nomsu.type == "Var" or nomsu.type == "List" or nomsu.type == "Dict" buff ..= if bit.type == "Var" or bit.type == "List" or bit.type == "Dict"
"\\"..nomsu "\\"..nomsu
else "\\("..nomsu..")" else "\\("..nomsu..")"
return buff return buff
@ -525,7 +528,10 @@ class NomsuCompiler
switch tok.type switch tok.type
when "Block" when "Block"
if #tok.value == 1 if #tok.value == 1
nomsu = noeol_expression(tok.value[1]) nomsu = if tok.value[1].type == "FunctionCall"
inline_expression(tok.value[1])
else
noeol_expression(tok.value[1])
if nomsu and #(nomsu\match("[^\n]*")) < max_line if nomsu and #(nomsu\match("[^\n]*")) < max_line
return ": "..nomsu return ": "..nomsu
return noeol_expression(tok) return noeol_expression(tok)