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

Improving and cleaning up nomsu codegen.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-19 22:59:29 -07:00
parent 53bec8091f
commit 9f0b5384d7
2 changed files with 89 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
nomsu_compiler.lua
View File

@ -893,8 +893,9 @@ do
end end
end end
end end
for _index_0 = 1, #t do local _list_0 = t
local x = t[_index_0] for _index_0 = 1, #_list_0 do
local x = _list_0[_index_0]
if AST.is_syntax_tree(x) then if AST.is_syntax_tree(x) then
find_comments(x) find_comments(x)
end end
@ -915,21 +916,25 @@ do
end end
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
for i = #comments, 1, -1 do for i = #comments, 1, -1 do
local comment = comments[i] if comments[i].pos > pos then
if comment.pos > pos then
break break
end end
comments[i] = nil local comment
nomsu:append("#" .. (gsub(comment.comment, "\n", "\n ")) .. "\n") comment, comments[i] = comments[i].comment, nil
if comment.comment:match("^\n.") then nomsu:append("#" .. (gsub(comment, "\n", "\n ")) .. "\n")
if comment:match("^\n.") then
nomsu:append("\n") nomsu:append("\n")
end end
end end
if #nomsu.bits == 0 then if #nomsu.bits == 0 then
return '' return ''
end end
nomsu:prepend(prefix) if not (prefix == '') then
nomsu:append(suffix) nomsu:prepend(prefix)
end
if not (suffix == '') then
nomsu:append(suffix)
end
return nomsu return nomsu
end end
local recurse local recurse
@ -961,73 +966,55 @@ do
nomsu:append(pop_comments(tree.source.stop, '\n')) nomsu:append(pop_comments(tree.source.stop, '\n'))
return nomsu return nomsu
elseif "Action" == _exp_0 then elseif "Action" == _exp_0 then
local pos = tree.source.start local pos, next_space = tree.source.start, ''
local nomsu = NomsuCode(tree.source, pop_comments(pos)) local nomsu = NomsuCode(tree.source, pop_comments(pos))
local next_space = ""
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if match(next_space, '\n') then if next_space == "\n.." or (next_space == " " and nomsu:trailing_line_len() > MAX_LINE) then
nomsu:append(pop_comments(pos, '\n')) nomsu:append("\n", pop_comments(pos), '..')
next_space = ""
end end
if type(bit) == "string" then if type(bit) == "string" then
if next_space == ' ' and (type(tree[i - 1]) == 'string' and Parser.is_operator(bit) ~= Parser.is_operator(tree[i - 1])) then if not (type(tree[i - 1]) == 'string' and Parser.is_operator(tree[i - 1]) ~= Parser.is_operator(bit)) then
next_space = '' nomsu:append(next_space)
end end
nomsu:append(next_space, bit) nomsu:append(bit)
next_space = " " next_space = ' '
else else
local arg_nomsu local inline
if bit.type == "Block" and #bit > 1 then if bit.type == "Block" and #bit > 1 then
arg_nomsu = nil inline = nil
else else
arg_nomsu = self:tree_to_inline_nomsu(bit) local _inline = self:tree_to_inline_nomsu(bit)
end inline = (nomsu:trailing_line_len() + #tostring(_inline) < MAX_LINE) and _inline or nil
if bit.type == "Text" and tostring(arg_nomsu) ~= '"\\n"' and tostring(arg_nomsu):match("\\n") then
arg_nomsu = nil
end end
if bit.type == "Block" then if bit.type == "Block" then
next_space = match(next_space, "[^ ]*") nomsu:append(inline or recurse(bit))
end elseif bit.type == "Action" then
nomsu:append(next_space) nomsu:append(next_space)
if arg_nomsu and nomsu:trailing_line_len() + #tostring(arg_nomsu) < MAX_LINE then if inline then
if bit.type == "Block" then nomsu:append("(", inline, ")")
nomsu:append(arg_nomsu)
next_space = "\n.."
else else
if bit.type == "Action" then nomsu:append(NomsuCode(bit.source, "(..)\n ", pop_comments(bit.source.start), recurse(bit)))
arg_nomsu:parenthesize()
end
nomsu:append(arg_nomsu)
next_space = " "
end end
else else
arg_nomsu = assert(recurse(bit)) nomsu:append(next_space, (inline or recurse(bit)))
local _exp_1 = bit.type
if "List" == _exp_1 or "Dict" == _exp_1 or "Text" == _exp_1 or "Block" == _exp_1 or "EscapedNomsu" == _exp_1 then
nomsu:append(arg_nomsu)
else
nomsu:append(NomsuCode(bit.source, "(..)\n ", pop_comments(bit.source.start), arg_nomsu))
end
next_space = "\n.."
end end
pos = bit.source.stop pos = bit.source.stop
end next_space = inline and " " or "\n.."
if next_space == " " and nomsu:trailing_line_len() > MAX_LINE then
next_space = "\n.."
end end
end end
nomsu:append(pop_comments(pos, '\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) local inline_nomsu = self:tree_to_inline_nomsu(tree)
if #tostring(inline_nomsu) <= MAX_LINE then if not (#tostring(inline_nomsu) > MAX_LINE) then
return inline_nomsu return inline_nomsu
end end
local nomsu = recurse(tree[1])
local _exp_1 = tree[1].type local _exp_1 = tree[1].type
if "List" == _exp_1 or "Dict" == _exp_1 or "Text" == _exp_1 or "Block" == _exp_1 then if "List" == _exp_1 or "Dict" == _exp_1 or "Text" == _exp_1 or "Block" == _exp_1 then
return NomsuCode(tree.source, "\\", nomsu) return NomsuCode(tree.source, "\\", recurse(tree[1]))
else else
return NomsuCode(tree.source, "\\(..)\n ", pop_comments(tree.source.start), nomsu) return NomsuCode(tree.source, "\\(..)\n ", pop_comments(tree.source.start), recurse(tree[1]))
end 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))
@ -1087,12 +1074,11 @@ do
else else
local interp_nomsu = self:tree_to_inline_nomsu(bit) local interp_nomsu = self:tree_to_inline_nomsu(bit)
if nomsu:trailing_line_len() + #tostring(interp_nomsu) <= MAX_LINE then if nomsu:trailing_line_len() + #tostring(interp_nomsu) <= MAX_LINE then
local _exp_1 = bit.type if bit.type == "Var" then
if "Var" == _exp_1 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 "List" == _exp_1 or "Dict" == _exp_1 then elseif bit.type == "List" or bit.type == "Dict" then
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
else else
nomsu:append("\\(", interp_nomsu, ")") nomsu:append("\\(", interp_nomsu, ")")
@ -1121,6 +1107,7 @@ do
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)
local item_nomsu = self:tree_to_inline_nomsu(item) local item_nomsu = self:tree_to_inline_nomsu(item)
if item.type == "Block" then if item.type == "Block" then
item_nomsu:parenthesize() item_nomsu:parenthesize()

108
nomsu_compiler.moon
View File

@ -601,8 +601,7 @@ with NomsuCompiler
unless visited[c] unless visited[c]
insert(comments, c) insert(comments, c)
visited[c] = true visited[c] = true
for x in *t find_comments(x) for x in *t when AST.is_syntax_tree x
find_comments(x) if 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
table.sort(comments, (a,b)->(a.pos > b.pos)) table.sort(comments, (a,b)->(a.pos > b.pos))
@ -610,14 +609,13 @@ with NomsuCompiler
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
comment = comments[i] break if comments[i].pos > pos
break if comment.pos > pos comment, comments[i] = comments[i].comment, nil
comments[i] = nil nomsu\append("#"..(gsub(comment, "\n", "\n ")).."\n")
nomsu\append("#"..(gsub(comment.comment, "\n", "\n ")).."\n") if comment\match("^\n.") then nomsu\append("\n") -- for aesthetics
if comment.comment\match("^\n.") then nomsu\append("\n") -- for aesthetics
return '' if #nomsu.bits == 0 return '' if #nomsu.bits == 0
nomsu\prepend prefix nomsu\prepend(prefix) unless prefix == ''
nomsu\append suffix nomsu\append(suffix) unless suffix == ''
return nomsu return nomsu
-- For concision: -- For concision:
@ -642,58 +640,48 @@ with NomsuCompiler
return nomsu return nomsu
when "Action" when "Action"
pos = tree.source.start pos, next_space = tree.source.start, ''
nomsu = NomsuCode(tree.source, pop_comments(pos)) nomsu = NomsuCode(tree.source, pop_comments(pos))
next_space = ""
for i,bit in ipairs tree for i,bit in ipairs tree
if match(next_space, '\n') if next_space == "\n.." or (next_space == " " and nomsu\trailing_line_len! > MAX_LINE)
nomsu\append pop_comments(pos, '\n') nomsu\append "\n", pop_comments(pos), '..'
if type(bit) == "string" next_space = ""
if next_space == ' ' and (type(tree[i-1]) == 'string' and Parser.is_operator(bit) != Parser.is_operator(tree[i-1]))
next_space = ''
nomsu\append next_space, bit
next_space = " "
else
arg_nomsu = if bit.type == "Block" and #bit > 1 then nil
else @tree_to_inline_nomsu(bit)
if bit.type == "Text" and tostring(arg_nomsu) != '"\\n"' and tostring(arg_nomsu)\match("\\n")
arg_nomsu = nil -- Force long text for multi-line text
next_space = match(next_space, "[^ ]*") if bit.type == "Block"
nomsu\append next_space
if arg_nomsu and nomsu\trailing_line_len! + #tostring(arg_nomsu) < MAX_LINE
if bit.type == "Block"
nomsu\append arg_nomsu
next_space = "\n.."
else
arg_nomsu\parenthesize! if bit.type == "Action"
nomsu\append arg_nomsu
next_space = " "
else
arg_nomsu = assert recurse(bit)
-- These types carry their own indentation
switch bit.type
when "List", "Dict", "Text", "Block", "EscapedNomsu"
nomsu\append arg_nomsu
else
nomsu\append NomsuCode(bit.source, "(..)\n ", pop_comments(bit.source.start), arg_nomsu)
next_space = "\n.."
pos = bit.source.stop
if next_space == " " and nomsu\trailing_line_len! > MAX_LINE if type(bit) == "string"
next_space = "\n.." unless type(tree[i-1]) == 'string' and Parser.is_operator(tree[i-1]) != Parser.is_operator(bit)
nomsu\append pop_comments(pos, '\n') nomsu\append(next_space)
nomsu\append bit
next_space = ' '
else
inline = if bit.type == "Block" and #bit > 1 then nil
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
next_space = inline and " " or "\n.."
nomsu\append pop_comments(tree.source.stop, '\n')
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
inline_nomsu = @tree_to_inline_nomsu tree inline_nomsu = @tree_to_inline_nomsu tree
if #tostring(inline_nomsu) <= MAX_LINE return inline_nomsu unless #tostring(inline_nomsu) > MAX_LINE
return inline_nomsu return switch tree[1].type
nomsu = recurse(tree[1])
switch tree[1].type
when "List", "Dict", "Text", "Block" when "List", "Dict", "Text", "Block"
return NomsuCode tree.source, "\\", nomsu NomsuCode tree.source, "\\", recurse(tree[1])
else else
return NomsuCode tree.source, "\\(..)\n ", pop_comments(tree.source.start), nomsu 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))
@ -740,14 +728,13 @@ with NomsuCompiler
else else
interp_nomsu = @tree_to_inline_nomsu(bit) interp_nomsu = @tree_to_inline_nomsu(bit)
if nomsu\trailing_line_len! + #tostring(interp_nomsu) <= MAX_LINE if nomsu\trailing_line_len! + #tostring(interp_nomsu) <= MAX_LINE
switch bit.type if bit.type == "Var"
when "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"
when "List", "Dict" nomsu\append "\\", interp_nomsu
nomsu\append "\\", interp_nomsu else
else nomsu\append "\\(", interp_nomsu, ")"
nomsu\append "\\(", interp_nomsu, ")"
else else
interp_nomsu = recurse(bit) interp_nomsu = recurse(bit)
if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" and bit.type != "Block" if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" and bit.type != "Block"
@ -766,6 +753,7 @@ with NomsuCompiler
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)
item_nomsu = @tree_to_inline_nomsu(item) item_nomsu = @tree_to_inline_nomsu(item)
item_nomsu\parenthesize! if item.type == "Block" item_nomsu\parenthesize! if item.type == "Block"
if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE if nomsu\trailing_line_len! + #tostring(item_nomsu) <= MAX_LINE