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

Renamed append/concat_append to add/concat_add for Code objects.

Browse Source
This commit is contained in:
Bruce Hill 2018-11-29 14:57:22 -08:00
parent 09e571ffa6
commit efd743591e
13 changed files with 292 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code_obj.lua
View File

@ -154,7 +154,7 @@ do
self._is_multiline = nil self._is_multiline = nil
end end
end, end,
append = function(self, ...) add = function(self, ...)
local n = select("#", ...) local n = select("#", ...)
local match = string.match local match = string.match
local bits = self.bits local bits = self.bits
@ -206,7 +206,7 @@ do
end end
return self._is_multiline return self._is_multiline
end, end,
concat_append = function(self, values, joiner, wrapping_joiner) concat_add = function(self, values, joiner, wrapping_joiner)
wrapping_joiner = wrapping_joiner or joiner wrapping_joiner = wrapping_joiner or joiner
local match = string.match local match = string.match
local bits = self.bits local bits = self.bits
@ -254,14 +254,14 @@ do
end, end,
parenthesize = function(self) parenthesize = function(self)
self:prepend("(") self:prepend("(")
return self:append(")") return self:add(")")
end end
} }
_base_0.__index = _base_0 _base_0.__index = _base_0
_class_0 = setmetatable({ _class_0 = setmetatable({
__init = function(self, ...) __init = function(self, ...)
self.bits = { } self.bits = { }
return self:append(...) return self:add(...)
end, end,
__base = _base_0, __base = _base_0,
__name = "Code" __name = "Code"
@ -418,7 +418,7 @@ do
end, end,
parenthesize = function(self) parenthesize = function(self)
self:prepend("(") self:prepend("(")
return self:append(")") return self:add(")")
end end
} }
_base_0.__index = _base_0 _base_0.__index = _base_0
@ -496,8 +496,8 @@ do
end end
NomsuCode = _class_0 NomsuCode = _class_0
end end
Code.__base.add_1_joined_with = assert(Code.__base.concat_append) Code.__base.add_1_joined_with = assert(Code.__base.concat_add)
Code.__base.add = assert(Code.__base.append) Code.__base.add = assert(Code.__base.add)
return { return {
Code = Code, Code = Code,
NomsuCode = NomsuCode, NomsuCode = NomsuCode,

14
code_obj.moon
View File

@ -44,7 +44,7 @@ class Source
class Code class Code
new: (...)=> new: (...)=>
@bits = {} @bits = {}
@append(...) @add(...)
@from: (source, ...)=> @from: (source, ...)=>
inst = self(...) inst = self(...)
@ -91,7 +91,7 @@ class Code
-- Multi-line only goes from false->true, since there is no API for removing bits -- Multi-line only goes from false->true, since there is no API for removing bits
@_is_multiline = nil if @_is_multiline == false @_is_multiline = nil if @_is_multiline == false
append: (...)=> add: (...)=>
n = select("#",...) n = select("#",...)
match = string.match match = string.match
bits = @bits bits = @bits
@ -123,7 +123,7 @@ class Code
break break
return @_is_multiline return @_is_multiline
concat_append: (values, joiner, wrapping_joiner)=> concat_add: (values, joiner, wrapping_joiner)=>
wrapping_joiner or= joiner wrapping_joiner or= joiner
match = string.match match = string.match
bits = @bits bits = @bits
@ -160,7 +160,7 @@ class Code
parenthesize: => parenthesize: =>
@prepend "(" @prepend "("
@append ")" @add ")"
class LuaCode extends Code class LuaCode extends Code
__tostring: Code.__tostring __tostring: Code.__tostring
@ -239,14 +239,14 @@ class LuaCode extends Code
parenthesize: => parenthesize: =>
@prepend "(" @prepend "("
@append ")" @add ")"
class NomsuCode extends Code class NomsuCode extends Code
__tostring: Code.__tostring __tostring: Code.__tostring
as_lua: Code.as_lua as_lua: Code.as_lua
__len: Code.__len __len: Code.__len
Code.__base.add_1_joined_with = assert Code.__base.concat_append Code.__base.add_1_joined_with = assert Code.__base.concat_add
Code.__base.add = assert Code.__base.append Code.__base.add = assert Code.__base.add
return {:Code, :NomsuCode, :LuaCode, :Source} return {:Code, :NomsuCode, :LuaCode, :Source}

4
compatibility/3.6.nom
View File

@ -16,9 +16,9 @@ upgrade action [add %item to %list at index %i] to "3.6" as (..)
upgrade action [pop from %list, remove last from %list] to "3.6" as (%list::pop) upgrade action [pop from %list, remove last from %list] to "3.6" as (%list::pop)
upgrade action [remove index %index from %list] to "3.6" as (..) upgrade action [remove index %index from %list] to "3.6" as (..)
%list::remove index %index %list::remove index %index
upgrade action [to %1 write %2, %1 <-write %2] to "3.6" as (%1::append %2) upgrade action [to %1 write %2, %1 <-write %2] to "3.6" as (%1::add %2)
upgrade action [to %1 write %2 joined by %3] to "3.6" as (..) upgrade action [to %1 write %2 joined by %3] to "3.6" as (..)
%1::append %2 joined by %3 %1::add %2 joined by %3
upgrade action [declare locals in %lua] to "3.6" as (%lua::declare locals) upgrade action [declare locals in %lua] to "3.6" as (%lua::declare locals)
upgrade action [declare locals %locs in %lua] to "3.6" as (..) upgrade action [declare locals %locs in %lua] to "3.6" as (..)
%lua::declare locals %locs %lua::declare locals %locs

4
compatibility/compatibility.nom
View File

@ -49,10 +49,10 @@ externally (upgrade action %stub to %version via %upgrade_fn) means:
return (quote %t) return (quote %t)
unless ("\%lua" == ""): unless ("\%lua" == ""):
%lua::append "\n" %lua::add "\n"
%retval = (make tree %body) %retval = (make tree %body)
%lua::append (..) %lua::add (..)
Lua "\ Lua "\
..upgrade_action_1_to_2_via(\(quote %action.stub), \(%version as lua expr), function(\(\%tree as lua id)) ..upgrade_action_1_to_2_via(\(quote %action.stub), \(%version as lua expr), function(\(\%tree as lua id))
return \%retval return \%retval

82
core/control_flow.nom
View File

@ -131,8 +131,8 @@ test:
(repeat while %condition %body) compiles to: (repeat while %condition %body) compiles to:
%lua = (Lua "while \(%condition as lua expr) do\n \(%body as lua)") %lua = (Lua "while \(%condition as lua expr) do\n \(%body as lua)")
if (%body has subtree \(do next)): if (%body has subtree \(do next)):
%lua::append "\n ::continue::" %lua::add "\n ::continue::"
%lua::append "\nend --while-loop" %lua::add "\nend --while-loop"
return %lua return %lua
(repeat %body) parses as (repeat while (yes) %body) (repeat %body) parses as (repeat while (yes) %body)
@ -167,20 +167,20 @@ test:
..all compile to: ..all compile to:
# This uses Lua's approach of only allowing loop-scoped variables in a loop # This uses Lua's approach of only allowing loop-scoped variables in a loop
%lua = (Lua "for \(%var as lua identifier)=\(%start as lua expr),\(%stop as lua expr),\(%step as lua expr) do") %lua = (Lua "for \(%var as lua identifier)=\(%start as lua expr),\(%stop as lua expr),\(%step as lua expr) do")
%lua::append "\n " (%body as lua) %lua::add "\n " (%body as lua)
if (%body has subtree \(do next)): if (%body has subtree \(do next)):
%lua::append "\n ::continue::" %lua::add "\n ::continue::"
if (%body has subtree \(do next %var)): if (%body has subtree \(do next %var)):
%lua::append "\n " (\(---next %var ---) as lua) %lua::add "\n " (\(---next %var ---) as lua)
%lua::append "\nend --numeric for-loop" %lua::add "\nend --numeric for-loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%inner_lua = %lua %inner_lua = %lua
%lua = (Lua "do -- scope for stopping for-loop\n ") %lua = (Lua "do -- scope for stopping for-loop\n ")
%lua::append %inner_lua "\n " %lua::add %inner_lua "\n "
%lua::append (\(---stop %var ---) as lua) %lua::add (\(---stop %var ---) as lua)
%lua::append "\nend -- end of scope for stopping for-loop" %lua::add "\nend -- end of scope for stopping for-loop"
return %lua return %lua
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -219,20 +219,20 @@ test:
Lua "\ Lua "\
..for \(%i as lua identifier),\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do ..for \(%i as lua identifier),\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do
" "
%lua::append (%body as lua) %lua::add (%body as lua)
if (%body has subtree \(do next)): if (%body has subtree \(do next)):
%lua::append "\n ::continue::" %lua::add "\n ::continue::"
if (%body has subtree \(do next %var)): if (%body has subtree \(do next %var)):
%lua::append "\n " (\(---next %var ---) as lua) %lua::add "\n " (\(---next %var ---) as lua)
%lua::append "\nend --for \(%var as lua identifier) loop" %lua::add "\nend --for \(%var as lua identifier) loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%inner_lua = %lua %inner_lua = %lua
%lua = (Lua "do -- scope for stopping for-loop\n ") %lua = (Lua "do -- scope for stopping for-loop\n ")
%lua::append %inner_lua "\n " %lua::add %inner_lua "\n "
%lua::append (\(---stop %var ---) as lua) %lua::add (\(---stop %var ---) as lua)
%lua::append "\nend -- end of scope for stopping for-loop" %lua::add "\nend -- end of scope for stopping for-loop"
return %lua return %lua
(for %var in %iterable %body) parses as (..) (for %var in %iterable %body) parses as (..)
@ -255,28 +255,28 @@ test:
[for %key = %value in %iterable %body, for %key %value in %iterable %body] \ [for %key = %value in %iterable %body, for %key %value in %iterable %body] \
..all compile to: ..all compile to:
%lua = (Lua "for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do") %lua = (Lua "for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do")
%lua::append "\n " (%body as lua) %lua::add "\n " (%body as lua)
if (%body has subtree \(do next)): if (%body has subtree \(do next)):
%lua::append "\n ::continue::" %lua::add "\n ::continue::"
if (%body has subtree \(do next %key)): if (%body has subtree \(do next %key)):
%lua::append "\n " (\(---next %key ---) as lua) %lua::add "\n " (\(---next %key ---) as lua)
if (%body has subtree \(do next %value)): if (%body has subtree \(do next %value)):
%lua::append "\n " (\(---next %value ---) as lua) %lua::add "\n " (\(---next %value ---) as lua)
%lua::append "\nend --foreach-loop" %lua::add "\nend --foreach-loop"
%stop_labels = (Lua "") %stop_labels = (Lua "")
if (%body has subtree \(stop %key)): if (%body has subtree \(stop %key)):
%stop_labels::append "\n" (\(---stop %key ---) as lua) %stop_labels::add "\n" (\(---stop %key ---) as lua)
if (%body has subtree \(stop %value)): if (%body has subtree \(stop %value)):
%stop_labels::append "\n" (\(---stop %value ---) as lua) %stop_labels::add "\n" (\(---stop %value ---) as lua)
if ((size of "\%stop_labels") > 0): if ((size of "\%stop_labels") > 0):
%inner_lua = %lua %inner_lua = %lua
%lua = (Lua "do -- scope for stopping for % = % loop\n ") %lua = (Lua "do -- scope for stopping for % = % loop\n ")
%lua::append %inner_lua %stop_labels "\nend" %lua::add %inner_lua %stop_labels "\nend"
return %lua return %lua
@ -326,22 +326,22 @@ test:
..If you want the code in this block to always execute, you don't need a conditional block around it. \ ..If you want the code in this block to always execute, you don't need a conditional block around it. \
..Otherwise, make sure the 'else' block comes last." ..Otherwise, make sure the 'else' block comes last."
%code::append "\nelse\n " (%action as lua) %code::add "\nelse\n " (%action as lua)
%else_allowed = (no) %else_allowed = (no)
..else: ..else:
%code::append %clause " " %code::add %clause " "
for %i in 1 to ((size of %line) - 1): for %i in 1 to ((size of %line) - 1):
if (%i > 1): if (%i > 1):
%code::append " or " %code::add " or "
%code::append (%line.%i as lua expr) %code::add (%line.%i as lua expr)
%code::append " then\n " (%action as lua) %code::add " then\n " (%action as lua)
%clause = "\nelseif" %clause = "\nelseif"
if ((size of "\%code") == 0): if ((size of "\%code") == 0):
compile error at %body "'if' block has an empty body." "\ compile error at %body "'if' block has an empty body." "\
..This means nothing would happen, so the 'if' block should be deleted." ..This means nothing would happen, so the 'if' block should be deleted."
%code::append "\nend --when" %code::add "\nend --when"
return %code return %code
test: test:
@ -388,22 +388,22 @@ test:
..If you want the code in this block to always execute, you don't need a conditional block around it. \ ..If you want the code in this block to always execute, you don't need a conditional block around it. \
..Otherwise, make sure the 'else' block comes last." ..Otherwise, make sure the 'else' block comes last."
%code::append "\nelse\n " (%action as lua) %code::add "\nelse\n " (%action as lua)
%else_allowed = (no) %else_allowed = (no)
..else: ..else:
%code::append %clause " " %code::add %clause " "
for %i in 1 to ((size of %line) - 1): for %i in 1 to ((size of %line) - 1):
if (%i > 1): if (%i > 1):
%code::append " or " %code::add " or "
%code::append "\(mangle "branch value") == " (%line.%i as lua expr) %code::add "\(mangle "branch value") == " (%line.%i as lua expr)
%code::append " then\n " (%action as lua) %code::add " then\n " (%action as lua)
%clause = "\nelseif" %clause = "\nelseif"
if ((size of "\%code") == 0): if ((size of "\%code") == 0):
compile error at %body "'if' block has an empty body." "\ compile error at %body "'if' block has an empty body." "\
..This means nothing would happen, so the 'if' block should be deleted." ..This means nothing would happen, so the 'if' block should be deleted."
%code::append "\nend --when" %code::add "\nend --when"
return (..) return (..)
Lua "\ Lua "\
..do --if % is... ..do --if % is...
@ -470,13 +470,13 @@ test:
\(%body as lua)" \(%body as lua)"
if (%body has subtree \(do next)): if (%body has subtree \(do next)):
%lua::append "\n ::continue::" %lua::add "\n ::continue::"
if (%body has subtree \(do next %var)): if (%body has subtree \(do next %var)):
%lua::append "\n \(\(---next %var ---) as lua)" %lua::add "\n \(\(---next %var ---) as lua)"
%lua::append "\n end -- Recursive loop" %lua::add "\n end -- Recursive loop"
if (%body has subtree \(stop %var)): if (%body has subtree \(stop %var)):
%lua::append "\n \(\(---stop %var ---) as lua)" %lua::add "\n \(\(---stop %var ---) as lua)"
%lua::append "\nend -- Recursive scope" %lua::add "\nend -- Recursive scope"
return %lua return %lua

8
core/math.nom
View File

@ -79,7 +79,7 @@ externally [all of %items, all %items] all mean:
%lua = (Lua "(") %lua = (Lua "(")
%lua::add [: for % in %items: add (% as lua expr)] joined with " and " %lua::add [: for % in %items: add (% as lua expr)] joined with " and "
%lua::append ")" %lua::add ")"
return %lua return %lua
[not all of %items, not all %items] all parse as (not (all of %items)) [not all of %items, not all %items] all parse as (not (all of %items))
@ -98,7 +98,7 @@ externally [any of %items, any %items] all mean:
%lua = (Lua "(") %lua = (Lua "(")
%lua::add [: for % in %items: add (% as lua expr)] joined with " or " %lua::add [: for % in %items: add (% as lua expr)] joined with " or "
%lua::append ")" %lua::add ")"
return %lua return %lua
[none of %items, none %items] all parse as (not (any of %items)) [none of %items, none %items] all parse as (not (any of %items))
@ -119,7 +119,7 @@ externally [sum of %items, sum %items] all mean:
%lua = (Lua "(") %lua = (Lua "(")
%lua::add [: for % in %items: add (% as lua expr)] joined with " + " %lua::add [: for % in %items: add (% as lua expr)] joined with " + "
%lua::append ")" %lua::add ")"
return %lua return %lua
externally [product of %items, product %items] all mean: externally [product of %items, product %items] all mean:
@ -137,7 +137,7 @@ externally [product of %items, product %items] all mean:
%lua = (Lua "(") %lua = (Lua "(")
%lua::add [: for % in %items: add (% as lua expr)] joined with " * " %lua::add [: for % in %items: add (% as lua expr)] joined with " * "
%lua::append ")" %lua::add ")"
return %lua return %lua
externally [avg of %items, average of %items] all mean (..) externally [avg of %items, average of %items] all mean (..)

44
core/metaprogramming.nom
View File

@ -40,11 +40,11 @@ lua> "\
"This does not compile to a Lua identifier, so it can't be used as a function argument.", "This does not compile to a Lua identifier, so it can't be used as a function argument.",
"This should probably be a Nomsu variable instead (like %x).") "This should probably be a Nomsu variable instead (like %x).")
end end
lua:append(i > 1 and ", " or "", arg_lua) lua:add(i > 1 and ", " or "", arg_lua)
body_lua:remove_free_vars({arg_lua}) body_lua:remove_free_vars({arg_lua})
end end
body_lua:declare_locals() body_lua:declare_locals()
lua:append(")\\n ", body_lua, "\\nend)") lua:add(")\\n ", body_lua, "\\nend)")
return lua return lua
end end
compile.action["->"] = compile.action["1 ->"] compile.action["->"] = compile.action["1 ->"]
@ -55,8 +55,8 @@ lua> "\
local lua = LuaCode("compile.action[", \%action.stub:as_lua(), "](") local lua = LuaCode("compile.action[", \%action.stub:as_lua(), "](")
local lua_args = table.map(\%action:get_args(), compile) local lua_args = table.map(\%action:get_args(), compile)
table.insert(lua_args, 1, "compile") table.insert(lua_args, 1, "compile")
lua:concat_append(lua_args, ", ") lua:concat_add(lua_args, ", ")
lua:append(")") lua:add(")")
return lua return lua
end" end"
@ -106,15 +106,15 @@ lua> "\
for i=2,#\%actions do for i=2,#\%actions do
local alias = \%actions[i] local alias = \%actions[i]
local \%alias_args = List{\(\%compile), unpack(alias:get_args())} local \%alias_args = List{\(\%compile), unpack(alias:get_args())}
lua:append("\\ncompile.action[", alias.stub:as_lua(), "] = ") lua:add("\\ncompile.action[", alias.stub:as_lua(), "] = ")
if \%alias_args == \%args then if \%alias_args == \%args then
lua:append("compile.action[", \%actions[1].stub:as_lua(), "]") lua:add("compile.action[", \%actions[1].stub:as_lua(), "]")
else else
lua:append("function(") lua:add("function(")
lua:concat_append(table.map(\%alias_args, compile), ", ") lua:concat_add(table.map(\%alias_args, compile), ", ")
lua:append(") return compile.action[", \%actions[1].stub:as_lua(), "](") lua:add(") return compile.action[", \%actions[1].stub:as_lua(), "](")
lua:concat_append(\%compiled_args, ", ") lua:concat_add(\%compiled_args, ", ")
lua:append(") end") lua:add(") end")
end end
end end
return lua" return lua"
@ -137,9 +137,9 @@ test:
.. ..
local lua = LuaCode() local lua = LuaCode()
local fn_name = \%action.stub:as_lua_id() local fn_name = \%action.stub:as_lua_id()
if \%action.target then lua:append(compile(\%action.target), ".") if \%action.target then lua:add(compile(\%action.target), ".")
else lua:add_free_vars({fn_name}) end else lua:add_free_vars({fn_name}) end
lua:append(fn_name, " = ", \(\(%action -> %body) as lua), ";") lua:add(fn_name, " = ", \(\(%action -> %body) as lua), ";")
return lua" return lua"
(%actions all mean %body) compiles to: (%actions all mean %body) compiles to:
@ -152,18 +152,18 @@ test:
local alias = \%actions[i] local alias = \%actions[i]
local alias_name = alias.stub:as_lua_id() local alias_name = alias.stub:as_lua_id()
local \%alias_args = List(alias:get_args()) local \%alias_args = List(alias:get_args())
lua:append("\\n") lua:add("\\n")
if alias.target then if alias.target then
lua:append(compile(alias.target), ".") lua:add(compile(alias.target), ".")
else else
lua:add_free_vars({alias_name}) lua:add_free_vars({alias_name})
end end
lua:append(alias_name, " = ") lua:add(alias_name, " = ")
if \%args == \%alias_args then if \%args == \%alias_args then
if target then lua:append(target, ".") end if target then lua:add(target, ".") end
lua:append(fn_name, ";") lua:add(fn_name, ";")
else else
lua:append(\(\(%alias_args -> %actions.1) as lua), ";") lua:add(\(\(%alias_args -> %actions.1) as lua), ";")
end end
end end
return lua" return lua"
@ -393,10 +393,10 @@ test:
lua> "\ lua> "\
..local lua = \(Lua "do return ") ..local lua = \(Lua "do return ")
for i=1,select('#',...) do for i=1,select('#',...) do
if i > 1 then lua:append(", ") end if i > 1 then lua:add(", ") end
lua:append(_1_as_lua((select(i, ...)))) lua:add(_1_as_lua((select(i, ...))))
end end
lua:append(" end") lua:add(" end")
return lua" return lua"
# Literals # Literals

26
core/operators.nom
View File

@ -39,14 +39,14 @@ test:
local lua = LuaCode() local lua = LuaCode()
if \%var.type == "List" then if \%var.type == "List" then
for i, \%assignment in ipairs(\%var) do for i, \%assignment in ipairs(\%var) do
if i > 1 then lua:append(", ") end if i > 1 then lua:add(", ") end
local assignment_lua = \(%assignment as lua expr) local assignment_lua = \(%assignment as lua expr)
lua:append(assignment_lua) lua:add(assignment_lua)
if \%assignment.type == 'Var' then if \%assignment.type == 'Var' then
lua:add_free_vars({assignment_lua:text()}) lua:add_free_vars({assignment_lua:text()})
end end
end end
lua:append(' = ') lua:add(' = ')
if \%value.type == "List" then if \%value.type == "List" then
if #\%value ~= #\%var then if #\%value ~= #\%var then
compile_error_at(\%value, compile_error_at(\%value,
@ -55,21 +55,21 @@ test:
..=' operator.") ..=' operator.")
end end
for i, \%val in ipairs(\%value) do for i, \%val in ipairs(\%value) do
if i > 1 then lua:append(", ") end if i > 1 then lua:add(", ") end
local val_lua = \(%val as lua expr) local val_lua = \(%val as lua expr)
lua:append(val_lua) lua:add(val_lua)
end end
lua:append(";") lua:add(";")
else else
lua:append(\(%value as lua expr), ';') lua:add(\(%value as lua expr), ';')
end end
else else
local var_lua = \(%var as lua expr) local var_lua = \(%var as lua expr)
lua:append(var_lua) lua:add(var_lua)
if \%var.type == 'Var' then if \%var.type == 'Var' then
lua:add_free_vars({var_lua:text()}) lua:add_free_vars({var_lua:text()})
end end
lua:append(' = ', \(%value as lua expr), ';') lua:add(' = ', \(%value as lua expr), ';')
end end
return lua" return lua"
@ -122,11 +122,11 @@ test:
end end
local value_lua = \%value and \(%value as lua) or "nil" local value_lua = \%value and \(%value as lua) or "nil"
if i > 1 then if i > 1 then
lhs:append(", ") lhs:add(", ")
rhs:append(", ") rhs:add(", ")
end end
lhs:append(target_lua) lhs:add(target_lua)
rhs:append(value_lua) rhs:add(value_lua)
vars[i] = target_lua:text() vars[i] = target_lua:text()
end end
\%lua:remove_free_vars(vars) \%lua:remove_free_vars(vars)

6
lib/object.nom
View File

@ -66,11 +66,11 @@ test:
local alias_name = alias.stub:as_lua_id() local alias_name = alias.stub:as_lua_id()
local \%alias_args = List(alias:get_args()) local \%alias_args = List(alias:get_args())
table.insert(\%alias_args, 1, \(\%me)) table.insert(\%alias_args, 1, \(\%me))
lua:append("\\nclass.", alias_name, " = ") lua:add("\\nclass.", alias_name, " = ")
if \%args == \%alias_args then if \%args == \%alias_args then
lua:append("class.", fn_name) lua:add("class.", fn_name)
else else
lua:append(\(what (%alias_args -> %actions.1) compiles to)) lua:add(\(what (%alias_args -> %actions.1) compiles to))
end end
end end
return lua" return lua"

100
nomsu_compiler.lua
View File

@ -75,18 +75,18 @@ local compile = setmetatable({
[""] = function(compile, fn, ...) [""] = function(compile, fn, ...)
local lua = LuaCode() local lua = LuaCode()
local fn_lua = compile(fn) local fn_lua = compile(fn)
lua:append(fn_lua) lua:add(fn_lua)
if not (fn_lua:text():match("^%(.*%)$") or fn_lua:text():match("^[_a-zA-Z][_a-zA-Z0-9.]*$")) then if not (fn_lua:text():match("^%(.*%)$") or fn_lua:text():match("^[_a-zA-Z][_a-zA-Z0-9.]*$")) then
lua:parenthesize() lua:parenthesize()
end end
lua:append("(") lua:add("(")
for i = 1, select('#', ...) do for i = 1, select('#', ...) do
if i > 1 then if i > 1 then
lua:append(", ") lua:add(", ")
end end
lua:append(compile((select(i, ...)))) lua:add(compile((select(i, ...))))
end end
lua:append(")") lua:add(")")
return lua return lua
end, end,
["Lua"] = function(compile, code) ["Lua"] = function(compile, code)
@ -107,15 +107,15 @@ local compile = setmetatable({
elseif bit.type == "Text" then elseif bit.type == "Text" then
bit_lua = operate_on_text(bit) bit_lua = operate_on_text(bit)
elseif bit.type == "Block" then elseif bit.type == "Block" then
bit_lua = LuaCode:from(bit.source, "(function()", "\n local _lua = LuaCode:from(", tostring(bit.source):as_lua(), ")", "\n local function add(bit) _lua:append(bit) end", "\n local function join_with(glue)", "\n local old_bits = _lua.bits", "\n _lua = LuaCode:from(_lua.source)", "\n _lua:concat_append(old_bits, glue)", "\n end", "\n ", compile(bit), "\n return _lua", "\nend)()") bit_lua = LuaCode:from(bit.source, "(function()", "\n local _lua = LuaCode:from(", tostring(bit.source):as_lua(), ")", "\n local function add(bit) _lua:add(bit) end", "\n local function join_with(glue)", "\n local old_bits = _lua.bits", "\n _lua = LuaCode:from(_lua.source)", "\n _lua:concat_add(old_bits, glue)", "\n end", "\n ", compile(bit), "\n return _lua", "\nend)()")
else else
bit_lua = compile(bit) bit_lua = compile(bit)
end end
local bit_leading_len = #(bit_lua:match("^[^\n]*")) local bit_leading_len = #(bit_lua:match("^[^\n]*"))
lua:append(lua:trailing_line_len() + bit_leading_len > MAX_LINE and ",\n " or ", ") lua:add(lua:trailing_line_len() + bit_leading_len > MAX_LINE and ",\n " or ", ")
lua:append(bit_lua) lua:add(bit_lua)
end end
lua:append(")") lua:add(")")
return lua return lua
end end
return operate_on_text(code) return operate_on_text(code)
@ -130,11 +130,11 @@ local compile = setmetatable({
for _index_0 = 1, #text do for _index_0 = 1, #text do
local bit = text[_index_0] local bit = text[_index_0]
if type(bit) == "string" then if type(bit) == "string" then
lua:append(bit) lua:add(bit)
elseif bit.type == "Text" then elseif bit.type == "Text" then
lua:append(operate_on_text(bit)) lua:add(operate_on_text(bit))
else else
lua:append(compile(bit)) lua:add(compile(bit))
end end
end end
return lua return lua
@ -187,16 +187,16 @@ local compile = setmetatable({
local lua = LuaCode:from(tree.source) local lua = LuaCode:from(tree.source)
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
if type(tok) == 'string' then if type(tok) == 'string' then
lua:append(tok) lua:add(tok)
else else
local tok_lua = compile(tok) local tok_lua = compile(tok)
if tok.type == "Action" then if tok.type == "Action" then
tok_lua:parenthesize() tok_lua:parenthesize()
end end
lua:append(tok_lua) lua:add(tok_lua)
end end
if i < #tree then if i < #tree then
lua:append(" ") lua:add(" ")
end end
end end
return lua return lua
@ -234,12 +234,12 @@ local compile = setmetatable({
local target_lua = compile(tree.target) local target_lua = compile(tree.target)
local target_text = target_lua:text() local target_text = target_lua:text()
if target_text:match("^%(.*%)$") or target_text:match("^[_a-zA-Z][_a-zA-Z0-9.]*$") or tree.target.type == "IndexChain" then if target_text:match("^%(.*%)$") or target_text:match("^[_a-zA-Z][_a-zA-Z0-9.]*$") or tree.target.type == "IndexChain" then
lua:append(target_lua, ":") lua:add(target_lua, ":")
else else
lua:append("(", target_lua, "):") lua:add("(", target_lua, "):")
end end
end end
lua:append((stub):as_lua_id(), "(") lua:add((stub):as_lua_id(), "(")
local args = { } local args = { }
for i, tok in ipairs(tree) do for i, tok in ipairs(tree) do
local _continue_0 = false local _continue_0 = false
@ -259,8 +259,8 @@ local compile = setmetatable({
break break
end end
end end
lua:concat_append(args, ", ") lua:concat_add(args, ", ")
lua:append(")") lua:add(")")
return lua return lua
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
local lua = LuaCode:from(tree.source, "SyntaxTree{") local lua = LuaCode:from(tree.source, "SyntaxTree{")
@ -277,32 +277,32 @@ local compile = setmetatable({
end end
for k, v in pairs((SyntaxTree:is_instance(tree[1]) and tree[1].type == "EscapedNomsu" and tree) or tree[1]) do for k, v in pairs((SyntaxTree:is_instance(tree[1]) and tree[1].type == "EscapedNomsu" and tree) or tree[1]) do
if needs_comma then if needs_comma then
lua:append(", ") lua:add(", ")
else else
needs_comma = true needs_comma = true
end end
if k == i then if k == i then
i = i + 1 i = i + 1
elseif type(k) == 'string' and match(k, "[_a-zA-Z][_a-zA-Z0-9]*") then elseif type(k) == 'string' and match(k, "[_a-zA-Z][_a-zA-Z0-9]*") then
lua:append(k, "= ") lua:add(k, "= ")
else else
lua:append("[", as_lua(k), "]= ") lua:add("[", as_lua(k), "]= ")
end end
if k == "source" then if k == "source" then
lua:append(tostring(v):as_lua()) lua:add(tostring(v):as_lua())
else else
lua:append(as_lua(v)) lua:add(as_lua(v))
end end
end end
lua:append("}") lua:add("}")
return lua return lua
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
local lua = LuaCode:from(tree.source) local lua = LuaCode:from(tree.source)
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
if i > 1 then if i > 1 then
lua:append("\n") lua:add("\n")
end end
lua:append(compile(line)) lua:add(compile(line))
end end
return lua return lua
elseif "Text" == _exp_0 then elseif "Text" == _exp_0 then
@ -320,12 +320,12 @@ local compile = setmetatable({
if string_buffer ~= "" then if string_buffer ~= "" then
string_buffer = string_buffer:as_lua() string_buffer = string_buffer:as_lua()
if lua:trailing_line_len() + #string_buffer > MAX_LINE then if lua:trailing_line_len() + #string_buffer > MAX_LINE then
lua:append("\n ") lua:add("\n ")
end end
if added > 0 then if added > 0 then
lua:append("..") lua:add("..")
end end
lua:append(string_buffer) lua:add(string_buffer)
added = added + 1 added = added + 1
string_buffer = "" string_buffer = ""
end end
@ -334,15 +334,15 @@ local compile = setmetatable({
bit_lua = LuaCode:from(bit.source, "(function()", "\n local _buffer = List{}", "\n local function add(bit) _buffer:add(bit) end", "\n local function join_with(glue) _buffer = _buffer:joined_with(glue) end", "\n ", bit_lua, "\n if lua_type_of(_buffer) == 'table' then _buffer = _buffer:joined() end", "\n return _buffer", "\nend)()") bit_lua = LuaCode:from(bit.source, "(function()", "\n local _buffer = List{}", "\n local function add(bit) _buffer:add(bit) end", "\n local function join_with(glue) _buffer = _buffer:joined_with(glue) end", "\n ", bit_lua, "\n if lua_type_of(_buffer) == 'table' then _buffer = _buffer:joined() end", "\n return _buffer", "\nend)()")
end end
if lua:trailing_line_len() + #bit_lua:text() > MAX_LINE then if lua:trailing_line_len() + #bit_lua:text() > MAX_LINE then
lua:append("\n ") lua:add("\n ")
end end
if added > 0 then if added > 0 then
lua:append("..") lua:add("..")
end end
if bit.type ~= "Text" then if bit.type ~= "Text" then
bit_lua = LuaCode:from(bit.source, "tostring(", bit_lua, ")") bit_lua = LuaCode:from(bit.source, "tostring(", bit_lua, ")")
end end
lua:append(bit_lua) lua:add(bit_lua)
added = added + 1 added = added + 1
_continue_0 = true _continue_0 = true
until true until true
@ -353,12 +353,12 @@ local compile = setmetatable({
if string_buffer ~= "" or #lua.bits == 0 then if string_buffer ~= "" or #lua.bits == 0 then
string_buffer = string_buffer:as_lua() string_buffer = string_buffer:as_lua()
if lua:trailing_line_len() + #string_buffer > MAX_LINE then if lua:trailing_line_len() + #string_buffer > MAX_LINE then
lua:append("\n ") lua:add("\n ")
end end
if added > 0 then if added > 0 then
lua:append("..") lua:add("..")
end end
lua:append(string_buffer) lua:add(string_buffer)
added = added + 1 added = added + 1
end end
if #lua.bits > 1 then if #lua.bits > 1 then
@ -374,13 +374,13 @@ local compile = setmetatable({
if item.type == "Block" then if item.type == "Block" then
break break
end end
lua:append(sep) lua:add(sep)
if item.type == "Comment" then if item.type == "Comment" then
lua:append(compile(item), "\n") lua:add(compile(item), "\n")
sep = '' sep = ''
else else
local item_lua = compile(item) local item_lua = compile(item)
lua:append(item_lua) lua:add(item_lua)
sep = ', ' sep = ', '
end end
i = i + 1 i = i + 1
@ -393,23 +393,23 @@ local compile = setmetatable({
if i <= #tree then if i <= #tree then
lua = LuaCode:from(tree.source, "(function()\n local comprehension = ", lua) lua = LuaCode:from(tree.source, "(function()\n local comprehension = ", lua)
if tree.type == "List" then if tree.type == "List" then
lua:append("\n local function add(x) comprehension[#comprehension+1] = x end") lua:add("\n local function add(x) comprehension[#comprehension+1] = x end")
else else
lua:append("\n local function " .. tostring(("add 1 ="):as_lua_id()) .. "(k, v) comprehension[k] = v end") lua:add("\n local function " .. tostring(("add 1 ="):as_lua_id()) .. "(k, v) comprehension[k] = v end")
end end
while i <= #tree do while i <= #tree do
lua:append("\n ") lua:add("\n ")
if tree[i].type == 'Block' or tree[i].type == 'Comment' then if tree[i].type == 'Block' or tree[i].type == 'Comment' then
lua:append(compile(tree[i])) lua:add(compile(tree[i]))
elseif tree[i].type == "DictEntry" then elseif tree[i].type == "DictEntry" then
local entry_lua = compile(tree[i]) local entry_lua = compile(tree[i])
lua:append((entry_lua:text():sub(1, 1) == '[' and "comprehension" or "comprehension."), entry_lua) lua:add((entry_lua:text():sub(1, 1) == '[' and "comprehension" or "comprehension."), entry_lua)
else else
lua:append("comprehension[#comprehension+1] = ", compile(tree[i])) lua:add("comprehension[#comprehension+1] = ", compile(tree[i]))
end end
i = i + 1 i = i + 1
end end
lua:append("\n return comprehension\nend)()") lua:add("\n return comprehension\nend)()")
end end
return lua return lua
elseif "DictEntry" == _exp_0 then elseif "DictEntry" == _exp_0 then
@ -436,11 +436,11 @@ local compile = setmetatable({
local key_lua_str = key_lua:text() local key_lua_str = key_lua:text()
local lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$") local lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
if lua_id and lua_id:is_lua_id() then if lua_id and lua_id:is_lua_id() then
lua:append("." .. tostring(lua_id)) lua:add("." .. tostring(lua_id))
elseif sub(key_lua_str, 1, 1) == '[' then elseif sub(key_lua_str, 1, 1) == '[' then
lua:append("[ ", key_lua, " ]") lua:add("[ ", key_lua, " ]")
else else
lua:append("[", key_lua, "]") lua:add("[", key_lua, "]")
end end
end end
return lua return lua

102
nomsu_compiler.moon
View File

@ -53,14 +53,14 @@ compile = setmetatable({
[""]: (compile, fn, ...)-> [""]: (compile, fn, ...)->
lua = LuaCode! lua = LuaCode!
fn_lua = compile(fn) fn_lua = compile(fn)
lua\append fn_lua lua\add fn_lua
unless fn_lua\text!\match("^%(.*%)$") or fn_lua\text!\match("^[_a-zA-Z][_a-zA-Z0-9.]*$") unless fn_lua\text!\match("^%(.*%)$") or fn_lua\text!\match("^[_a-zA-Z][_a-zA-Z0-9.]*$")
lua\parenthesize! lua\parenthesize!
lua\append "(" lua\add "("
for i=1,select('#',...) for i=1,select('#',...)
lua\append(", ") if i > 1 lua\add(", ") if i > 1
lua\append compile((select(i, ...))) lua\add compile((select(i, ...)))
lua\append ")" lua\add ")"
return lua return lua
["Lua"]: (compile, code)-> ["Lua"]: (compile, code)->
@ -80,11 +80,11 @@ compile = setmetatable({
elseif bit.type == "Block" elseif bit.type == "Block"
bit_lua = LuaCode\from bit.source, "(function()", bit_lua = LuaCode\from bit.source, "(function()",
"\n local _lua = LuaCode:from(", tostring(bit.source)\as_lua!, ")", "\n local _lua = LuaCode:from(", tostring(bit.source)\as_lua!, ")",
"\n local function add(bit) _lua:append(bit) end", "\n local function add(bit) _lua:add(bit) end",
"\n local function join_with(glue)", "\n local function join_with(glue)",
"\n local old_bits = _lua.bits", "\n local old_bits = _lua.bits",
"\n _lua = LuaCode:from(_lua.source)", "\n _lua = LuaCode:from(_lua.source)",
"\n _lua:concat_append(old_bits, glue)", "\n _lua:concat_add(old_bits, glue)",
"\n end", "\n end",
"\n ", compile(bit), "\n ", compile(bit),
"\n return _lua", "\n return _lua",
@ -93,9 +93,9 @@ compile = setmetatable({
bit_lua = compile(bit) bit_lua = compile(bit)
bit_leading_len = #(bit_lua\match("^[^\n]*")) bit_leading_len = #(bit_lua\match("^[^\n]*"))
lua\append(lua\trailing_line_len! + bit_leading_len > MAX_LINE and ",\n " or ", ") lua\add(lua\trailing_line_len! + bit_leading_len > MAX_LINE and ",\n " or ", ")
lua\append(bit_lua) lua\add(bit_lua)
lua\append ")" lua\add ")"
return lua return lua
return operate_on_text code return operate_on_text code
@ -107,11 +107,11 @@ compile = setmetatable({
lua = LuaCode\from(text.source) lua = LuaCode\from(text.source)
for bit in *text for bit in *text
if type(bit) == "string" if type(bit) == "string"
lua\append bit lua\add bit
elseif bit.type == "Text" elseif bit.type == "Text"
lua\append(operate_on_text(bit)) lua\add(operate_on_text(bit))
else else
lua\append compile(bit) lua\add compile(bit)
return lua return lua
return operate_on_text code return operate_on_text code
@ -146,12 +146,12 @@ compile = setmetatable({
lua = LuaCode\from(tree.source) lua = LuaCode\from(tree.source)
for i,tok in ipairs tree for i,tok in ipairs tree
if type(tok) == 'string' if type(tok) == 'string'
lua\append tok lua\add tok
else else
tok_lua = compile(tok) tok_lua = compile(tok)
tok_lua\parenthesize! if tok.type == "Action" tok_lua\parenthesize! if tok.type == "Action"
lua\append tok_lua lua\add tok_lua
lua\append " " if i < #tree lua\add " " if i < #tree
return lua return lua
if compile_action and not tree.target if compile_action and not tree.target
@ -178,10 +178,10 @@ compile = setmetatable({
-- TODO: this parenthesizing is maybe overly conservative -- TODO: this parenthesizing is maybe overly conservative
if target_text\match("^%(.*%)$") or target_text\match("^[_a-zA-Z][_a-zA-Z0-9.]*$") or if target_text\match("^%(.*%)$") or target_text\match("^[_a-zA-Z][_a-zA-Z0-9.]*$") or
tree.target.type == "IndexChain" tree.target.type == "IndexChain"
lua\append target_lua, ":" lua\add target_lua, ":"
else else
lua\append "(", target_lua, "):" lua\add "(", target_lua, "):"
lua\append((stub)\as_lua_id!,"(") lua\add((stub)\as_lua_id!,"(")
args = {} args = {}
for i, tok in ipairs tree for i, tok in ipairs tree
if type(tok) == "string" then continue if type(tok) == "string" then continue
@ -189,8 +189,8 @@ compile = setmetatable({
if tok.type == "Block" if tok.type == "Block"
arg_lua = LuaCode\from(tok.source, "(function()\n ", arg_lua, "\nend)()") arg_lua = LuaCode\from(tok.source, "(function()\n ", arg_lua, "\nend)()")
insert args, arg_lua insert args, arg_lua
lua\concat_append args, ", " lua\concat_add args, ", "
lua\append ")" lua\add ")"
return lua return lua
when "EscapedNomsu" when "EscapedNomsu"
@ -204,26 +204,26 @@ compile = setmetatable({
else x\as_lua! else x\as_lua!
for k,v in pairs((SyntaxTree\is_instance(tree[1]) and tree[1].type == "EscapedNomsu" and tree) or tree[1]) for k,v in pairs((SyntaxTree\is_instance(tree[1]) and tree[1].type == "EscapedNomsu" and tree) or tree[1])
if needs_comma then lua\append ", " if needs_comma then lua\add ", "
else needs_comma = true else needs_comma = true
if k == i if k == i
i += 1 i += 1
elseif type(k) == 'string' and match(k,"[_a-zA-Z][_a-zA-Z0-9]*") elseif type(k) == 'string' and match(k,"[_a-zA-Z][_a-zA-Z0-9]*")
lua\append(k, "= ") lua\add(k, "= ")
else else
lua\append("[", as_lua(k), "]= ") lua\add("[", as_lua(k), "]= ")
if k == "source" if k == "source"
lua\append tostring(v)\as_lua! lua\add tostring(v)\as_lua!
else else
lua\append as_lua(v) lua\add as_lua(v)
lua\append "}" lua\add "}"
return lua return lua
when "Block" when "Block"
lua = LuaCode\from(tree.source) lua = LuaCode\from(tree.source)
for i, line in ipairs tree for i, line in ipairs tree
if i > 1 then lua\append "\n" if i > 1 then lua\add "\n"
lua\append compile(line) lua\add compile(line)
return lua return lua
when "Text" when "Text"
@ -237,9 +237,9 @@ compile = setmetatable({
if string_buffer != "" if string_buffer != ""
string_buffer = string_buffer\as_lua! string_buffer = string_buffer\as_lua!
if lua\trailing_line_len! + #string_buffer > MAX_LINE if lua\trailing_line_len! + #string_buffer > MAX_LINE
lua\append "\n " lua\add "\n "
if added > 0 then lua\append ".." if added > 0 then lua\add ".."
lua\append string_buffer lua\add string_buffer
added += 1 added += 1
string_buffer = "" string_buffer = ""
@ -254,19 +254,19 @@ compile = setmetatable({
"\n return _buffer", "\n return _buffer",
"\nend)()" "\nend)()"
if lua\trailing_line_len! + #bit_lua\text! > MAX_LINE if lua\trailing_line_len! + #bit_lua\text! > MAX_LINE
lua\append "\n " lua\add "\n "
if added > 0 then lua\append ".." if added > 0 then lua\add ".."
if bit.type != "Text" if bit.type != "Text"
bit_lua = LuaCode\from(bit.source, "tostring(",bit_lua,")") bit_lua = LuaCode\from(bit.source, "tostring(",bit_lua,")")
lua\append bit_lua lua\add bit_lua
added += 1 added += 1
if string_buffer ~= "" or #lua.bits == 0 if string_buffer ~= "" or #lua.bits == 0
string_buffer = string_buffer\as_lua! string_buffer = string_buffer\as_lua!
if lua\trailing_line_len! + #string_buffer > MAX_LINE if lua\trailing_line_len! + #string_buffer > MAX_LINE
lua\append "\n " lua\add "\n "
if added > 0 then lua\append ".." if added > 0 then lua\add ".."
lua\append string_buffer lua\add string_buffer
added += 1 added += 1
if #lua.bits > 1 if #lua.bits > 1
@ -281,13 +281,13 @@ compile = setmetatable({
item = tree[i] item = tree[i]
if item.type == "Block" if item.type == "Block"
break break
lua\append sep lua\add sep
if item.type == "Comment" if item.type == "Comment"
lua\append compile(item), "\n" lua\add compile(item), "\n"
sep = '' sep = ''
else else
item_lua = compile(item) item_lua = compile(item)
lua\append item_lua lua\add item_lua
sep = ', ' sep = ', '
i += 1 i += 1
@ -300,20 +300,20 @@ compile = setmetatable({
if i <= #tree if i <= #tree
lua = LuaCode\from tree.source, "(function()\n local comprehension = ", lua lua = LuaCode\from tree.source, "(function()\n local comprehension = ", lua
if tree.type == "List" if tree.type == "List"
lua\append "\n local function add(x) comprehension[#comprehension+1] = x end" lua\add "\n local function add(x) comprehension[#comprehension+1] = x end"
else else
lua\append "\n local function #{("add 1 =")\as_lua_id!}(k, v) comprehension[k] = v end" lua\add "\n local function #{("add 1 =")\as_lua_id!}(k, v) comprehension[k] = v end"
while i <= #tree while i <= #tree
lua\append "\n " lua\add "\n "
if tree[i].type == 'Block' or tree[i].type == 'Comment' if tree[i].type == 'Block' or tree[i].type == 'Comment'
lua\append compile(tree[i]) lua\add compile(tree[i])
elseif tree[i].type == "DictEntry" elseif tree[i].type == "DictEntry"
entry_lua = compile(tree[i]) entry_lua = compile(tree[i])
lua\append (entry_lua\text!\sub(1,1) == '[' and "comprehension" or "comprehension."), entry_lua lua\add (entry_lua\text!\sub(1,1) == '[' and "comprehension" or "comprehension."), entry_lua
else else
lua\append "comprehension[#comprehension+1] = ", compile(tree[i]) lua\add "comprehension[#comprehension+1] = ", compile(tree[i])
i += 1 i += 1
lua\append "\n return comprehension\nend)()" lua\add "\n return comprehension\nend)()"
return lua return lua
@ -344,14 +344,14 @@ compile = setmetatable({
key_lua_str = key_lua\text! key_lua_str = key_lua\text!
lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$") lua_id = match(key_lua_str, "^['\"]([a-zA-Z_][a-zA-Z0-9_]*)['\"]$")
if lua_id and lua_id\is_lua_id! if lua_id and lua_id\is_lua_id!
lua\append ".#{lua_id}" lua\add ".#{lua_id}"
elseif sub(key_lua_str,1,1) == '[' elseif sub(key_lua_str,1,1) == '['
-- NOTE: this *must* use a space after the [ to avoid freaking out -- NOTE: this *must* use a space after the [ to avoid freaking out
-- Lua's parser if the inner expression is a long string. Lua -- Lua's parser if the inner expression is a long string. Lua
-- parses x[[[y]]] as x("[y]"), not as x["y"] -- parses x[[[y]]] as x("[y]"), not as x["y"]
lua\append "[ ",key_lua," ]" lua\add "[ ",key_lua," ]"
else else
lua\append "[",key_lua,"]" lua\add "[",key_lua,"]"
return lua return lua
when "Number" when "Number"

90
nomsu_decompiler.lua
View File

@ -54,7 +54,7 @@ tree_to_inline_nomsu = function(tree)
if tree.target.type == "Action" then if tree.target.type == "Action" then
inline_target:parenthesize() inline_target:parenthesize()
end end
nomsu:append(inline_target, "::") nomsu:add(inline_target, "::")
end end
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == "string" then if type(bit) == "string" then
@ -65,31 +65,31 @@ tree_to_inline_nomsu = function(tree)
clump_words = bit == "'" clump_words = bit == "'"
end end
if i > 1 and not clump_words then if i > 1 and not clump_words then
nomsu:append(" ") nomsu:add(" ")
end end
nomsu:append(bit) nomsu:add(bit)
else else
local arg_nomsu = tree_to_inline_nomsu(bit) local arg_nomsu = tree_to_inline_nomsu(bit)
if bit.type == "Block" then if bit.type == "Block" then
if i > 1 and i < #tree then if i > 1 and i < #tree then
nomsu:append(" ") nomsu:add(" ")
end end
if not (i == #tree) then if not (i == #tree) then
arg_nomsu:parenthesize() arg_nomsu:parenthesize()
end end
else else
if i > 1 then if i > 1 then
nomsu:append(" ") nomsu:add(" ")
end end
if bit.type == "Action" then if bit.type == "Action" then
arg_nomsu:parenthesize() arg_nomsu:parenthesize()
end end
end end
nomsu:append(arg_nomsu) nomsu:add(arg_nomsu)
end end
end end
if #tree == 1 and type(tree[1]) ~= "string" then if #tree == 1 and type(tree[1]) ~= "string" then
nomsu:append("()") nomsu:add("()")
end end
return nomsu return nomsu
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
@ -101,8 +101,8 @@ tree_to_inline_nomsu = function(tree)
elseif "Block" == _exp_0 then elseif "Block" == _exp_0 then
local nomsu = NomsuCode:from(tree.source, ":") local nomsu = NomsuCode:from(tree.source, ":")
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
nomsu:append(i == 1 and " " or "; ") nomsu:add(i == 1 and " " or "; ")
nomsu:append(tree_to_inline_nomsu(line)) nomsu:add(tree_to_inline_nomsu(line))
end end
if #tree > 1 then if #tree > 1 then
nomsu:parenthesize() nomsu:parenthesize()
@ -114,7 +114,7 @@ tree_to_inline_nomsu = function(tree)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if type(bit) == 'string' then if type(bit) == 'string' then
local escaped = inline_escape(bit) local escaped = inline_escape(bit)
nomsu:append(inline_escape(bit)) nomsu:add(inline_escape(bit))
elseif bit.type == "Text" then elseif bit.type == "Text" then
add_text(nomsu, bit) add_text(nomsu, bit)
else else
@ -124,7 +124,7 @@ tree_to_inline_nomsu = function(tree)
elseif bit.type == "Var" and type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then elseif bit.type == "Var" and type(tree[i + 1]) == 'string' and not match(tree[i + 1], "^[ \n\t,.:;#(){}[%]]") then
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
nomsu:append("\\", interp_nomsu) nomsu:add("\\", interp_nomsu)
end end
end end
end end
@ -135,11 +135,11 @@ tree_to_inline_nomsu = function(tree)
local nomsu = NomsuCode:from(tree.source, (tree.type == "List" and "[" or "{")) local nomsu = NomsuCode:from(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:add(", ")
end end
nomsu:append(tree_to_inline_nomsu(item)) nomsu:add(tree_to_inline_nomsu(item))
end end
nomsu:append(tree.type == "List" and "]" or "}") nomsu:add(tree.type == "List" and "]" or "}")
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]
@ -153,19 +153,19 @@ tree_to_inline_nomsu = function(tree)
nomsu:parenthesize() nomsu:parenthesize()
end end
if value then if value then
nomsu:append(": ") nomsu:add(": ")
local value_nomsu = tree_to_inline_nomsu(value) local value_nomsu = tree_to_inline_nomsu(value)
if value.type == "Block" then if value.type == "Block" then
value_nomsu:parenthesize() value_nomsu:parenthesize()
end end
nomsu:append(value_nomsu) nomsu:add(value_nomsu)
end end
return nomsu return nomsu
elseif "IndexChain" == _exp_0 then elseif "IndexChain" == _exp_0 then
local nomsu = NomsuCode:from(tree.source) local nomsu = NomsuCode:from(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if i > 1 then if i > 1 then
nomsu:append(".") nomsu:add(".")
end end
local bit_nomsu local bit_nomsu
if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1]) then if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1]) then
@ -177,7 +177,7 @@ tree_to_inline_nomsu = function(tree)
if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree) then if bit.type == "Action" or bit.type == "IndexChain" or (bit.type == "Number" and i < #tree) then
bit_nomsu:parenthesize() bit_nomsu:parenthesize()
end end
nomsu:append(bit_nomsu) nomsu:add(bit_nomsu)
end end
return nomsu return nomsu
elseif "Number" == _exp_0 then elseif "Number" == _exp_0 then
@ -244,20 +244,20 @@ tree_to_nomsu = function(tree)
local _exp_0 = tree.type local _exp_0 = tree.type
if "FileChunks" == _exp_0 then if "FileChunks" == _exp_0 then
if tree.shebang then if tree.shebang then
nomsu:append(tree.shebang) nomsu:add(tree.shebang)
end end
for chunk_no, chunk in ipairs(tree) do for chunk_no, chunk in ipairs(tree) do
if chunk_no > 1 then if chunk_no > 1 then
nomsu:append("\n\n" .. tostring(("~"):rep(80)) .. "\n\n") nomsu:add("\n\n" .. tostring(("~"):rep(80)) .. "\n\n")
end end
if chunk.type == "Block" then if chunk.type == "Block" then
nomsu:append(NomsuCode:from(chunk.source, table.unpack(tree_to_nomsu(chunk).bits, 2))) nomsu:add(NomsuCode:from(chunk.source, table.unpack(tree_to_nomsu(chunk).bits, 2)))
else else
nomsu:append(tree_to_nomsu(chunk)) nomsu:add(tree_to_nomsu(chunk))
end end
end end
if not (nomsu:match("\n$")) then if not (nomsu:match("\n$")) then
nomsu:append('\n') nomsu:add('\n')
end end
return nomsu return nomsu
elseif "Action" == _exp_0 then elseif "Action" == _exp_0 then
@ -267,8 +267,8 @@ tree_to_nomsu = function(tree)
if tree.target.type == "Block" and not target_nomsu:is_multiline() then if tree.target.type == "Block" and not target_nomsu:is_multiline() then
target_nomsu:parenthesize() target_nomsu:parenthesize()
end end
nomsu:append(target_nomsu) nomsu:add(target_nomsu)
nomsu:append(target_nomsu:is_multiline() and "\n..::" or "::") nomsu:add(target_nomsu:is_multiline() and "\n..::" or "::")
end end
local word_buffer = { } local word_buffer = { }
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
@ -291,7 +291,7 @@ tree_to_nomsu = function(tree)
next_space = "" next_space = ""
end end
end end
nomsu:append(next_space, words) nomsu:add(next_space, words)
word_buffer = { } word_buffer = { }
next_space = " " next_space = " "
end end
@ -309,9 +309,9 @@ tree_to_nomsu = function(tree)
end end
end end
if not (next_space == " " and bit.type == "Block") then if not (next_space == " " and bit.type == "Block") then
nomsu:append(next_space) nomsu:add(next_space)
end end
nomsu:append(bit_nomsu) nomsu:add(bit_nomsu)
next_space = (bit_nomsu:is_multiline() or bit.type == 'Block') and "\n.." or " " next_space = (bit_nomsu:is_multiline() or bit.type == 'Block') and "\n.." or " "
_continue_0 = true _continue_0 = true
until true until true
@ -328,14 +328,14 @@ tree_to_nomsu = function(tree)
next_space = "" next_space = ""
end end
end end
nomsu:append(next_space, words) nomsu:add(next_space, words)
next_space = " " next_space = " "
end end
if #tree == 1 and type(tree[1]) ~= "string" then if #tree == 1 and type(tree[1]) ~= "string" then
if next_space == " " then if next_space == " " then
next_space = "" next_space = ""
end end
nomsu:append(next_space, "()") nomsu:add(next_space, "()")
end end
return nomsu return nomsu
elseif "EscapedNomsu" == _exp_0 then elseif "EscapedNomsu" == _exp_0 then
@ -349,15 +349,15 @@ tree_to_nomsu = function(tree)
for i, line in ipairs(tree) do for i, line in ipairs(tree) do
local line_nomsu = tree_to_nomsu(line) local line_nomsu = tree_to_nomsu(line)
if i > 1 then if i > 1 then
nomsu:append("\n") nomsu:add("\n")
if tree[i - 1].type ~= "Comment" then if tree[i - 1].type ~= "Comment" then
needs_space[i] = (line_nomsu:is_multiline() and prev_line:is_multiline()) needs_space[i] = (line_nomsu:is_multiline() and prev_line:is_multiline())
if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then if tree[i].type == "Comment" or needs_space[i] or needs_space[i - 1] then
nomsu:append("\n") nomsu:add("\n")
end end
end end
end end
nomsu:append(line_nomsu) nomsu:add(line_nomsu)
prev_line = line_nomsu prev_line = line_nomsu
end end
return NomsuCode:from(tree.source, ":\n ", nomsu) return NomsuCode:from(tree.source, ":\n ", nomsu)
@ -370,9 +370,9 @@ tree_to_nomsu = function(tree)
bit = escape(bit) bit = escape(bit)
for j, line in ipairs(bit:lines()) do for j, line in ipairs(bit:lines()) do
if j > 1 then if j > 1 then
nomsu:append("\n") nomsu:add("\n")
elseif #line > 10 and nomsu:trailing_line_len() > max_line then elseif #line > 10 and nomsu:trailing_line_len() > max_line then
nomsu:append("\\\n..") nomsu:add("\\\n..")
end end
while #line > 0 do while #line > 0 do
local space = max_line - nomsu:trailing_line_len() local space = max_line - nomsu:trailing_line_len()
@ -385,16 +385,16 @@ tree_to_nomsu = function(tree)
end end
local bite local bite
bite, line = sub(line, 1, split), sub(line, split + 1, -1) bite, line = sub(line, 1, split), sub(line, split + 1, -1)
nomsu:append(bite) nomsu:add(bite)
if #line > 0 then if #line > 0 then
nomsu:append("\\\n..") nomsu:add("\\\n..")
end end
end end
end end
elseif bit.type == "Text" then elseif bit.type == "Text" then
add_text(bit) add_text(bit)
else else
nomsu:append("\\") nomsu:add("\\")
local interp_nomsu = recurse(bit) local interp_nomsu = recurse(bit)
if not (interp_nomsu:is_multiline()) then if not (interp_nomsu:is_multiline()) then
if bit.type == "Var" then if bit.type == "Var" then
@ -405,9 +405,9 @@ tree_to_nomsu = function(tree)
interp_nomsu:parenthesize() interp_nomsu:parenthesize()
end end
end end
nomsu:append(interp_nomsu) nomsu:add(interp_nomsu)
if interp_nomsu:is_multiline() then if interp_nomsu:is_multiline() then
nomsu:append("\n..") nomsu:add("\n..")
end end
end end
end end
@ -416,7 +416,7 @@ tree_to_nomsu = function(tree)
return NomsuCode:from(tree.source, '"\\\n ..', nomsu, '"') return NomsuCode:from(tree.source, '"\\\n ..', nomsu, '"')
elseif "List" == _exp_0 or "Dict" == _exp_0 then elseif "List" == _exp_0 or "Dict" == _exp_0 then
if #tree == 0 then if #tree == 0 then
nomsu:append(tree.type == "List" and "[]" or "{}") nomsu:add(tree.type == "List" and "[]" or "{}")
return nomsu return nomsu
end end
local sep = '' local sep = ''
@ -428,8 +428,8 @@ tree_to_nomsu = function(tree)
if item.type == 'Comment' then if item.type == 'Comment' then
item_nomsu = tree_to_nomsu(item) item_nomsu = tree_to_nomsu(item)
end end
nomsu:append(sep) nomsu:add(sep)
nomsu:append(item_nomsu) nomsu:add(item_nomsu)
if item_nomsu:is_multiline() or item.type == 'Comment' or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE then if item_nomsu:is_multiline() or item.type == 'Comment' or nomsu:trailing_line_len() + #tostring(item_nomsu) >= MAX_LINE then
sep = '\n' sep = '\n'
else else
@ -456,11 +456,11 @@ tree_to_nomsu = function(tree)
if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu:is_multiline() then if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu:is_multiline() then
value_nomsu:parenthesize() value_nomsu:parenthesize()
end end
nomsu:append(": ", value_nomsu) nomsu:add(": ", value_nomsu)
end end
return nomsu return nomsu
elseif "Comment" == _exp_0 then elseif "Comment" == _exp_0 then
nomsu:append("#", (tree[1]:gsub("\n", "\n "))) nomsu:add("#", (tree[1]:gsub("\n", "\n ")))
return nomsu return nomsu
elseif "IndexChain" == _exp_0 or "Number" == _exp_0 or "Var" == _exp_0 or "Comment" == _exp_0 or "Error" == _exp_0 then elseif "IndexChain" == _exp_0 or "Number" == _exp_0 or "Var" == _exp_0 or "Comment" == _exp_0 or "Error" == _exp_0 then
return tree_to_inline_nomsu(tree) return tree_to_inline_nomsu(tree)

90
nomsu_decompiler.moon
View File

@ -37,29 +37,29 @@ tree_to_inline_nomsu = (tree)->
inline_target = tree_to_inline_nomsu(tree.target) inline_target = tree_to_inline_nomsu(tree.target)
if tree.target.type == "Action" if tree.target.type == "Action"
inline_target\parenthesize! inline_target\parenthesize!
nomsu\append inline_target, "::" nomsu\add inline_target, "::"
for i,bit in ipairs tree for i,bit in ipairs tree
if type(bit) == "string" if type(bit) == "string"
clump_words = if type(tree[i-1]) == 'string' clump_words = if type(tree[i-1]) == 'string'
is_operator(bit) != is_operator(tree[i-1]) is_operator(bit) != is_operator(tree[i-1])
else bit == "'" else bit == "'"
nomsu\append " " if i > 1 and not clump_words nomsu\add " " if i > 1 and not clump_words
nomsu\append bit nomsu\add bit
else else
arg_nomsu = tree_to_inline_nomsu(bit) arg_nomsu = tree_to_inline_nomsu(bit)
if bit.type == "Block" if bit.type == "Block"
if i > 1 and i < #tree if i > 1 and i < #tree
nomsu\append " " nomsu\add " "
unless i == #tree unless i == #tree
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
else else
nomsu\append " " if i > 1 nomsu\add " " if i > 1
if bit.type == "Action" if bit.type == "Action"
arg_nomsu\parenthesize! arg_nomsu\parenthesize!
nomsu\append arg_nomsu nomsu\add arg_nomsu
if #tree == 1 and type(tree[1]) != "string" if #tree == 1 and type(tree[1]) != "string"
nomsu\append "()" nomsu\add "()"
return nomsu return nomsu
when "EscapedNomsu" when "EscapedNomsu"
@ -71,8 +71,8 @@ tree_to_inline_nomsu = (tree)->
when "Block" when "Block"
nomsu = NomsuCode\from(tree.source, ":") nomsu = NomsuCode\from(tree.source, ":")
for i,line in ipairs tree for i,line in ipairs tree
nomsu\append(i == 1 and " " or "; ") nomsu\add(i == 1 and " " or "; ")
nomsu\append tree_to_inline_nomsu(line) nomsu\add tree_to_inline_nomsu(line)
nomsu\parenthesize! if #tree > 1 nomsu\parenthesize! if #tree > 1
return nomsu return nomsu
@ -81,7 +81,7 @@ tree_to_inline_nomsu = (tree)->
for i, bit in ipairs tree for i, bit in ipairs tree
if type(bit) == 'string' if type(bit) == 'string'
escaped = inline_escape(bit) escaped = inline_escape(bit)
nomsu\append inline_escape(bit) nomsu\add inline_escape(bit)
elseif bit.type == "Text" elseif bit.type == "Text"
add_text(nomsu, bit) add_text(nomsu, bit)
else else
@ -90,7 +90,7 @@ tree_to_inline_nomsu = (tree)->
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
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\add "\\", interp_nomsu
nomsu = NomsuCode\from(tree.source) nomsu = NomsuCode\from(tree.source)
add_text(nomsu, tree) add_text(nomsu, tree)
return NomsuCode\from(tree.source, '"', nomsu, '"') return NomsuCode\from(tree.source, '"', nomsu, '"')
@ -98,9 +98,9 @@ tree_to_inline_nomsu = (tree)->
when "List", "Dict" when "List", "Dict"
nomsu = NomsuCode\from(tree.source, (tree.type == "List" and "[" or "{")) nomsu = NomsuCode\from(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\add ", " if i > 1
nomsu\append tree_to_inline_nomsu(item) nomsu\add tree_to_inline_nomsu(item)
nomsu\append(tree.type == "List" and "]" or "}") nomsu\add(tree.type == "List" and "]" or "}")
return nomsu return nomsu
when "DictEntry" when "DictEntry"
@ -110,16 +110,16 @@ tree_to_inline_nomsu = (tree)->
else tree_to_inline_nomsu(key) else tree_to_inline_nomsu(key)
nomsu\parenthesize! if key.type == "Action" or key.type == "Block" nomsu\parenthesize! if key.type == "Action" or key.type == "Block"
if value if value
nomsu\append ": " nomsu\add ": "
value_nomsu = tree_to_inline_nomsu(value) value_nomsu = tree_to_inline_nomsu(value)
value_nomsu\parenthesize! if value.type == "Block" value_nomsu\parenthesize! if value.type == "Block"
nomsu\append value_nomsu nomsu\add value_nomsu
return nomsu return nomsu
when "IndexChain" when "IndexChain"
nomsu = NomsuCode\from(tree.source) nomsu = NomsuCode\from(tree.source)
for i, bit in ipairs tree for i, bit in ipairs tree
nomsu\append "." if i > 1 nomsu\add "." if i > 1
local bit_nomsu local bit_nomsu
bit_nomsu = if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1]) bit_nomsu = if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1])
bit[1] bit[1]
@ -127,7 +127,7 @@ tree_to_inline_nomsu = (tree)->
assert bit.type != "Block" assert bit.type != "Block"
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\add bit_nomsu
return nomsu return nomsu
when "Number" when "Number"
@ -185,16 +185,16 @@ tree_to_nomsu = (tree)->
switch tree.type switch tree.type
when "FileChunks" when "FileChunks"
if tree.shebang if tree.shebang
nomsu\append tree.shebang nomsu\add tree.shebang
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\add "\n\n#{("~")\rep(80)}\n\n" if chunk_no > 1
if chunk.type == "Block" if chunk.type == "Block"
nomsu\append NomsuCode\from(chunk.source, table.unpack(tree_to_nomsu(chunk).bits, 2)) nomsu\add NomsuCode\from(chunk.source, table.unpack(tree_to_nomsu(chunk).bits, 2))
else else
nomsu\append tree_to_nomsu(chunk) nomsu\add tree_to_nomsu(chunk)
nomsu\append('\n') unless nomsu\match("\n$") nomsu\add('\n') unless nomsu\match("\n$")
return nomsu return nomsu
when "Action" when "Action"
@ -203,8 +203,8 @@ tree_to_nomsu = (tree)->
target_nomsu = recurse(tree.target) target_nomsu = recurse(tree.target)
if tree.target.type == "Block" and not target_nomsu\is_multiline! if tree.target.type == "Block" and not target_nomsu\is_multiline!
target_nomsu\parenthesize! target_nomsu\parenthesize!
nomsu\append target_nomsu nomsu\add target_nomsu
nomsu\append(target_nomsu\is_multiline! and "\n..::" or "::") nomsu\add(target_nomsu\is_multiline! and "\n..::" or "::")
word_buffer = {} word_buffer = {}
for i,bit in ipairs tree for i,bit in ipairs tree
@ -221,7 +221,7 @@ tree_to_nomsu = (tree)->
next_space = " \\\n.." next_space = " \\\n.."
elseif word_buffer[1] == "'" elseif word_buffer[1] == "'"
next_space = "" next_space = ""
nomsu\append next_space, words nomsu\add next_space, words
word_buffer = {} word_buffer = {}
next_space = " " next_space = " "
@ -240,9 +240,9 @@ tree_to_nomsu = (tree)->
else else
next_space = " \\\n.." next_space = " \\\n.."
unless next_space == " " and bit.type == "Block" unless next_space == " " and bit.type == "Block"
nomsu\append next_space nomsu\add next_space
nomsu\append bit_nomsu nomsu\add bit_nomsu
next_space = (bit_nomsu\is_multiline! or bit.type == 'Block') and "\n.." or " " next_space = (bit_nomsu\is_multiline! or bit.type == 'Block') and "\n.." or " "
if #word_buffer > 0 if #word_buffer > 0
@ -252,12 +252,12 @@ tree_to_nomsu = (tree)->
next_space = " \\\n.." next_space = " \\\n.."
elseif word_buffer[1] == "'" elseif word_buffer[1] == "'"
next_space = "" next_space = ""
nomsu\append next_space, words nomsu\add next_space, words
next_space = " " next_space = " "
if #tree == 1 and type(tree[1]) != "string" if #tree == 1 and type(tree[1]) != "string"
if next_space == " " then next_space = "" if next_space == " " then next_space = ""
nomsu\append next_space, "()" nomsu\add next_space, "()"
return nomsu return nomsu
@ -272,14 +272,14 @@ tree_to_nomsu = (tree)->
for i, line in ipairs tree for i, line in ipairs tree
line_nomsu = tree_to_nomsu(line) line_nomsu = tree_to_nomsu(line)
if i > 1 if i > 1
nomsu\append "\n" nomsu\add "\n"
-- Rule of thumb: add a blank line between two lines if both are -- Rule of thumb: add a blank line between two lines if both are
-- multi-line non-comments, or if a comment comes after a non-comment. -- multi-line non-comments, or if a comment comes after a non-comment.
if tree[i-1].type != "Comment" if tree[i-1].type != "Comment"
needs_space[i] = (line_nomsu\is_multiline! and prev_line\is_multiline!) needs_space[i] = (line_nomsu\is_multiline! and prev_line\is_multiline!)
if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1] if tree[i].type == "Comment" or needs_space[i] or needs_space[i-1]
nomsu\append "\n" nomsu\add "\n"
nomsu\append line_nomsu nomsu\add line_nomsu
prev_line = line_nomsu prev_line = line_nomsu
return NomsuCode\from(tree.source, ":\n ", nomsu) return NomsuCode\from(tree.source, ":\n ", nomsu)
@ -292,9 +292,9 @@ tree_to_nomsu = (tree)->
bit = escape(bit) bit = escape(bit)
for j, line in ipairs bit\lines! for j, line in ipairs bit\lines!
if j > 1 if j > 1
nomsu\append "\n" nomsu\add "\n"
elseif #line > 10 and nomsu\trailing_line_len! > max_line elseif #line > 10 and nomsu\trailing_line_len! > max_line
nomsu\append "\\\n.." nomsu\add "\\\n.."
while #line > 0 while #line > 0
space = max_line - nomsu\trailing_line_len! space = max_line - nomsu\trailing_line_len!
@ -304,12 +304,12 @@ tree_to_nomsu = (tree)->
if #line - split < 10 if #line - split < 10
split = #line split = #line
bite, line = sub(line, 1, split), sub(line, split+1, -1) bite, line = sub(line, 1, split), sub(line, split+1, -1)
nomsu\append bite nomsu\add bite
nomsu\append "\\\n.." if #line > 0 nomsu\add "\\\n.." if #line > 0
elseif bit.type == "Text" elseif bit.type == "Text"
add_text(bit) add_text(bit)
else else
nomsu\append "\\" nomsu\add "\\"
interp_nomsu = recurse(bit) interp_nomsu = recurse(bit)
unless interp_nomsu\is_multiline! unless interp_nomsu\is_multiline!
if bit.type == "Var" if bit.type == "Var"
@ -317,15 +317,15 @@ tree_to_nomsu = (tree)->
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain" elseif bit.type == "EscapedNomsu" or bit.type == "Block" or bit.type == "IndexChain"
interp_nomsu\parenthesize! interp_nomsu\parenthesize!
nomsu\append interp_nomsu nomsu\add interp_nomsu
if interp_nomsu\is_multiline! if interp_nomsu\is_multiline!
nomsu\append "\n.." nomsu\add "\n.."
add_text(tree) add_text(tree)
return NomsuCode\from(tree.source, '"\\\n ..', nomsu, '"') return NomsuCode\from(tree.source, '"\\\n ..', nomsu, '"')
when "List", "Dict" when "List", "Dict"
if #tree == 0 if #tree == 0
nomsu\append(tree.type == "List" and "[]" or "{}") nomsu\add(tree.type == "List" and "[]" or "{}")
return nomsu return nomsu
sep = '' sep = ''
for i, item in ipairs tree for i, item in ipairs tree
@ -334,8 +334,8 @@ tree_to_nomsu = (tree)->
item_nomsu = recurse(item) item_nomsu = recurse(item)
if item.type == 'Comment' if item.type == 'Comment'
item_nomsu = tree_to_nomsu(item) item_nomsu = tree_to_nomsu(item)
nomsu\append sep nomsu\add sep
nomsu\append item_nomsu nomsu\add item_nomsu
if item_nomsu\is_multiline! or item.type == 'Comment' or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE if item_nomsu\is_multiline! or item.type == 'Comment' or nomsu\trailing_line_len! + #tostring(item_nomsu) >= MAX_LINE
sep = '\n' sep = '\n'
else else
@ -355,11 +355,11 @@ tree_to_nomsu = (tree)->
value_nomsu = tree_to_nomsu(value) value_nomsu = tree_to_nomsu(value)
if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu\is_multiline! if (value.type == "Block" or value.type == "EscapedNomsu") and not value_nomsu\is_multiline!
value_nomsu\parenthesize! value_nomsu\parenthesize!
nomsu\append ": ", value_nomsu nomsu\add ": ", value_nomsu
return nomsu return nomsu
when "Comment" when "Comment"
nomsu\append "#", (tree[1]\gsub("\n", "\n ")) nomsu\add "#", (tree[1]\gsub("\n", "\n "))
return nomsu return nomsu
when "IndexChain", "Number", "Var", "Comment", "Error" when "IndexChain", "Number", "Var", "Comment", "Error"