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

Simplifying and correcting the nomsu codegen.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-20 17:51:21 -07:00
parent 9f0b5384d7
commit c4be74a5d3
4 changed files with 345 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code_obj.lua
View File

@ -83,7 +83,9 @@ do
dirty = function(self) dirty = function(self)
self.__str = nil self.__str = nil
self._trailing_line_len = nil self._trailing_line_len = nil
self._is_multiline = nil if self._is_multiline == false then
self._is_multiline = nil
end
end, end,
append = function(self, ...) append = function(self, ...)
local n = select("#", ...) local n = select("#", ...)
@ -100,6 +102,9 @@ do
break break
end end
bits[#bits + 1] = b bits[#bits + 1] = b
if b.is_code then
b.dirty = error
end
if type(b) ~= 'string' and not (type(b) == 'table' and b.is_code) then if type(b) ~= 'string' and not (type(b) == 'table' and b.is_code) then
b = repr(b) b = repr(b)
end end
@ -153,6 +158,9 @@ do
end end
end end
bits[#bits + 1] = b bits[#bits + 1] = b
if b.is_code then
b.dirty = error
end
local b_str = tostring(b) local b_str = tostring(b)
local line = match(b_str, "\n([^\n]*)$") local line = match(b_str, "\n([^\n]*)$")
if line then if line then
@ -170,7 +178,11 @@ do
bits[i] = bits[i - n] bits[i] = bits[i - n]
end end
for i = 1, n do for i = 1, n do
bits[i] = select(i, ...) local b = select(i, ...)
bits[i] = b
if b.is_code then
b.dirty = error
end
end end
return self:dirty() return self:dirty()
end end

9
code_obj.moon
View File

@ -55,7 +55,8 @@ class Code
dirty: => dirty: =>
@__str = nil @__str = nil
@_trailing_line_len = nil @_trailing_line_len = nil
@_is_multiline = nil -- Multi-line only goes from false->true, since there is no API for removing bits
@_is_multiline = nil if @_is_multiline == false
append: (...)=> append: (...)=>
n = select("#",...) n = select("#",...)
@ -67,6 +68,7 @@ class Code
assert(not Source\is_instance(b), "code bit is a Source") assert(not Source\is_instance(b), "code bit is a Source")
if b == '' then continue if b == '' then continue
bits[#bits+1] = b bits[#bits+1] = b
b.dirty = error if b.is_code
if type(b) != 'string' and not (type(b) == 'table' and b.is_code) if type(b) != 'string' and not (type(b) == 'table' and b.is_code)
b = repr(b) b = repr(b)
@dirty! @dirty!
@ -104,6 +106,7 @@ class Code
else else
bits[#bits+1] = joiner bits[#bits+1] = joiner
bits[#bits+1] = b bits[#bits+1] = b
b.dirty = error if b.is_code
b_str = tostring(b) b_str = tostring(b)
line = match(b_str, "\n([^\n]*)$") line = match(b_str, "\n([^\n]*)$")
if line if line
@ -118,7 +121,9 @@ class Code
for i=#bits+n,n+1,-1 for i=#bits+n,n+1,-1
bits[i] = bits[i-n] bits[i] = bits[i-n]
for i=1,n for i=1,n
bits[i] = select(i, ...) b = select(i, ...)
bits[i] = b
b.dirty = error if b.is_code
@dirty! @dirty!
class LuaCode extends Code class LuaCode extends Code

421
nomsu_compiler.lua
View File

@ -733,10 +733,26 @@ do
return error("Unknown type: " .. tostring(tree.type)) return error("Unknown type: " .. tostring(tree.type))
end end
end end
NomsuCompiler.tree_to_inline_nomsu = function(self, tree, parenthesize_blocks) NomsuCompiler.tree_to_inline_nomsu = function(self, tree, parenthesize_blocks, check, len)
if parenthesize_blocks == nil then if parenthesize_blocks == nil then
parenthesize_blocks = false parenthesize_blocks = false
end end
if check == nil then
check = nil
end
if len == nil then
len = 0
end
local recurse
recurse = function(tree, nomsu, parenthesize_blocks)
if nomsu == nil then
nomsu = nil
end
if parenthesize_blocks == nil then
parenthesize_blocks = false
end
return self:tree_to_inline_nomsu(tree, parenthesize_blocks, check, len + (nomsu and #tostring(nomsu) or 0))
end
local _exp_0 = tree.type local _exp_0 = tree.type
if "FileChunks" == _exp_0 then if "FileChunks" == _exp_0 then
return error("Cannot inline a FileChunks") return error("Cannot inline a FileChunks")
@ -750,7 +766,7 @@ do
end end
nomsu:append(bit) nomsu:append(bit)
else else
local arg_nomsu = self:tree_to_inline_nomsu(bit, parenthesize_blocks or (i == 1 or i < #tree)) local arg_nomsu = recurse(bit, nomsu, parenthesize_blocks or (i == 1 or i < #tree))
if not (tostring(arg_nomsu):match("^:") or i == 1) then if not (tostring(arg_nomsu):match("^:") or i == 1) then
nomsu:append(" ") nomsu:append(" ")
end end
@ -759,20 +775,32 @@ do
end end
nomsu:append(arg_nomsu) nomsu:append(arg_nomsu)
end end
if check then
check(len + #tostring(nomsu), tree)
end
end end
return nomsu return nomsu
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
local inner_nomsu = self:tree_to_inline_nomsu(tree[1]) local inner_nomsu = recurse(tree[1])
if tree[1].type == "List" or tree[1].type == "Dict" or tree[1].type == "Var" then if not (tree[1].type == "List" or tree[1].type == "Dict" or tree[1].type == "Var") then
return NomsuCode(tree.source, "\\", inner_nomsu) inner_nomsu:parenthesize()
else
return NomsuCode(tree.source, "\\(", inner_nomsu, ")")
end end
local nomsu = NomsuCode(tree.source, "\\", inner_nomsu)
if check then
check(len + #tostring(nomsu), tree)
end
return nomsu
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
if check then
check(len, tree)
end
local nomsu = NomsuCode(tree.source, ":") local nomsu = NomsuCode(tree.source, ":")
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
nomsu:append(i == 1 and " " or "; ") nomsu:append(i == 1 and " " or "; ")
nomsu:append(self:tree_to_inline_nomsu(line, i == 1 or i < #tree)) nomsu:append(recurse(line, nomsu, i == 1 or i < #tree))
if check then
check(len + #tostring(nomsu), tree)
end
end end
if #tree > 1 or parenthesize_blocks then if #tree > 1 or parenthesize_blocks then
nomsu:parenthesize() nomsu:parenthesize()
@ -789,7 +817,7 @@ do
elseif bit.type == "Text" then elseif bit.type == "Text" then
nomsu:append(make_text(bit)) nomsu:append(make_text(bit))
else else
local interp_nomsu = self:tree_to_inline_nomsu(bit) local interp_nomsu = recurse(bit, nomsu)
if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" then if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
elseif bit.type == "Var" and type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then elseif bit.type == "Var" and type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then
@ -797,6 +825,9 @@ do
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
end end
if check then
check(len + #tostring(nomsu), tree)
end
end end
return nomsu return nomsu
end end
@ -807,7 +838,10 @@ do
if i > 1 then if i > 1 then
nomsu:append(", ") nomsu:append(", ")
end end
nomsu:append(self:tree_to_inline_nomsu(item)) nomsu:append(recurse(item, nomsu))
if check then
check(len + #tostring(nomsu), tree)
end
end end
nomsu:append("]") nomsu:append("]")
return nomsu return nomsu
@ -817,32 +851,37 @@ do
if i > 1 then if i > 1 then
nomsu:append(", ") nomsu:append(", ")
end end
nomsu:append(self:tree_to_inline_nomsu(entry)) nomsu:append(recurse(entry, nomsu))
if check then
check(len + #tostring(nomsu), tree)
end
end end
nomsu:append("}") nomsu:append("}")
return nomsu return nomsu
elseif "DictEntry" == _exp_0 then elseif "DictEntry" == _exp_0 then
local key, value = tree[1], tree[2] local key, value = tree[1], tree[2]
local key_nomsu local nomsu
if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) then if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) then
key_nomsu = NomsuCode(key.source, key[1]) nomsu = NomsuCode(key.source, key[1])
else else
key_nomsu = self:tree_to_inline_nomsu(key) nomsu = recurse(key)
end end
if key.type == "Action" or key.type == "Block" then if key.type == "Action" or key.type == "Block" then
key_nomsu:parenthesize() nomsu:parenthesize()
end
local value_nomsu
if value then
value_nomsu = self:tree_to_inline_nomsu(value)
else
value_nomsu = NomsuCode(tree.source, "")
end end
assert(value.type ~= "Block", "Didn't expect to find a Block as a value in a dict") assert(value.type ~= "Block", "Didn't expect to find a Block as a value in a dict")
if value.type == "Block" then nomsu:append(":")
value_nomsu:parenthesize() if value then
local value_nomsu = recurse(value, nomsu)
if value.type == "Block" then
value_nomsu:parenthesize()
end
nomsu:append(value_nomsu)
end end
return NomsuCode(tree.source, key_nomsu, ": ", value_nomsu) if check then
check(len + #tostring(nomsu), tree)
end
return nomsu
elseif "IndexChain" == _exp_0 then elseif "IndexChain" == _exp_0 then
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
@ -853,17 +892,16 @@ do
if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and Parser.is_identifier(bit[1]) then if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and Parser.is_identifier(bit[1]) then
bit_nomsu = bit[1] bit_nomsu = bit[1]
else else
bit_nomsu = self:tree_to_inline_nomsu(bit) bit_nomsu = recurse(bit, nomsu)
end end
local _exp_1 = bit.type assert(bit.type ~= "Block")
if "Action" == _exp_1 or "Block" == _exp_1 or "IndexChain" == _exp_1 then if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree) 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)
if check then
check(len + #tostring(nomsu), tree)
end
end end
return nomsu return nomsu
elseif "Number" == _exp_0 then elseif "Number" == _exp_0 then
@ -874,23 +912,19 @@ do
return error("Unknown type: " .. tostring(tree.type)) return error("Unknown type: " .. tostring(tree.type))
end end
end end
NomsuCompiler.tree_to_nomsu = function(self, tree, comments) NomsuCompiler.tree_to_nomsu = function(self, tree, pop_comments)
if comments == nil then if pop_comments == nil then
comments = nil pop_comments = nil
end end
if not (comments) then if not (pop_comments) then
local visited local comment_set = { }
comments, visited = { }, { }
local find_comments local find_comments
find_comments = function(t) find_comments = function(t)
if t.comments and t.source.filename == tree.source.filename then if t.comments and t.source.filename == tree.source.filename then
local _list_0 = t.comments local _list_0 = t.comments
for _index_0 = 1, #_list_0 do for _index_0 = 1, #_list_0 do
local c = _list_0[_index_0] local c = _list_0[_index_0]
if not (visited[c]) then comment_set[c] = true
insert(comments, c)
visited[c] = true
end
end end
end end
local _list_0 = t local _list_0 = t
@ -902,44 +936,75 @@ do
end end
end end
find_comments(tree) find_comments(tree)
local comments
do
local _accum_0 = { }
local _len_0 = 1
for c in pairs(comment_set) do
_accum_0[_len_0] = c
_len_0 = _len_0 + 1
end
comments = _accum_0
end
table.sort(comments, function(a, b) table.sort(comments, function(a, b)
return (a.pos > b.pos) return (a.pos > b.pos)
end) end)
end pop_comments = function(pos, prefix, suffix)
local pop_comments if prefix == nil then
pop_comments = function(pos, prefix, suffix) prefix = ''
if prefix == nil then
prefix = ''
end
if suffix == nil then
suffix = ''
end
local nomsu = NomsuCode(tree.source)
for i = #comments, 1, -1 do
if comments[i].pos > pos then
break
end end
local comment if suffix == nil then
comment, comments[i] = comments[i].comment, nil suffix = ''
nomsu:append("#" .. (gsub(comment, "\n", "\n ")) .. "\n")
if comment:match("^\n.") then
nomsu:append("\n")
end end
local nomsu = NomsuCode(tree.source)
for i = #comments, 1, -1 do
if comments[i].pos > pos then
break
end
local comment
comment, comments[i] = comments[i].comment, nil
nomsu:append("#" .. (gsub(comment, "\n", "\n ")) .. "\n")
if comment:match("^\n.") then
nomsu:append("\n")
end
end
if #nomsu.bits == 0 then
return ''
end
if not (prefix == '') then
nomsu:prepend(prefix)
end
if not (suffix == '') then
nomsu:append(suffix)
end
return nomsu
end end
if #nomsu.bits == 0 then
return ''
end
if not (prefix == '') then
nomsu:prepend(prefix)
end
if not (suffix == '') then
nomsu:append(suffix)
end
return nomsu
end end
local recurse local recurse
recurse = function(t) recurse = function(t, pos)
return self:tree_to_nomsu(t, comments) if pos == nil then
pos = 0
end
if type(pos) ~= 'number' then
pos = #tostring(pos):match("[ ]*([^\n]*)$")
end
local space = MAX_LINE - pos
local inline
for len, tree in coroutine.wrap(function()
inline = self:tree_to_inline_nomsu(t, false, coroutine.yield)
end) do
if len > MAX_LINE or (tree.type == "Block" and #tree > 1) then
break
end
end
if inline and #tostring(inline) <= space then
return inline
end
local indented = self:tree_to_nomsu(t, pop_comments, space)
if t.type == "Action" and not (tree.type == "Block" or tree.type == "FileChunks") then
indented:prepend("(..)\n ", pop_comments(t.source.start))
end
return indented
end end
local _exp_0 = tree.type local _exp_0 = tree.type
if "FileChunks" == _exp_0 then if "FileChunks" == _exp_0 then
@ -952,7 +1017,7 @@ do
if chunk.type == "Block" then if chunk.type == "Block" then
for line_no, line in ipairs(chunk) do for line_no, line in ipairs(chunk) do
nomsu:append(pop_comments(line.source.start, '\n')) nomsu:append(pop_comments(line.source.start, '\n'))
local line_nomsu = recurse(line) local line_nomsu = self:tree_to_nomsu(line, pop_comments)
nomsu:append(line_nomsu) nomsu:append(line_nomsu)
if line_no < #chunk then if line_no < #chunk then
nomsu:append(line_nomsu:is_multiline() and "\n\n" or "\n") nomsu:append(line_nomsu:is_multiline() and "\n\n" or "\n")
@ -979,43 +1044,25 @@ do
end end
nomsu:append(bit) nomsu:append(bit)
next_space = ' ' next_space = ' '
else elseif bit.type == "Block" then
local inline nomsu:append(recurse(bit, #tostring(nomsu):match('[^\n]*$')))
if bit.type == "Block" and #bit > 1 then
inline = nil
else
local _inline = self:tree_to_inline_nomsu(bit)
inline = (nomsu:trailing_line_len() + #tostring(_inline) < MAX_LINE) and _inline or nil
end
if bit.type == "Block" then
nomsu:append(inline or recurse(bit))
elseif bit.type == "Action" then
nomsu:append(next_space)
if inline then
nomsu:append("(", inline, ")")
else
nomsu:append(NomsuCode(bit.source, "(..)\n ", pop_comments(bit.source.start), recurse(bit)))
end
else
nomsu:append(next_space, (inline or recurse(bit)))
end
pos = bit.source.stop pos = bit.source.stop
next_space = inline and " " or "\n.." next_space = inline and " " or "\n.."
else
nomsu:append(next_space)
local bit_nomsu = recurse(bit, #tostring(nomsu):match('[^\n]*$'))
if bit.type == "Action" and not bit_nomsu:is_multiline() then
bit_nomsu:parenthesize()
end
nomsu:append(bit_nomsu)
pos = bit.source.stop
next_space = bit_nomsu:is_multiline() and "\n.." or " "
end end
end end
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return nomsu return nomsu
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
local inline_nomsu = self:tree_to_inline_nomsu(tree) return NomsuCode(tree.source, "\\", recurse(tree[1], 1))
if not (#tostring(inline_nomsu) > MAX_LINE) then
return inline_nomsu
end
local _exp_1 = tree[1].type
if "List" == _exp_1 or "Dict" == _exp_1 or "Text" == _exp_1 or "Block" == _exp_1 then
return NomsuCode(tree.source, "\\", recurse(tree[1]))
else
return NomsuCode(tree.source, "\\(..)\n ", pop_comments(tree.source.start), recurse(tree[1]))
end
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) local nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
@ -1029,13 +1076,8 @@ do
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return NomsuCode(tree.source, ":\n ", nomsu) return NomsuCode(tree.source, ":\n ", nomsu)
elseif "Text" == _exp_0 then elseif "Text" == _exp_0 then
local inline_version = self:tree_to_inline_nomsu(tree) local add_text
if inline_version and #tostring(inline_version) <= MAX_LINE then add_text = function(nomsu, tree)
return inline_version
end
local make_text
make_text = function(tree)
local nomsu = NomsuCode(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == 'string' then if type(bit) == 'string' then
bit = Parser.escape(bit) bit = Parser.escape(bit)
@ -1043,156 +1085,97 @@ do
for j, line in ipairs(bit_lines) do for j, line in ipairs(bit_lines) do
if j > 1 then if j > 1 then
nomsu:append("\n") nomsu:append("\n")
elseif #line > 10 and nomsu:trailing_line_len() > MAX_LINE then
nomsu:append("\\\n..")
end end
if #line > 1.25 * MAX_LINE then while #line > 0 do
local remainder = line local space = MAX_LINE - nomsu:trailing_line_len()
while #remainder > 0 do local split = find(line, " ", space, true)
local split = find(remainder, " ", MAX_LINE, true) if not split or split > space + 10 then
if split then split = space + 10
local chunk end
chunk, remainder = sub(remainder, 1, split), sub(remainder, split + 1, -1) if #line - split < 10 then
nomsu:append(chunk) split = #line
elseif #remainder > 1.75 * MAX_LINE then end
split = math.floor(1.5 * MAX_LINE) local bite
local chunk bite, line = sub(line, 1, split), sub(line, split + 1, -1)
chunk, remainder = sub(remainder, 1, split), sub(remainder, split + 1, -1) nomsu:append(bite)
nomsu:append(chunk) if #line > 0 then
else nomsu:append("\\\n..")
nomsu:append(remainder)
break
end
if #remainder > 0 then
nomsu:append("\\\n..")
end
end end
else
nomsu:append(line)
end end
end end
elseif bit.type == "Text" then elseif bit.type == "Text" then
nomsu:append(make_text(bit)) add_text(nomsu, bit)
else else
local interp_nomsu = self:tree_to_inline_nomsu(bit) nomsu:append("\\")
if nomsu:trailing_line_len() + #tostring(interp_nomsu) <= MAX_LINE then local interp_nomsu = recurse(bit, #tostring(nomsu):match('[^\n]*$'))
if not (interp_nomsu:is_multiline()) then
if bit.type == "Var" then if bit.type == "Var" then
if type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then if type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
elseif bit.type == "List" or bit.type == "Dict" then elseif bit.type ~= "List" and bit.type ~= "Dict" then
nomsu:append("\\", interp_nomsu) interp_nomsu:parenthesize()
else
nomsu:append("\\(", interp_nomsu, ")")
end
else
interp_nomsu = recurse(bit)
if bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" and bit.type ~= "Block" then
nomsu:append("\\(..)\n ", interp_nomsu)
else
nomsu:append("\\", interp_nomsu)
end
if i < #tree then
nomsu:append("\n..")
end end
end end
nomsu:append(interp_nomsu)
if interp_nomsu:is_multiline() and i < #tree then
nomsu:append("\n..")
end
end end
end end
return nomsu
end end
return NomsuCode(tree.source, '".."\n ', make_text(tree)) local nomsu = NomsuCode(tree.source)
add_text(nomsu, tree)
return NomsuCode(tree.source, '".."\n ', nomsu)
elseif "List" == _exp_0 then elseif "List" == _exp_0 then
local inline_version = self:tree_to_inline_nomsu(tree)
if inline_version and #tostring(inline_version) <= MAX_LINE then
return inline_version
end
assert(#tree > 0) assert(#tree > 0)
local nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start)) local nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start))
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local inline = self:tree_to_inline_nomsu(item) assert(item.type ~= "Block", "Didn't expect to find a Block inside a list")
local item_nomsu = self:tree_to_inline_nomsu(item) if nomsu:trailing_line_len() == 0 then
if item.type == "Block" then nomsu:append(pop_comments(item.source.start))
item_nomsu:parenthesize()
end end
if nomsu:trailing_line_len() + #tostring(item_nomsu) <= MAX_LINE then local inline_nomsu = self:tree_to_inline_nomsu(item)
if nomsu:trailing_line_len() > 0 then local item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu):match('[^\n]*$'))
nomsu:append(", ") nomsu:append(item_nomsu)
end if i < #tree then
nomsu:append(item_nomsu) nomsu:append((item_nomsu:is_multiline() or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
elseif #tostring(item_nomsu) <= MAX_LINE then
if nomsu:trailing_line_len() > 0 then
nomsu:append("\n", pop_comments(item_nomsu.source.start))
end
nomsu:append(item_nomsu)
else
item_nomsu = recurse(item)
if item.type == "Action" then
nomsu:append("(..)\n ", pop_comments(item_nomsu.source.start), item_nomsu)
else
nomsu:append(item_nomsu)
end
if i < #tree then
nomsu:append("\n")
end
end end
end end
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return NomsuCode(tree.source, "[..]\n ", nomsu) return NomsuCode(tree.source, "[..]\n ", nomsu)
elseif "Dict" == _exp_0 then elseif "Dict" == _exp_0 then
local inline_version = self:tree_to_inline_nomsu(tree)
if inline_version and #tostring(inline_version) <= MAX_LINE then
return inline_version
end
assert(#tree > 0) assert(#tree > 0)
local nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start)) local nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start))
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local item_nomsu = self:tree_to_inline_nomsu(item) assert(item.type == "DictEntry", "Only expected to find DictEntry items in a Dict")
if item.type == "Block" then if nomsu:trailing_line_len() == 0 then
item_nomsu:parenthesize() nomsu:append(pop_comments(item.source.start))
end end
if nomsu:trailing_line_len() + #tostring(item_nomsu) <= MAX_LINE then local inline_nomsu = self:tree_to_inline_nomsu(item)
if nomsu:trailing_line_len() > 0 then local item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu):match('[^\n]*$'))
nomsu:append(", ") nomsu:append(item_nomsu)
end if i < #tree then
nomsu:append(item_nomsu) nomsu:append((item_nomsu:is_multiline() or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
elseif #tostring(item_nomsu) <= MAX_LINE then
if nomsu:trailing_line_len() > 0 then
nomsu:append("\n", pop_comments(item_nomsu.source.start))
end
nomsu:append(item_nomsu)
else
item_nomsu = recurse(item)
if item.type == "Action" then
nomsu:append("(..)\n ", pop_comments(item_nomsu.source.start), item_nomsu)
else
nomsu:append(item_nomsu)
end
if i < #tree then
nomsu:append("\n")
end
end end
end end
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return NomsuCode(tree.source, "{..}\n ", nomsu) return NomsuCode(tree.source, "{..}\n ", nomsu)
elseif "DictEntry" == _exp_0 then elseif "DictEntry" == _exp_0 then
local inline_version = self:tree_to_inline_nomsu(tree)
if #tostring(inline_version) <= MAX_LINE then
return inline_version
end
local key, value = tree[1], tree[2] local key, value = tree[1], tree[2]
local key_nomsu local nomsu
if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) then if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) then
key_nomsu = NomsuCode(key.source, key[1]) nomsu = NomsuCode(key.source, key[1])
else else
key_nomsu = self:tree_to_inline_nomsu(key) nomsu = self:tree_to_inline_nomsu(key)
end end
if key.type == "Action" or key.type == "Block" then if key.type == "Action" or key.type == "Block" then
key_nomsu:parenthesize() nomsu:parenthesize()
end
local value_nomsu = recurse(value)
if value.type == "List" or value.type == "Dict" or value.type == "Text" or value.type == "Block" then
return NomsuCode(tree.source, key_nomsu, ": ", value_nomsu)
else
return NomsuCode(tree.source, key_nomsu, ": (..)\n ", value_nomsu)
end end
nomsu:append(": ", recurse(value, #tostring(nomsu)))
return nomsu
elseif "IndexChain" == _exp_0 or "Number" == _exp_0 or "Var" == _exp_0 then elseif "IndexChain" == _exp_0 or "Number" == _exp_0 or "Var" == _exp_0 then
return self:tree_to_inline_nomsu(tree) return self:tree_to_inline_nomsu(tree)
else else

280
nomsu_compiler.moon
View File

@ -484,7 +484,9 @@ with NomsuCompiler
else else
error("Unknown type: #{tree.type}") error("Unknown type: #{tree.type}")
.tree_to_inline_nomsu = (tree, parenthesize_blocks=false)=> .tree_to_inline_nomsu = (tree, parenthesize_blocks=false, check=nil, len=0)=>
recurse = (tree, nomsu=nil, parenthesize_blocks=false)->
@tree_to_inline_nomsu(tree, parenthesize_blocks, check, len + (nomsu and #tostring(nomsu) or 0))
switch tree.type switch tree.type
when "FileChunks" when "FileChunks"
error("Cannot inline a FileChunks") error("Cannot inline a FileChunks")
@ -497,24 +499,28 @@ with NomsuCompiler
nomsu\append " " if i > 1 and not clump_words nomsu\append " " if i > 1 and not clump_words
nomsu\append bit nomsu\append bit
else else
arg_nomsu = @tree_to_inline_nomsu(bit, parenthesize_blocks or (i == 1 or i < #tree)) arg_nomsu = recurse(bit, nomsu, parenthesize_blocks or (i == 1 or i < #tree))
nomsu\append " " unless tostring(arg_nomsu)\match("^:") or i == 1 nomsu\append " " unless tostring(arg_nomsu)\match("^:") or i == 1
arg_nomsu\parenthesize! if bit.type == "Action" arg_nomsu\parenthesize! if bit.type == "Action"
nomsu\append arg_nomsu nomsu\append arg_nomsu
check(len+#tostring(nomsu), tree) if check
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
inner_nomsu = @tree_to_inline_nomsu(tree[1]) inner_nomsu = recurse(tree[1])
if tree[1].type == "List" or tree[1].type == "Dict" or tree[1].type == "Var" unless tree[1].type == "List" or tree[1].type == "Dict" or tree[1].type == "Var"
return NomsuCode(tree.source, "\\", inner_nomsu) inner_nomsu\parenthesize!
else nomsu = NomsuCode(tree.source, "\\", inner_nomsu)
return NomsuCode(tree.source, "\\(", inner_nomsu, ")") check(len+#tostring(nomsu), tree) if check
return nomsu
when "Block" when "Block"
check(len, tree) if check
nomsu = NomsuCode(tree.source, ":") nomsu = NomsuCode(tree.source, ":")
for i,line in ipairs tree for i,line in ipairs tree
nomsu\append(i == 1 and " " or "; ") nomsu\append(i == 1 and " " or "; ")
nomsu\append @tree_to_inline_nomsu(line, i == 1 or i < #tree) nomsu\append recurse(line, nomsu, i == 1 or i < #tree)
check(len+#tostring(nomsu), tree) if check
nomsu\parenthesize! if #tree > 1 or parenthesize_blocks nomsu\parenthesize! if #tree > 1 or parenthesize_blocks
return nomsu return nomsu
@ -528,12 +534,13 @@ with NomsuCompiler
elseif bit.type == "Text" elseif bit.type == "Text"
nomsu\append(make_text(bit)) nomsu\append(make_text(bit))
else else
interp_nomsu = @tree_to_inline_nomsu(bit) interp_nomsu = recurse(bit, nomsu)
if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
elseif bit.type == "Var" and type(tree[i+1]) == 'string' and not match(tree[i+1], "^[ \n\t,.:;#(){}[%]]") elseif bit.type == "Var" and type(tree[i+1]) == 'string' and not match(tree[i+1], "^[ \n\t,.:;#(){}[%]]")
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
check(len+#tostring(nomsu), tree) if check
return nomsu return nomsu
return NomsuCode(tree.source, '"', make_text(tree), '"') return NomsuCode(tree.source, '"', make_text(tree), '"')
@ -541,7 +548,8 @@ with NomsuCompiler
nomsu = NomsuCode(tree.source, "[") nomsu = NomsuCode(tree.source, "[")
for i, item in ipairs tree for i, item in ipairs tree
nomsu\append ", " if i > 1 nomsu\append ", " if i > 1
nomsu\append @tree_to_inline_nomsu(item) nomsu\append recurse(item, nomsu)
check(len+#tostring(nomsu), tree) if check
nomsu\append "]" nomsu\append "]"
return nomsu return nomsu
@ -549,22 +557,25 @@ with NomsuCompiler
nomsu = NomsuCode(tree.source, "{") nomsu = NomsuCode(tree.source, "{")
for i, entry in ipairs tree for i, entry in ipairs tree
nomsu\append ", " if i > 1 nomsu\append ", " if i > 1
nomsu\append @tree_to_inline_nomsu(entry) nomsu\append recurse(entry, nomsu)
check(len+#tostring(nomsu), tree) if check
nomsu\append "}" nomsu\append "}"
return nomsu return nomsu
when "DictEntry" when "DictEntry"
key, value = tree[1], tree[2] key, value = tree[1], tree[2]
key_nomsu = if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) nomsu = if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1])
NomsuCode(key.source, key[1]) NomsuCode(key.source, key[1])
else @tree_to_inline_nomsu(key) else recurse(key)
key_nomsu\parenthesize! if key.type == "Action" or key.type == "Block" nomsu\parenthesize! if key.type == "Action" or key.type == "Block"
value_nomsu = if value
@tree_to_inline_nomsu(value)
else NomsuCode(tree.source, "")
assert(value.type != "Block", "Didn't expect to find a Block as a value in a dict") assert(value.type != "Block", "Didn't expect to find a Block as a value in a dict")
value_nomsu\parenthesize! if value.type == "Block" nomsu\append ":"
return NomsuCode tree.source, key_nomsu, ": ", value_nomsu if value
value_nomsu = recurse(value, nomsu)
value_nomsu\parenthesize! if value.type == "Block"
nomsu\append value_nomsu
check(len+#tostring(nomsu), tree) if check
return nomsu
when "IndexChain" when "IndexChain"
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
@ -573,14 +584,12 @@ with NomsuCompiler
local bit_nomsu local bit_nomsu
bit_nomsu = if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and Parser.is_identifier(bit[1]) bit_nomsu = if bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and Parser.is_identifier(bit[1])
bit[1] bit[1]
else @tree_to_inline_nomsu(bit) else recurse(bit, nomsu)
switch bit.type assert bit.type != "Block"
when "Action", "Block", "IndexChain" if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree)
bit_nomsu\parenthesize! bit_nomsu\parenthesize!
when "Number"
if i < #tree
bit_nomsu\parenthesize!
nomsu\append bit_nomsu nomsu\append bit_nomsu
check(len+#tostring(nomsu), tree) if check
return nomsu return nomsu
when "Number" when "Number"
@ -592,34 +601,44 @@ with NomsuCompiler
else else
error("Unknown type: #{tree.type}") error("Unknown type: #{tree.type}")
.tree_to_nomsu = (tree, comments=nil)=> .tree_to_nomsu = (tree, pop_comments=nil)=>
unless comments unless pop_comments
comments, visited = {}, {} comment_set = {}
find_comments = (t)-> find_comments = (t)->
if t.comments and t.source.filename == tree.source.filename if t.comments and t.source.filename == tree.source.filename
for c in *t.comments comment_set[c] = true for c in *t.comments
unless visited[c]
insert(comments, c)
visited[c] = true
find_comments(x) for x in *t when AST.is_syntax_tree x find_comments(x) for x in *t when AST.is_syntax_tree x
find_comments(tree) find_comments(tree)
-- Sort in reversed order so they can be easily popped -- Sort in reversed order so they can be easily popped
comments = [c for c in pairs comment_set]
table.sort(comments, (a,b)->(a.pos > b.pos)) table.sort(comments, (a,b)->(a.pos > b.pos))
pop_comments = (pos, prefix='', suffix='')-> pop_comments = (pos, prefix='', suffix='')->
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
for i=#comments,1,-1 for i=#comments,1,-1
break if comments[i].pos > pos break if comments[i].pos > pos
comment, comments[i] = comments[i].comment, nil comment, comments[i] = comments[i].comment, nil
nomsu\append("#"..(gsub(comment, "\n", "\n ")).."\n") nomsu\append("#"..(gsub(comment, "\n", "\n ")).."\n")
if comment\match("^\n.") then nomsu\append("\n") -- for aesthetics if comment\match("^\n.") then nomsu\append("\n") -- for aesthetics
return '' if #nomsu.bits == 0 return '' if #nomsu.bits == 0
nomsu\prepend(prefix) unless prefix == '' nomsu\prepend(prefix) unless prefix == ''
nomsu\append(suffix) unless suffix == '' nomsu\append(suffix) unless suffix == ''
return nomsu return nomsu
-- For concision: -- For concision:
recurse = (t)-> @tree_to_nomsu(t, comments) recurse = (t, pos)->
if pos == nil then pos = 0
if type(pos) != 'number' then pos = #tostring(pos)\match("[ ]*([^\n]*)$")
space = MAX_LINE - pos
local inline
for len, tree in coroutine.wrap(-> inline = @tree_to_inline_nomsu(t, false, coroutine.yield))
break if len > MAX_LINE or (tree.type == "Block" and #tree > 1)
return inline if inline and #tostring(inline) <= space
indented = @tree_to_nomsu(t, pop_comments, space)
if t.type == "Action" and not (tree.type == "Block" or tree.type == "FileChunks")
indented\prepend("(..)\n ", pop_comments(t.source.start))
--return inline if inline and #tostring(indented) <= #tostring(inline) + 10
return indented
switch tree.type switch tree.type
when "FileChunks" when "FileChunks"
@ -630,7 +649,7 @@ with NomsuCompiler
if chunk.type == "Block" if chunk.type == "Block"
for line_no, line in ipairs chunk for line_no, line in ipairs chunk
nomsu\append pop_comments(line.source.start, '\n') nomsu\append pop_comments(line.source.start, '\n')
line_nomsu = recurse(line) line_nomsu = @tree_to_nomsu(line, pop_comments)
nomsu\append line_nomsu nomsu\append line_nomsu
nomsu\append(line_nomsu\is_multiline! and "\n\n" or "\n") if line_no < #chunk nomsu\append(line_nomsu\is_multiline! and "\n\n" or "\n") if line_no < #chunk
nomsu\append pop_comments(chunk.source.stop, '\n') nomsu\append pop_comments(chunk.source.stop, '\n')
@ -652,36 +671,24 @@ with NomsuCompiler
nomsu\append(next_space) nomsu\append(next_space)
nomsu\append bit nomsu\append bit
next_space = ' ' next_space = ' '
else elseif bit.type == "Block"
inline = if bit.type == "Block" and #bit > 1 then nil nomsu\append(recurse(bit, #tostring(nomsu)\match('[^\n]*$')))
else
_inline = @tree_to_inline_nomsu(bit)
(nomsu\trailing_line_len! + #tostring(_inline) < MAX_LINE) and _inline or nil
if bit.type == "Block"
nomsu\append(inline or recurse(bit))
elseif bit.type == "Action"
nomsu\append next_space
if inline
nomsu\append "(", inline, ")"
else
nomsu\append NomsuCode(bit.source, "(..)\n ", pop_comments(bit.source.start), recurse(bit))
else
nomsu\append next_space, (inline or recurse(bit))
pos = bit.source.stop pos = bit.source.stop
next_space = inline and " " or "\n.." next_space = inline and " " or "\n.."
else
nomsu\append next_space
bit_nomsu = recurse(bit, #tostring(nomsu)\match('[^\n]*$'))
if bit.type == "Action" and not bit_nomsu\is_multiline!
bit_nomsu\parenthesize!
nomsu\append bit_nomsu
pos = bit.source.stop
next_space = bit_nomsu\is_multiline! and "\n.." or " "
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
inline_nomsu = @tree_to_inline_nomsu tree return NomsuCode tree.source, "\\", recurse(tree[1], 1)
return inline_nomsu unless #tostring(inline_nomsu) > MAX_LINE
return switch tree[1].type
when "List", "Dict", "Text", "Block"
NomsuCode tree.source, "\\", recurse(tree[1])
else
NomsuCode tree.source, "\\(..)\n ",
pop_comments(tree.source.start), recurse(tree[1])
when "Block" when "Block"
nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
@ -695,124 +702,81 @@ with NomsuCompiler
return NomsuCode(tree.source, ":\n ", nomsu) return NomsuCode(tree.source, ":\n ", nomsu)
when "Text" when "Text"
inline_version = @tree_to_inline_nomsu(tree) add_text = (nomsu, tree)->
if inline_version and #tostring(inline_version) <= MAX_LINE
return inline_version
make_text = (tree)->
nomsu = NomsuCode(tree.source)
for i, bit in ipairs tree for i, bit in ipairs tree
if type(bit) == 'string' if type(bit) == 'string'
bit = Parser.escape(bit) bit = Parser.escape(bit)
bit_lines = files.get_lines(bit) bit_lines = files.get_lines(bit)
for j, line in ipairs bit_lines for j, line in ipairs bit_lines
if j > 1 then nomsu\append "\n" if j > 1
if #line > 1.25*MAX_LINE nomsu\append "\n"
remainder = line elseif #line > 10 and nomsu\trailing_line_len! > MAX_LINE
while #remainder > 0 nomsu\append "\\\n.."
split = find(remainder, " ", MAX_LINE, true)
if split while #line > 0
chunk, remainder = sub(remainder, 1, split), sub(remainder, split+1, -1) space = MAX_LINE - nomsu\trailing_line_len!
nomsu\append chunk split = find(line, " ", space, true)
elseif #remainder > 1.75*MAX_LINE if not split or split > space + 10
split = math.floor(1.5*MAX_LINE) split = space + 10
chunk, remainder = sub(remainder, 1, split), sub(remainder, split+1, -1) if #line - split < 10
nomsu\append chunk split = #line
else bite, line = sub(line, 1, split), sub(line, split+1, -1)
nomsu\append remainder nomsu\append bite
break nomsu\append "\\\n.." if #line > 0
if #remainder > 0 then nomsu\append "\\\n.."
else
nomsu\append line
elseif bit.type == "Text" elseif bit.type == "Text"
nomsu\append make_text(bit) add_text(nomsu, bit)
else else
interp_nomsu = @tree_to_inline_nomsu(bit) nomsu\append "\\"
if nomsu\trailing_line_len! + #tostring(interp_nomsu) <= MAX_LINE interp_nomsu = recurse(bit, #tostring(nomsu)\match('[^\n]*$'))
unless interp_nomsu\is_multiline!
if bit.type == "Var" if bit.type == "Var"
if type(tree[i+1]) == 'string' and not match(tree[i+1], "^[ \n\t,.:;#(){}[%]]") if type(tree[i+1]) == 'string' and not match(tree[i+1], "^[ \n\t,.:;#(){}[%]]")
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
elseif bit.type == "List" or bit.type == "Dict" elseif bit.type != "List" and bit.type != "Dict"
nomsu\append "\\", interp_nomsu interp_nomsu\parenthesize!
else nomsu\append interp_nomsu
nomsu\append "\\(", interp_nomsu, ")" if interp_nomsu\is_multiline! and i < #tree
else nomsu\append "\n.."
interp_nomsu = recurse(bit) nomsu = NomsuCode(tree.source)
if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" and bit.type != "Block" add_text(nomsu, tree)
nomsu\append "\\(..)\n ", interp_nomsu return NomsuCode(tree.source, '".."\n ', nomsu)
else
nomsu\append "\\", interp_nomsu
if i < #tree
nomsu\append "\n.."
return nomsu
return NomsuCode(tree.source, '".."\n ', make_text(tree))
when "List" when "List"
inline_version = @tree_to_inline_nomsu tree
if inline_version and #tostring(inline_version) <= MAX_LINE
return inline_version
assert #tree > 0 assert #tree > 0
nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start))
for i, item in ipairs tree for i, item in ipairs tree
inline = @tree_to_inline_nomsu(item) assert item.type != "Block", "Didn't expect to find a Block inside a list"
item_nomsu = @tree_to_inline_nomsu(item) nomsu\append(pop_comments(item.source.start)) if nomsu\trailing_line_len! == 0
item_nomsu\parenthesize! if item.type == "Block" inline_nomsu = @tree_to_inline_nomsu(item)
if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu)\match('[^\n]*$'))
nomsu\append ", " if nomsu\trailing_line_len! > 0 nomsu\append item_nomsu
nomsu\append item_nomsu if i < #tree
elseif #tostring(item_nomsu) <= MAX_LINE nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
if nomsu\trailing_line_len! > 0
nomsu\append "\n", pop_comments(item_nomsu.source.start)
nomsu\append item_nomsu
else
item_nomsu = recurse(item)
if item.type == "Action"
nomsu\append "(..)\n ", pop_comments(item_nomsu.source.start), item_nomsu
else
nomsu\append item_nomsu
nomsu\append "\n" if i < #tree
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "[..]\n ", nomsu) return NomsuCode(tree.source, "[..]\n ", nomsu)
when "Dict" when "Dict"
inline_version = @tree_to_inline_nomsu tree
if inline_version and #tostring(inline_version) <= MAX_LINE
return inline_version
assert #tree > 0 assert #tree > 0
nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start))
for i, item in ipairs tree for i, item in ipairs tree
item_nomsu = @tree_to_inline_nomsu(item) assert item.type == "DictEntry", "Only expected to find DictEntry items in a Dict"
item_nomsu\parenthesize! if item.type == "Block" nomsu\append(pop_comments(item.source.start)) if nomsu\trailing_line_len! == 0
if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE inline_nomsu = @tree_to_inline_nomsu(item)
nomsu\append ", " if nomsu\trailing_line_len! > 0 item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu)\match('[^\n]*$'))
nomsu\append item_nomsu nomsu\append item_nomsu
elseif #tostring(item_nomsu) <= MAX_LINE if i < #tree
if nomsu\trailing_line_len! > 0 nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
nomsu\append "\n", pop_comments(item_nomsu.source.start)
nomsu\append item_nomsu
else
item_nomsu = recurse(item)
if item.type == "Action"
nomsu\append "(..)\n ", pop_comments(item_nomsu.source.start), item_nomsu
else
nomsu\append item_nomsu
nomsu\append "\n" if i < #tree
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "{..}\n ", nomsu) return NomsuCode(tree.source, "{..}\n ", nomsu)
when "DictEntry" when "DictEntry"
inline_version = @tree_to_inline_nomsu tree
if #tostring(inline_version) <= MAX_LINE
return inline_version
key, value = tree[1], tree[2] key, value = tree[1], tree[2]
key_nomsu = if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1]) nomsu = if key.type == "Text" and #key == 1 and Parser.is_identifier(key[1])
NomsuCode(key.source, key[1]) NomsuCode(key.source, key[1])
else @tree_to_inline_nomsu(key) else @tree_to_inline_nomsu(key)
key_nomsu\parenthesize! if key.type == "Action" or key.type == "Block" nomsu\parenthesize! if key.type == "Action" or key.type == "Block"
value_nomsu = recurse(value) nomsu\append ": ", recurse(value, #tostring(nomsu))
if value.type == "List" or value.type == "Dict" or value.type == "Text" or value.type == "Block" return nomsu
return NomsuCode tree.source, key_nomsu, ": ", value_nomsu
else
return NomsuCode tree.source, key_nomsu, ": (..)\n ", value_nomsu
when "IndexChain", "Number", "Var" when "IndexChain", "Number", "Var"
return @tree_to_inline_nomsu tree return @tree_to_inline_nomsu tree