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

Fixed comments in nomsu codegen.

Browse Source
This commit is contained in:
Bruce Hill 2018-09-14 15:24:24 -07:00
parent 626b6cab79
commit 7112af7cb6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nomsu_compiler.lua
View File

@ -1078,7 +1078,7 @@ do
comments = _accum_0 comments = _accum_0
end end
table.sort(comments, function(a, b) table.sort(comments, function(a, b)
return (a.pos > b.pos) return (a.source.start > b.source.start)
end) end)
pop_comments = function(pos, prefix, suffix) pop_comments = function(pos, prefix, suffix)
if prefix == nil then if prefix == nil then
@ -1089,11 +1089,11 @@ 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
if comments[i].pos > pos then if comments[i].source.start > pos then
break break
end end
local comment local comment
comment, comments[i] = comments[i].comment, nil comment, comments[i] = comments[i][1], nil
nomsu:append("#" .. (gsub(comment, "\n", "\n ")) .. "\n") nomsu:append("#" .. (gsub(comment, "\n", "\n ")) .. "\n")
if comment:match("^\n.") then if comment:match("^\n.") then
nomsu:append("\n") nomsu:append("\n")

6
nomsu_compiler.moon
View File

@ -672,13 +672,13 @@ with NomsuCompiler
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] comments = [c for c in pairs comment_set]
table.sort(comments, (a,b)->(a.pos > b.pos)) table.sort(comments, (a,b)->(a.source.start > b.source.start))
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].source.start > pos
comment, comments[i] = comments[i].comment, nil comment, comments[i] = comments[i][1], 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