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

Slightly better newline handling for long text. Now won't force an

Browse Source 
indent for "\nhello"
This commit is contained in:
Bruce Hill 2018-07-20 19:47:58 -07:00
parent 878fff6db5
commit 385beb4998
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nomsu_compiler.lua
View File

@ -1001,9 +1001,13 @@ do
break break
end end
if tree.type == "Text" then if tree.type == "Text" then
if (function() local check_for_nl
check_for_nl = function(tree)
local found_nl = false local found_nl = false
for i, b in ipairs(tree) do for i, b in ipairs(tree) do
if type(b) ~= 'string' and b.type == "Text" and check_for_nl(b) then
return true
end
if i == 1 and type(b) == 'string' then if i == 1 and type(b) == 'string' then
b = b:match('^[\n]*(.*)') b = b:match('^[\n]*(.*)')
end end
@ -1012,7 +1016,8 @@ do
return true return true
end end
end end
end)() then end
if check_for_nl(tree) then
break break
end end
end end

43
nomsu_compiler.moon
View File

@ -503,7 +503,7 @@ with NomsuCompiler
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 check(len, nomsu, tree) if check
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
@ -511,16 +511,16 @@ with NomsuCompiler
unless 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"
inner_nomsu\parenthesize! inner_nomsu\parenthesize!
nomsu = NomsuCode(tree.source, "\\", inner_nomsu) nomsu = NomsuCode(tree.source, "\\", inner_nomsu)
check(len+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
return nomsu return nomsu
when "Block" when "Block"
check(len, tree) if check
nomsu = NomsuCode(tree.source, ":") nomsu = NomsuCode(tree.source, ":")
check(len, nomsu, tree) if check
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 recurse(line, nomsu, i == 1 or i < #tree) nomsu\append recurse(line, nomsu, i == 1 or i < #tree)
check(len+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
nomsu\parenthesize! if #tree > 1 or parenthesize_blocks nomsu\parenthesize! if #tree > 1 or parenthesize_blocks
return nomsu return nomsu
@ -540,7 +540,7 @@ with NomsuCompiler
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 check(len, nomsu, tree) if check
return nomsu return nomsu
return NomsuCode(tree.source, '"', make_text(tree), '"') return NomsuCode(tree.source, '"', make_text(tree), '"')
@ -549,7 +549,7 @@ with NomsuCompiler
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+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
nomsu\append "]" nomsu\append "]"
return nomsu return nomsu
@ -558,7 +558,7 @@ with NomsuCompiler
for i, entry in ipairs tree for i, entry in ipairs tree
nomsu\append ", " if i > 1 nomsu\append ", " if i > 1
nomsu\append recurse(entry, nomsu) nomsu\append recurse(entry, nomsu)
check(len+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
nomsu\append "}" nomsu\append "}"
return nomsu return nomsu
@ -574,7 +574,7 @@ with NomsuCompiler
value_nomsu = recurse(value, nomsu) value_nomsu = recurse(value, nomsu)
value_nomsu\parenthesize! if value.type == "Block" value_nomsu\parenthesize! if value.type == "Block"
nomsu\append value_nomsu nomsu\append value_nomsu
check(len+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
return nomsu return nomsu
when "IndexChain" when "IndexChain"
@ -589,7 +589,7 @@ with NomsuCompiler
if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree) if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree)
bit_nomsu\parenthesize! bit_nomsu\parenthesize!
nomsu\append bit_nomsu nomsu\append bit_nomsu
check(len+#tostring(nomsu), tree) if check check(len, nomsu, tree) if check
return nomsu return nomsu
when "Number" when "Number"
@ -631,8 +631,20 @@ with NomsuCompiler
if type(pos) != 'number' then pos = #tostring(pos)\match("[ ]*([^\n]*)$") if type(pos) != 'number' then pos = #tostring(pos)\match("[ ]*([^\n]*)$")
space = MAX_LINE - pos space = MAX_LINE - pos
local inline local inline
for len, tree in coroutine.wrap(-> inline = @tree_to_inline_nomsu(t, false, coroutine.yield)) for prefix, nomsu, 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) len = #tostring(nomsu)
break if prefix+len > MAX_LINE
break if tree.type == "Block" and (#tree > 1 or len > 20)
if tree.type == "Text"
-- Disallow inline text if it's got newlines between text, e.g. "hello\nworld"
check_for_nl = (tree)->
found_nl = false
for i,b in ipairs tree
return true if type(b) != 'string' and b.type == "Text" and check_for_nl(b)
b = b\match('^[\n]*(.*)') if i == 1 and type(b) == 'string'
found_nl or= type(b) == 'string' and b\match('\n')
return true if found_nl and (type(b) != 'string' or b\match('[^\n]'))
break if check_for_nl(tree)
return inline if inline and #tostring(inline) <= space return inline if inline and #tostring(inline) <= space
indented = @tree_to_nomsu(t, pop_comments, space) indented = @tree_to_nomsu(t, pop_comments, space)
if t.type == "Action" and not (tree.type == "Block" or tree.type == "FileChunks") if t.type == "Action" and not (tree.type == "Block" or tree.type == "FileChunks")
@ -641,12 +653,18 @@ with NomsuCompiler
switch tree.type switch tree.type
when "FileChunks" when "FileChunks"
setup = nil
nomsu = NomsuCode(tree.source, pop_comments(tree.source.start)) nomsu = NomsuCode(tree.source, pop_comments(tree.source.start))
for chunk_no, chunk in ipairs tree for chunk_no, chunk in ipairs tree
nomsu\append "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1 nomsu\append "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1
nomsu\append pop_comments(chunk.source.start) nomsu\append pop_comments(chunk.source.start)
if chunk.type == "Block" if chunk.type == "Block"
for line_no, line in ipairs chunk for line_no, line in ipairs chunk
if setup == nil
setup = line.type == "Action" and line.stub == "use %"
elseif setup and not (line.type == "Action" and line.stub == "use %")
nomsu\append "\n", pop_comments(line.source.start)
setup = false
nomsu\append pop_comments(line.source.start, '\n') nomsu\append pop_comments(line.source.start, '\n')
line_nomsu = @tree_to_nomsu(line, pop_comments) line_nomsu = @tree_to_nomsu(line, pop_comments)
nomsu\append line_nomsu nomsu\append line_nomsu
@ -654,6 +672,7 @@ with NomsuCompiler
nomsu\append pop_comments(chunk.source.stop, '\n') nomsu\append pop_comments(chunk.source.stop, '\n')
else else
nomsu\append recurse(chunk) nomsu\append recurse(chunk)
setup = false
nomsu\append pop_comments(tree.source.stop, '\n') nomsu\append pop_comments(tree.source.stop, '\n')
return nomsu return nomsu
@ -738,6 +757,8 @@ with NomsuCompiler
nomsu\append "\n.." nomsu\append "\n.."
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
add_text(nomsu, tree) add_text(nomsu, tree)
if nomsu\is_multiline! and tostring(nomsu)\match("\n$")
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"