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

Merging List/Dict codegen paths to reduce code duplication.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-22 15:59:29 -07:00
parent 0d4f2e45bc
commit 3e222b40ef
2 changed files with 26 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
nomsu_compiler.lua
View File

@ -666,15 +666,16 @@ do
return lua return lua
elseif "List" == _exp_0 then elseif "List" == _exp_0 then
local lua = LuaCode.Value(tree.source, "list{") local lua = LuaCode.Value(tree.source, "list{")
local items = { } lua:concat_append((function()
for i, item in ipairs(tree) do local _accum_0 = { }
local item_lua = self:compile(item) local _len_0 = 1
if not (item_lua.is_value) then for _index_0 = 1, #tree do
self:compile_error(item.source, "Cannot use:\n%s\nas a list item, since it's not an expression.") local e = tree[_index_0]
_accum_0[_len_0] = self:compile(e)
_len_0 = _len_0 + 1
end end
items[i] = item_lua return _accum_0
end end)(), ", ", ",\n ")
lua:concat_append(items, ", ", ",\n ")
lua:append("}") lua:append("}")
return lua return lua
elseif "Dict" == _exp_0 then elseif "Dict" == _exp_0 then
@ -846,8 +847,8 @@ do
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
add_text(nomsu, tree) add_text(nomsu, tree)
return NomsuCode(tree.source, '"', nomsu, '"') return NomsuCode(tree.source, '"', nomsu, '"')
elseif "List" == _exp_0 then elseif "List" == _exp_0 or "Dict" == _exp_0 then
local nomsu = NomsuCode(tree.source, "[") local nomsu = NomsuCode(tree.source, (tree.type == "List" and "[" or "{"))
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
if i > 1 then if i > 1 then
nomsu:append(", ") nomsu:append(", ")
@ -857,20 +858,7 @@ do
check(len, nomsu, tree) check(len, nomsu, tree)
end end
end end
nomsu:append("]") nomsu:append(tree.type == "List" and "]" or "}")
return nomsu
elseif "Dict" == _exp_0 then
local nomsu = NomsuCode(tree.source, "{")
for i, entry in ipairs(tree) do
if i > 1 then
nomsu:append(", ")
end
nomsu:append(recurse(entry, nomsu))
if check then
check(len, nomsu, tree)
end
end
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]
@ -1183,11 +1171,10 @@ do
nomsu:append('\\("")') nomsu:append('\\("")')
end end
return NomsuCode(tree.source, '".."\n ', nomsu) return NomsuCode(tree.source, '".."\n ', nomsu)
elseif "List" == _exp_0 then elseif "List" == _exp_0 or "Dict" == _exp_0 then
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
assert(item.type ~= "Block", "Didn't expect to find a Block inside a list")
if nomsu:trailing_line_len() == 0 then if nomsu:trailing_line_len() == 0 then
nomsu:append(pop_comments(item.source.start)) nomsu:append(pop_comments(item.source.start))
end end
@ -1199,24 +1186,11 @@ do
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) if tree.type == "List" then
elseif "Dict" == _exp_0 then return NomsuCode(tree.source, "[..]\n ", nomsu)
assert(#tree > 0) else
local nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start)) return NomsuCode(tree.source, "{..}\n ", nomsu)
for i, item in ipairs(tree) do
assert(item.type == "DictEntry", "Only expected to find DictEntry items in a Dict")
if nomsu:trailing_line_len() == 0 then
nomsu:append(pop_comments(item.source.start))
end
local inline_nomsu = self:tree_to_inline_nomsu(item)
local item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu):match('[^\n]*$'))
nomsu:append(item_nomsu)
if i < #tree then
nomsu:append((item_nomsu:is_multiline() or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
end
end end
nomsu:append(pop_comments(tree.source.stop, '\n'))
return NomsuCode(tree.source, "{..}\n ", 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 nomsu local nomsu

46
nomsu_compiler.moon
View File

@ -407,14 +407,7 @@ with NomsuCompiler
when "List" when "List"
lua = LuaCode.Value tree.source, "list{" lua = LuaCode.Value tree.source, "list{"
items = {} lua\concat_append([@compile(e) for e in *tree], ", ", ",\n ")
for i, item in ipairs tree
item_lua = @compile(item)
unless item_lua.is_value
@compile_error item.source,
"Cannot use:\n%s\nas a list item, since it's not an expression."
items[i] = item_lua
lua\concat_append(items, ", ", ",\n ")
lua\append "}" lua\append "}"
return lua return lua
@ -546,22 +539,13 @@ with NomsuCompiler
add_text(nomsu, tree) add_text(nomsu, tree)
return NomsuCode(tree.source, '"', nomsu, '"') return NomsuCode(tree.source, '"', nomsu, '"')
when "List" when "List", "Dict"
nomsu = NomsuCode(tree.source, "[") nomsu = NomsuCode(tree.source, (tree.type == "List" and "[" or "{"))
for i, item in ipairs tree for i, item in ipairs tree
nomsu\append ", " if i > 1 nomsu\append ", " if i > 1
nomsu\append recurse(item, nomsu) nomsu\append recurse(item, nomsu)
check(len, nomsu, tree) if check check(len, nomsu, tree) if check
nomsu\append "]" nomsu\append(tree.type == "List" and "]" or "}")
return nomsu
when "Dict"
nomsu = NomsuCode(tree.source, "{")
for i, entry in ipairs tree
nomsu\append ", " if i > 1
nomsu\append recurse(entry, nomsu)
check(len, nomsu, tree) if check
nomsu\append "}"
return nomsu return nomsu
when "DictEntry" when "DictEntry"
@ -766,11 +750,10 @@ with NomsuCompiler
nomsu\append '\\("")' -- Need to specify where the text ends nomsu\append '\\("")' -- Need to specify where the text ends
return NomsuCode(tree.source, '".."\n ', nomsu) return NomsuCode(tree.source, '".."\n ', nomsu)
when "List" when "List", "Dict"
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
assert item.type != "Block", "Didn't expect to find a Block inside a list"
nomsu\append(pop_comments(item.source.start)) if nomsu\trailing_line_len! == 0 nomsu\append(pop_comments(item.source.start)) if nomsu\trailing_line_len! == 0
inline_nomsu = @tree_to_inline_nomsu(item) inline_nomsu = @tree_to_inline_nomsu(item)
item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu)\match('[^\n]*$')) item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu)\match('[^\n]*$'))
@ -778,21 +761,10 @@ with NomsuCompiler
if i < #tree if i < #tree
nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ') nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "[..]\n ", nomsu) return if tree.type == "List" then
NomsuCode(tree.source, "[..]\n ", nomsu)
when "Dict" else
assert #tree > 0 NomsuCode(tree.source, "{..}\n ", nomsu)
nomsu = NomsuCode(tree.source, pop_comments(tree[1].source.start))
for i, item in ipairs tree
assert item.type == "DictEntry", "Only expected to find DictEntry items in a Dict"
nomsu\append(pop_comments(item.source.start)) if nomsu\trailing_line_len! == 0
inline_nomsu = @tree_to_inline_nomsu(item)
item_nomsu = #tostring(inline_nomsu) <= MAX_LINE and inline_nomsu or recurse(item, #tostring(nomsu)\match('[^\n]*$'))
nomsu\append item_nomsu
if i < #tree
nomsu\append((item_nomsu\is_multiline! or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE) and '\n' or ', ')
nomsu\append pop_comments(tree.source.stop, '\n')
return NomsuCode(tree.source, "{..}\n ", nomsu)
when "DictEntry" when "DictEntry"
key, value = tree[1], tree[2] key, value = tree[1], tree[2]