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

Fixing up comments, slowly.

Browse Source
This commit is contained in:
Bruce Hill 2018-07-12 21:42:09 -07:00
parent af62e3e8bf
commit 0fd3d1f2b9
6 changed files with 70 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code_obj.lua
View File

@ -86,6 +86,9 @@ do
repeat repeat
local b = select(i, ...) local b = select(i, ...)
assert(b, "code bit is nil") assert(b, "code bit is nil")
if Source:is_instance(b) then
require('ldt').breakpoint()
end
if b == '' then if b == '' then
_continue_0 = true _continue_0 = true
break break

1
code_obj.moon
View File

@ -60,6 +60,7 @@ class Code
for i=1,n for i=1,n
b = select(i, ...) b = select(i, ...)
assert(b, "code bit is nil") assert(b, "code bit is nil")
if Source\is_instance(b) then require('ldt').breakpoint!
if b == '' then continue if b == '' then continue
bits[#bits+1] = b bits[#bits+1] = b
if type(b) == 'string' if type(b) == 'string'

85
nomsu_compiler.lua
View File

@ -604,7 +604,7 @@ do
end end
local bit_lua = self:compile(bit) local bit_lua = self:compile(bit)
if not (bit_lua.is_value) then if not (bit_lua.is_value) then
local src = ' ' .. gsub(tostring(recurse(bit)), '\n', '\n ') local src = ' ' .. gsub(tostring(self:tree_to_nomsu(bit)), '\n', '\n ')
local line = tostring(bit.source.filename) .. ":" .. tostring(files.get_line_number(files.read(bit.source.filename), bit.source.start)) local line = tostring(bit.source.filename) .. ":" .. tostring(files.get_line_number(files.read(bit.source.filename), bit.source.start))
self:compile_error(bit, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.") self:compile_error(bit, "Cannot use:\n%s\nas a string interpolation value, since it's not an expression.")
end end
@ -716,39 +716,20 @@ do
end end
NomsuCompiler.tree_to_nomsu = function(self, tree, options) NomsuCompiler.tree_to_nomsu = function(self, tree, options)
options = options or { } options = options or { }
local comments = options.comments local comment_i = 0
if comments == nil and tree.comments then
do
local _accum_0 = { }
local _len_0 = 1
for p, c in pairs(tree.comments) do
_accum_0[_len_0] = {
comment = c,
pos = p
}
_len_0 = _len_0 + 1
end
comments = _accum_0
end
table.sort(comments, function(a, b)
return a.pos > b.pos
end)
end
local recurse
recurse = function(t, opts)
opts = opts or { }
opts.comments = comments
return self:tree_to_nomsu(t, opts)
end
local pop_comments local pop_comments
pop_comments = function(pos) pop_comments = function(pos)
if not (comments) then if not (tree.comments) then
return '' return ''
end end
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
while #comments > 0 and comments[#comments].pos <= pos do for i = comment_i + 1, #tree.comments do
local comment = table.remove(comments) comment_i = i
nomsu:append("#" .. (gsub(comment.comment, "\n", "\n ")) .. "\n") local comment = tree.comments[i]
if comment.source.start > pos then
break
end
nomsu:append("#" .. (gsub(comment[1], "\n", "\n ")) .. "\n")
end end
if #nomsu.bits == 0 then if #nomsu.bits == 0 then
return '' return ''
@ -767,7 +748,7 @@ do
nomsu:append("\n\n" .. tostring(("~"):rep(80)) .. "\n\n") nomsu:append("\n\n" .. tostring(("~"):rep(80)) .. "\n\n")
end end
nomsu:append(pop_comments(chunk.source.start)) nomsu:append(pop_comments(chunk.source.start))
nomsu:append(recurse(chunk)) nomsu:append(self:tree_to_nomsu(chunk))
end end
return nomsu return nomsu
elseif "Action" == _exp_0 then elseif "Action" == _exp_0 then
@ -780,7 +761,7 @@ do
end end
nomsu:append(bit) nomsu:append(bit)
else else
local arg_nomsu = recurse(bit, { local arg_nomsu = self:tree_to_nomsu(bit, {
inline = true inline = true
}) })
if not (arg_nomsu) then if not (arg_nomsu) then
@ -816,7 +797,7 @@ do
elseif bit.type == "Block" then elseif bit.type == "Block" then
arg_nomsu = nil arg_nomsu = nil
else else
arg_nomsu = recurse(bit, { arg_nomsu = self:tree_to_nomsu(bit, {
inline = true inline = true
}) })
end end
@ -838,7 +819,7 @@ do
next_space = " " next_space = " "
end end
else else
arg_nomsu = recurse(bit, { arg_nomsu = self:tree_to_nomsu(bit, {
can_use_colon = true can_use_colon = true
}) })
if not (arg_nomsu) then if not (arg_nomsu) then
@ -866,11 +847,11 @@ do
return nomsu return nomsu
end end
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
local nomsu = recurse(tree[1], { local nomsu = self:tree_to_nomsu(tree[1], {
inline = true inline = true
}) })
if nomsu == nil and not inline then if nomsu == nil and not inline then
nomsu = recurse(tree[1]) nomsu = self:tree_to_nomsu(tree[1])
return nomsu and NomsuCode(tree.source, "\\:\n ", pop_comments(tree.source.start), nomsu) return nomsu and NomsuCode(tree.source, "\\:\n ", pop_comments(tree.source.start), nomsu)
end end
return nomsu and NomsuCode(tree.source, "\\(", nomsu, ")") return nomsu and NomsuCode(tree.source, "\\(", nomsu, ")")
@ -881,7 +862,7 @@ do
if i > 1 then if i > 1 then
nomsu:append("; ") nomsu:append("; ")
end end
local line_nomsu = recurse(line, { local line_nomsu = self:tree_to_nomsu(line, {
inline = true inline = true
}) })
if not (line_nomsu) then if not (line_nomsu) then
@ -894,7 +875,7 @@ do
local nomsu = NomsuCode(tree.source) local nomsu = NomsuCode(tree.source)
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
nomsu:append(pop_comments(line.source.start)) nomsu:append(pop_comments(line.source.start))
line = assert(recurse(line, { line = assert(self:tree_to_nomsu(line, {
can_use_colon = true can_use_colon = true
}), "Could not convert line to nomsu") }), "Could not convert line to nomsu")
nomsu:append(line) nomsu:append(line)
@ -918,7 +899,7 @@ do
elseif bit.type == "Text" then elseif bit.type == "Text" then
nomsu:append(make_text(bit)) nomsu:append(make_text(bit))
else else
local interp_nomsu = assert(recurse(bit, { local interp_nomsu = assert(self:tree_to_nomsu(bit, {
inline = true inline = true
})) }))
if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then if bit.type ~= "Var" and bit.type ~= "List" and bit.type ~= "Dict" and bit.type ~= "Text" then
@ -931,7 +912,7 @@ do
end end
return NomsuCode(tree.source, '"', make_text(tree), '"') return NomsuCode(tree.source, '"', make_text(tree), '"')
else else
local inline_version = recurse(tree, { local inline_version = self:tree_to_nomsu(tree, {
inline = true inline = true
}) })
if inline_version and #inline_version <= MAX_LINE then if inline_version and #inline_version <= MAX_LINE then
@ -975,7 +956,7 @@ do
elseif bit.type == "Text" then elseif bit.type == "Text" then
nomsu:append(make_text(bit)) nomsu:append(make_text(bit))
else else
local interp_nomsu = recurse(bit, { local interp_nomsu = self:tree_to_nomsu(bit, {
inline = true inline = true
}) })
if interp_nomsu then if interp_nomsu then
@ -984,7 +965,7 @@ do
end end
nomsu:append("\\", interp_nomsu) nomsu:append("\\", interp_nomsu)
else else
interp_nomsu = assert(recurse(bit)) interp_nomsu = assert(self:tree_to_nomsu(bit))
if not (interp_nomsu) then if not (interp_nomsu) then
return nil return nil
end end
@ -1003,7 +984,7 @@ do
if inline then if inline then
local nomsu = NomsuCode(tree.source, "[") local nomsu = NomsuCode(tree.source, "[")
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local item_nomsu = recurse(item, { local item_nomsu = self:tree_to_nomsu(item, {
inline = true inline = true
}) })
if not (item_nomsu) then if not (item_nomsu) then
@ -1017,7 +998,7 @@ do
nomsu:append("]") nomsu:append("]")
return nomsu return nomsu
else else
local inline_version = recurse(tree, { local inline_version = self:tree_to_nomsu(tree, {
inline = true inline = true
}) })
if inline_version and #inline_version <= MAX_LINE then if inline_version and #inline_version <= MAX_LINE then
@ -1032,7 +1013,7 @@ do
line_comments = '' line_comments = ''
end end
for i, item in ipairs(tree) do for i, item in ipairs(tree) do
local item_nomsu = recurse(item, { local item_nomsu = self:tree_to_nomsu(item, {
inline = true inline = true
}) })
if item_nomsu and #tostring(line) + #", " + #item_nomsu <= MAX_LINE then if item_nomsu and #tostring(line) + #", " + #item_nomsu <= MAX_LINE then
@ -1042,7 +1023,7 @@ do
line:append(item_nomsu) line:append(item_nomsu)
else else
if not (item_nomsu) then if not (item_nomsu) then
item_nomsu = recurse(item) item_nomsu = self:tree_to_nomsu(item)
if not (item_nomsu) then if not (item_nomsu) then
return nil return nil
end end
@ -1071,7 +1052,7 @@ do
if inline then if inline then
local nomsu = NomsuCode(tree.source, "{") local nomsu = NomsuCode(tree.source, "{")
for i, entry in ipairs(tree) do for i, entry in ipairs(tree) do
local entry_nomsu = recurse(entry, { local entry_nomsu = self:tree_to_nomsu(entry, {
inline = true inline = true
}) })
if not (entry_nomsu) then if not (entry_nomsu) then
@ -1085,7 +1066,7 @@ do
nomsu:append("}") nomsu:append("}")
return nomsu return nomsu
else else
local inline_version = recurse(tree, { local inline_version = self:tree_to_nomsu(tree, {
inline = true inline = true
}) })
if inline_version then if inline_version then
@ -1100,7 +1081,7 @@ do
line_comments = '' line_comments = ''
end end
for i, entry in ipairs(tree) do for i, entry in ipairs(tree) do
local entry_nomsu = recurse(entry) local entry_nomsu = self:tree_to_nomsu(entry)
if not (entry_nomsu) then if not (entry_nomsu) then
return nil return nil
end end
@ -1132,7 +1113,7 @@ do
end end
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 key_nomsu = recurse(key, { local key_nomsu = self:tree_to_nomsu(key, {
inline = true inline = true
}) })
if not (key_nomsu) then if not (key_nomsu) then
@ -1143,7 +1124,7 @@ do
end end
local value_nomsu local value_nomsu
if value then if value then
value_nomsu = recurse(value, { value_nomsu = self:tree_to_nomsu(value, {
inline = true inline = true
}) })
else else
@ -1156,7 +1137,7 @@ do
if inline then if inline then
return nil return nil
end end
value_nomsu = recurse(value) value_nomsu = self:tree_to_nomsu(value)
if not (value_nomsu) then if not (value_nomsu) then
return nil return nil
end end
@ -1175,7 +1156,7 @@ do
end end
end end
if not (bit_nomsu) then if not (bit_nomsu) then
bit_nomsu = recurse(bit, { bit_nomsu = self:tree_to_nomsu(bit, {
inline = true inline = true
}) })
end end

67
nomsu_compiler.moon
View File

@ -382,7 +382,7 @@ with NomsuCompiler
string_buffer = "" string_buffer = ""
bit_lua = @compile(bit) bit_lua = @compile(bit)
unless bit_lua.is_value unless bit_lua.is_value
src = ' '..gsub(tostring(recurse(bit)), '\n','\n ') src = ' '..gsub(tostring(@tree_to_nomsu(bit)), '\n','\n ')
line = "#{bit.source.filename}:#{files.get_line_number(files.read(bit.source.filename), bit.source.start)}" line = "#{bit.source.filename}:#{files.get_line_number(files.read(bit.source.filename), bit.source.start)}"
@compile_error bit, @compile_error bit,
"Cannot use:\n%s\nas a string interpolation value, since it's not an expression." "Cannot use:\n%s\nas a string interpolation value, since it's not an expression."
@ -482,20 +482,15 @@ with NomsuCompiler
.tree_to_nomsu = (tree, options)=> .tree_to_nomsu = (tree, options)=>
options or= {} options or= {}
comments = options.comments comment_i = 0
if comments == nil and tree.comments
comments = [{comment:c, pos:p} for p,c in pairs tree.comments]
table.sort comments, (a,b)-> a.pos > b.pos
recurse = (t, opts)->
opts or= {}
opts.comments = comments
return @tree_to_nomsu(t, opts)
pop_comments = (pos)-> pop_comments = (pos)->
return '' unless comments return '' unless tree.comments
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
while #comments > 0 and comments[#comments].pos <= pos for i=comment_i+1,#tree.comments
comment = table.remove comments comment_i = i
nomsu\append "#"..(gsub(comment.comment, "\n", "\n ")).."\n" comment = tree.comments[i]
break if comment.source.start > pos
nomsu\append "#"..(gsub(comment[1], "\n", "\n ")).."\n"
if #nomsu.bits == 0 then return '' if #nomsu.bits == 0 then return ''
return nomsu return nomsu
@ -508,7 +503,7 @@ with NomsuCompiler
if i > 1 if i > 1
nomsu\append "\n\n#{("~")\rep(80)}\n\n" nomsu\append "\n\n#{("~")\rep(80)}\n\n"
nomsu\append pop_comments(chunk.source.start) nomsu\append pop_comments(chunk.source.start)
nomsu\append recurse(chunk) nomsu\append @tree_to_nomsu(chunk)
return nomsu return nomsu
when "Action" when "Action"
@ -520,7 +515,7 @@ with NomsuCompiler
nomsu\append " " nomsu\append " "
nomsu\append bit nomsu\append bit
else else
arg_nomsu = recurse(bit,inline:true) arg_nomsu = @tree_to_nomsu(bit,inline:true)
return nil unless arg_nomsu return nil unless arg_nomsu
if bit.type == "Action" or bit.type == "Block" if bit.type == "Action" or bit.type == "Block"
if bit.type == "Action" and i == #tree if bit.type == "Action" and i == #tree
@ -543,7 +538,7 @@ with NomsuCompiler
else else
arg_nomsu = if last_colon == i-1 and bit.type == "Action" then nil arg_nomsu = if last_colon == i-1 and bit.type == "Action" then nil
elseif bit.type == "Block" then nil elseif bit.type == "Block" then nil
else recurse(bit,inline:true) else @tree_to_nomsu(bit,inline:true)
if arg_nomsu and line_len + #tostring(arg_nomsu) < MAX_LINE if arg_nomsu and line_len + #tostring(arg_nomsu) < MAX_LINE
if bit.type == "Action" if bit.type == "Action"
@ -561,7 +556,7 @@ with NomsuCompiler
line_len += #next_space + #tostring(arg_nomsu) line_len += #next_space + #tostring(arg_nomsu)
next_space = " " next_space = " "
else else
arg_nomsu = recurse(bit, can_use_colon:true) arg_nomsu = @tree_to_nomsu(bit, can_use_colon:true)
return nil unless arg_nomsu return nil unless arg_nomsu
-- These types carry their own indentation -- These types carry their own indentation
if bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
@ -581,9 +576,9 @@ with NomsuCompiler
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
nomsu = recurse(tree[1], inline:true) nomsu = @tree_to_nomsu(tree[1], inline:true)
if nomsu == nil and not inline if nomsu == nil and not inline
nomsu = recurse(tree[1]) nomsu = @tree_to_nomsu(tree[1])
return nomsu and NomsuCode tree.source, "\\:\n ", pop_comments(tree.source.start), nomsu return nomsu and NomsuCode tree.source, "\\:\n ", pop_comments(tree.source.start), nomsu
return nomsu and NomsuCode tree.source, "\\(", nomsu, ")" return nomsu and NomsuCode tree.source, "\\(", nomsu, ")"
@ -593,14 +588,14 @@ with NomsuCompiler
for i,line in ipairs tree for i,line in ipairs tree
if i > 1 if i > 1
nomsu\append "; " nomsu\append "; "
line_nomsu = recurse(line,inline:true) line_nomsu = @tree_to_nomsu(line,inline:true)
return nil unless line_nomsu return nil unless line_nomsu
nomsu\append line_nomsu nomsu\append line_nomsu
return nomsu return nomsu
nomsu = NomsuCode(tree.source) nomsu = NomsuCode(tree.source)
for i, line in ipairs tree for i, line in ipairs tree
nomsu\append pop_comments(line.source.start) nomsu\append pop_comments(line.source.start)
line = assert(recurse(line, can_use_colon:true), "Could not convert line to nomsu") line = assert(@tree_to_nomsu(line, can_use_colon:true), "Could not convert line to nomsu")
nomsu\append line nomsu\append line
if i < #tree if i < #tree
nomsu\append "\n" nomsu\append "\n"
@ -619,14 +614,14 @@ with NomsuCompiler
elseif bit.type == "Text" elseif bit.type == "Text"
nomsu\append(make_text(bit)) nomsu\append(make_text(bit))
else else
interp_nomsu = assert recurse(bit, inline:true) interp_nomsu = assert @tree_to_nomsu(bit, inline:true)
if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
return nomsu return nomsu
return NomsuCode(tree.source, '"', make_text(tree), '"') return NomsuCode(tree.source, '"', make_text(tree), '"')
else else
inline_version = recurse(tree, inline:true) inline_version = @tree_to_nomsu(tree, inline:true)
if inline_version and #inline_version <= MAX_LINE if inline_version and #inline_version <= MAX_LINE
return inline_version return inline_version
make_text = (tree)-> make_text = (tree)->
@ -656,13 +651,13 @@ with NomsuCompiler
elseif bit.type == "Text" elseif bit.type == "Text"
nomsu\append make_text(bit) nomsu\append make_text(bit)
else else
interp_nomsu = recurse(bit, inline:true) interp_nomsu = @tree_to_nomsu(bit, inline:true)
if interp_nomsu if interp_nomsu
if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text" if bit.type != "Var" and bit.type != "List" and bit.type != "Dict" and bit.type != "Text"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append "\\", interp_nomsu nomsu\append "\\", interp_nomsu
else else
interp_nomsu = assert(recurse(bit)) interp_nomsu = assert(@tree_to_nomsu(bit))
return nil unless interp_nomsu return nil unless interp_nomsu
nomsu\append "\\\n ", interp_nomsu nomsu\append "\\\n ", interp_nomsu
if i < #tree if i < #tree
@ -674,7 +669,7 @@ with NomsuCompiler
if inline if inline
nomsu = NomsuCode(tree.source, "[") nomsu = NomsuCode(tree.source, "[")
for i, item in ipairs tree for i, item in ipairs tree
item_nomsu = recurse(item, inline:true) item_nomsu = @tree_to_nomsu(item, inline:true)
return nil unless item_nomsu return nil unless item_nomsu
if i > 1 if i > 1
nomsu\append ", " nomsu\append ", "
@ -682,7 +677,7 @@ with NomsuCompiler
nomsu\append "]" nomsu\append "]"
return nomsu return nomsu
else else
inline_version = recurse(tree, inline:true) inline_version = @tree_to_nomsu(tree, inline:true)
if inline_version and #inline_version <= MAX_LINE if inline_version and #inline_version <= MAX_LINE
return inline_version return inline_version
nomsu = NomsuCode(tree.source, "[..]") nomsu = NomsuCode(tree.source, "[..]")
@ -691,14 +686,14 @@ with NomsuCompiler
pop_comments(tree[1].source.start) pop_comments(tree[1].source.start)
else '' else ''
for i, item in ipairs tree for i, item in ipairs tree
item_nomsu = recurse(item, inline:true) item_nomsu = @tree_to_nomsu(item, inline:true)
if item_nomsu and #tostring(line) + #", " + #item_nomsu <= MAX_LINE if item_nomsu and #tostring(line) + #", " + #item_nomsu <= MAX_LINE
if #line.bits > 1 if #line.bits > 1
line\append ", " line\append ", "
line\append item_nomsu line\append item_nomsu
else else
unless item_nomsu unless item_nomsu
item_nomsu = recurse(item) item_nomsu = @tree_to_nomsu(item)
return nil unless item_nomsu return nil unless item_nomsu
if #line.bits > 1 if #line.bits > 1
if #tostring(line_comments) > 0 if #tostring(line_comments) > 0
@ -717,7 +712,7 @@ with NomsuCompiler
if inline if inline
nomsu = NomsuCode(tree.source, "{") nomsu = NomsuCode(tree.source, "{")
for i, entry in ipairs tree for i, entry in ipairs tree
entry_nomsu = recurse(entry, inline:true) entry_nomsu = @tree_to_nomsu(entry, inline:true)
return nil unless entry_nomsu return nil unless entry_nomsu
if i > 1 if i > 1
nomsu\append ", " nomsu\append ", "
@ -725,7 +720,7 @@ with NomsuCompiler
nomsu\append "}" nomsu\append "}"
return nomsu return nomsu
else else
inline_version = recurse(tree, inline:true) inline_version = @tree_to_nomsu(tree, inline:true)
if inline_version then return inline_version if inline_version then return inline_version
nomsu = NomsuCode(tree.source, "{..}") nomsu = NomsuCode(tree.source, "{..}")
line = NomsuCode(tree.source, "\n ") line = NomsuCode(tree.source, "\n ")
@ -733,7 +728,7 @@ with NomsuCompiler
pop_comments(tree[1].source.start) pop_comments(tree[1].source.start)
else '' else ''
for i, entry in ipairs tree for i, entry in ipairs tree
entry_nomsu = recurse(entry) entry_nomsu = @tree_to_nomsu(entry)
return nil unless entry_nomsu return nil unless entry_nomsu
if #line + #tostring(entry_nomsu) <= MAX_LINE if #line + #tostring(entry_nomsu) <= MAX_LINE
if #line.bits > 1 if #line.bits > 1
@ -755,17 +750,17 @@ with NomsuCompiler
when "DictEntry" when "DictEntry"
key, value = tree[1], tree[2] key, value = tree[1], tree[2]
key_nomsu = recurse(key, inline:true) key_nomsu = @tree_to_nomsu(key, inline:true)
return nil unless key_nomsu return nil unless key_nomsu
if key.type == "Action" or key.type == "Block" if key.type == "Action" or key.type == "Block"
key_nomsu\parenthesize! key_nomsu\parenthesize!
value_nomsu = if value value_nomsu = if value
recurse(value, inline:true) @tree_to_nomsu(value, inline:true)
else NomsuCode(tree.source, "") else NomsuCode(tree.source, "")
if inline and not value_nomsu then return nil if inline and not value_nomsu then return nil
if not value_nomsu if not value_nomsu
return nil if inline return nil if inline
value_nomsu = recurse(value) value_nomsu = @tree_to_nomsu(value)
return nil unless value_nomsu return nil unless value_nomsu
return NomsuCode tree.source, key_nomsu, ":", value_nomsu return NomsuCode tree.source, key_nomsu, ":", value_nomsu
@ -779,7 +774,7 @@ with NomsuCompiler
-- TODO: support arbitrary words here, including operators and unicode -- TODO: support arbitrary words here, including operators and unicode
if bit[1]\match("[_a-zA-Z][_a-zA-Z0-9]*") if bit[1]\match("[_a-zA-Z][_a-zA-Z0-9]*")
bit_nomsu = bit[1] bit_nomsu = bit[1]
unless bit_nomsu then bit_nomsu = recurse(bit, inline:true) unless bit_nomsu then bit_nomsu = @tree_to_nomsu(bit, inline:true)
return nil unless bit_nomsu return nil unless bit_nomsu
switch bit.type switch bit.type
when "Action", "Block", "IndexChain" when "Action", "Block", "IndexChain"

4
parser.lua
View File

@ -193,8 +193,7 @@ Parser.parse = function(nomsu_code, source)
local userdata = { local userdata = {
indent = "", indent = "",
errors = { }, errors = { },
source = source, source = source
comments = { }
} }
local tree = NOMSU_PATTERN:match(nomsu_code, nil, userdata) local tree = NOMSU_PATTERN:match(nomsu_code, nil, userdata)
if not (tree) then if not (tree) then
@ -228,7 +227,6 @@ Parser.parse = function(nomsu_code, source)
end end
error("Errors occurred while parsing:\n\n" .. table.concat(errors, "\n\n"), 0) error("Errors occurred while parsing:\n\n" .. table.concat(errors, "\n\n"), 0)
end end
tree.comments = userdata.comments
tree.version = userdata.version tree.version = userdata.version
return tree return tree
end end

3
parser.moon
View File

@ -115,7 +115,7 @@ Parser.parse = (nomsu_code, source=nil)->
source or= nomsu_code.source source or= nomsu_code.source
nomsu_code = tostring(nomsu_code) nomsu_code = tostring(nomsu_code)
userdata = { userdata = {
indent: "", errors: {}, :source, comments: {}, indent: "", errors: {}, :source
} }
tree = NOMSU_PATTERN\match(nomsu_code, nil, userdata) tree = NOMSU_PATTERN\match(nomsu_code, nil, userdata)
unless tree unless tree
@ -129,7 +129,6 @@ Parser.parse = (nomsu_code, source=nil)->
errors = [userdata.errors[k] for k in *keys] errors = [userdata.errors[k] for k in *keys]
error("Errors occurred while parsing:\n\n"..table.concat(errors, "\n\n"), 0) error("Errors occurred while parsing:\n\n"..table.concat(errors, "\n\n"), 0)
tree.comments = userdata.comments
tree.version = userdata.version tree.version = userdata.version
return tree return tree