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

Fix for nomsu codegen of blocks, particularly nested mutli-blocks like:

Browse Source 
(do: if (yes) (: say "hi"); say "done")
This commit is contained in:
Bruce Hill 2018-07-19 16:57:44 -07:00
parent bf67a61013
commit ddc7b8e70c
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nomsu_compiler.lua
View File

@ -787,6 +787,7 @@ do
recurse = function(t, opts) recurse = function(t, opts)
opts = opts or { } opts = opts or { }
opts.consumed_comments = options.consumed_comments opts.consumed_comments = options.consumed_comments
opts.inside_multiblock = opts.inside_multiblock or options.inside_multiblock
return self:tree_to_nomsu(t, opts) return self:tree_to_nomsu(t, opts)
end end
local _exp_0 = tree.type local _exp_0 = tree.type
@ -822,13 +823,23 @@ do
if not (arg_nomsu) then if not (arg_nomsu) then
return nil return nil
end end
if not (i == 1 or (bit.type == "Block" and not (#bit > 1 or i < #tree))) then if bit.type == "Block" then
nomsu:append(" ") if i == 1 or i < #tree or (options.inside_multiblock and #bit > 1) then
if i > 1 then
nomsu:append(" ")
end
arg_nomsu:parenthesize()
end
nomsu:append(arg_nomsu)
else
if i > 1 then
nomsu:append(" ")
end
if bit.type == "Action" then
arg_nomsu:parenthesize()
end
nomsu:append(arg_nomsu)
end end
if bit.type == "Action" or (bit.type == "Block" and (#bit > 1 or i < #tree)) then
arg_nomsu:parenthesize()
end
nomsu:append(arg_nomsu)
end end
end end
return nomsu return nomsu
@ -911,7 +922,8 @@ do
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(assert(recurse(line, { nomsu:append(assert(recurse(line, {
inline = true inline = true,
inside_multiblock = true
}))) })))
end end
return nomsu return nomsu

17
nomsu_compiler.moon
View File

@ -509,6 +509,7 @@ with NomsuCompiler
recurse = (t, opts)-> recurse = (t, opts)->
opts or= {} opts or= {}
opts.consumed_comments = options.consumed_comments opts.consumed_comments = options.consumed_comments
opts.inside_multiblock or= options.inside_multiblock
return @tree_to_nomsu(t, opts) return @tree_to_nomsu(t, opts)
switch tree.type switch tree.type
@ -532,11 +533,15 @@ with NomsuCompiler
else else
arg_nomsu = recurse(bit,inline:true) arg_nomsu = recurse(bit,inline:true)
return nil unless arg_nomsu return nil unless arg_nomsu
unless i == 1 or (bit.type == "Block" and not (#bit > 1 or i < #tree)) if bit.type == "Block"
nomsu\append " " if i == 1 or i < #tree or (options.inside_multiblock and #bit > 1)
if bit.type == "Action" or (bit.type == "Block" and (#bit > 1 or i < #tree)) nomsu\append " " if i > 1
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
nomsu\append arg_nomsu nomsu\append arg_nomsu
else
nomsu\append " " if i > 1
arg_nomsu\parenthesize! if bit.type == "Action"
nomsu\append arg_nomsu
return nomsu return nomsu
else else
pos = tree.source.start pos = tree.source.start
@ -596,7 +601,7 @@ with NomsuCompiler
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 assert(recurse(line, inline:true)) nomsu\append assert(recurse(line, inline:true, inside_multiblock:true))
return nomsu return nomsu
nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
for i, line in ipairs tree for i, line in ipairs tree