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

4 files changed, 80 insertions, 80 deletions

diff --git a/core/control_flow.nom b/core/control_flow.nom
index 6cc2599..ccf11de 100644
--- a/core/control_flow.nom
+++ b/core/control_flow.nom
@@ -131,8 +131,8 @@ test:
 (repeat while %condition %body) compiles to:
     %lua = (Lua "while \(%condition as lua expr) do\n    \(%body as lua)")
     if (%body has subtree \(do next)):
-        %lua::append "\n    ::continue::"
-    %lua::append "\nend --while-loop"
+        %lua::add "\n    ::continue::"
+    %lua::add "\nend --while-loop"
     return %lua
 
 (repeat %body) parses as (repeat while (yes) %body)
@@ -167,20 +167,20 @@ test:
 ..all compile to:
     # 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::append "\n    " (%body as lua)
+    %lua::add "\n    " (%body as lua)
     if (%body has subtree \(do next)):
-        %lua::append "\n    ::continue::"
+        %lua::add "\n    ::continue::"
     
     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)):
         %inner_lua = %lua
         %lua = (Lua "do -- scope for stopping for-loop\n    ")
-        %lua::append %inner_lua "\n    "
-        %lua::append (\(---stop %var ---) as lua)
-        %lua::append "\nend -- end of scope for stopping for-loop"
+        %lua::add %inner_lua "\n    "
+        %lua::add (\(---stop %var ---) as lua)
+        %lua::add "\nend -- end of scope for stopping for-loop"
     return %lua
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -219,20 +219,20 @@ test:
         Lua "\
             ..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)):
-        %lua::append "\n    ::continue::"
+        %lua::add "\n    ::continue::"
     
     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)):
         %inner_lua = %lua
         %lua = (Lua "do -- scope for stopping for-loop\n    ")
-        %lua::append %inner_lua "\n    "
-        %lua::append (\(---stop %var ---) as lua)
-        %lua::append "\nend -- end of scope for stopping for-loop"
+        %lua::add %inner_lua "\n    "
+        %lua::add (\(---stop %var ---) as lua)
+        %lua::add "\nend -- end of scope for stopping for-loop"
     return %lua
 
 (for %var in %iterable %body) parses as (..)
@@ -255,28 +255,28 @@ test:
 [for %key = %value in %iterable %body, for %key %value in %iterable %body] \
 ..all compile to:
     %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)):
-        %lua::append "\n    ::continue::"
+        %lua::add "\n    ::continue::"
     
     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)):
-        %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 "")
     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)):
-        %stop_labels::append "\n" (\(---stop %value ---) as lua)
+        %stop_labels::add "\n" (\(---stop %value ---) as lua)
     
     if ((size of "\%stop_labels") > 0):
         %inner_lua = %lua
         %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
 
@@ -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. \
                     ..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:
-            %code::append %clause " "
+            %code::add %clause " "
             for %i in 1 to ((size of %line) - 1):
                 if (%i > 1):
-                    %code::append " or "
-                %code::append (%line.%i as lua expr)
-            %code::append " then\n    " (%action as lua)
+                    %code::add " or "
+                %code::add (%line.%i as lua expr)
+            %code::add " then\n    " (%action as lua)
             %clause = "\nelseif"
     
     if ((size of "\%code") == 0):
         compile error at %body "'if' block has an empty body." "\
             ..This means nothing would happen, so the 'if' block should be deleted."
     
-    %code::append "\nend --when"
+    %code::add "\nend --when"
     return %code
 
 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. \
                     ..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:
-            %code::append %clause " "
+            %code::add %clause " "
             for %i in 1 to ((size of %line) - 1):
                 if (%i > 1):
-                    %code::append " or "
-                %code::append "\(mangle "branch value") == " (%line.%i as lua expr)
-            %code::append " then\n    " (%action as lua)
+                    %code::add " or "
+                %code::add "\(mangle "branch value") == " (%line.%i as lua expr)
+            %code::add " then\n    " (%action as lua)
             %clause = "\nelseif"
     
     if ((size of "\%code") == 0):
         compile error at %body "'if' block has an empty body." "\
             ..This means nothing would happen, so the 'if' block should be deleted."
     
-    %code::append "\nend --when"
+    %code::add "\nend --when"
     return (..)
         Lua "\
             ..do --if % is...
@@ -470,13 +470,13 @@ test:
                         \(%body as lua)"
         
         if (%body has subtree \(do next)):
-            %lua::append "\n        ::continue::"
+            %lua::add "\n        ::continue::"
         
         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)):
-            %lua::append "\n        \(\(---stop %var ---) as lua)"
-        %lua::append "\nend -- Recursive scope"
+            %lua::add "\n        \(\(---stop %var ---) as lua)"
+        %lua::add "\nend -- Recursive scope"
         return %lua
diff --git a/core/math.nom b/core/math.nom
index bef6bbb..2bc3e6f 100644
--- a/core/math.nom
+++ b/core/math.nom
@@ -79,7 +79,7 @@ externally [all of %items, all %items] all mean:
     
     %lua = (Lua "(")
     %lua::add [: for % in %items: add (% as lua expr)] joined with " and "
-    %lua::append ")"
+    %lua::add ")"
     return %lua
     
 [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::add [: for % in %items: add (% as lua expr)] joined with " or "
-    %lua::append ")"
+    %lua::add ")"
     return %lua
     
 [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::add [: for % in %items: add (% as lua expr)] joined with " + "
-    %lua::append ")"
+    %lua::add ")"
     return %lua
     
 externally [product of %items, product %items] all mean:
@@ -137,7 +137,7 @@ externally [product of %items, product %items] all mean:
     
     %lua = (Lua "(")
     %lua::add [: for % in %items: add (% as lua expr)] joined with " * "
-    %lua::append ")"
+    %lua::add ")"
     return %lua
     
 externally [avg of %items, average of %items] all mean (..)
diff --git a/core/metaprogramming.nom b/core/metaprogramming.nom
index 99488c7..43585b0 100644
--- a/core/metaprogramming.nom
+++ b/core/metaprogramming.nom
@@ -40,11 +40,11 @@ lua> "\
                     "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).")
             end
-            lua:append(i > 1 and ", " or "", arg_lua)
+            lua:add(i > 1 and ", " or "", arg_lua)
             body_lua:remove_free_vars({arg_lua})
         end
         body_lua:declare_locals()
-        lua:append(")\\n    ", body_lua, "\\nend)")
+        lua:add(")\\n    ", body_lua, "\\nend)")
         return lua
     end
     compile.action["->"] = compile.action["1 ->"]
@@ -55,8 +55,8 @@ lua> "\
         local lua = LuaCode("compile.action[", \%action.stub:as_lua(), "](")
         local lua_args = table.map(\%action:get_args(), compile)
         table.insert(lua_args, 1, "compile")
-        lua:concat_append(lua_args, ", ")
-        lua:append(")")
+        lua:concat_add(lua_args, ", ")
+        lua:add(")")
         return lua
     end"
 
@@ -106,15 +106,15 @@ lua> "\
         for i=2,#\%actions do
             local alias = \%actions[i]
             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
-                lua:append("compile.action[", \%actions[1].stub:as_lua(), "]")
+                lua:add("compile.action[", \%actions[1].stub:as_lua(), "]")
             else
-                lua:append("function(")
-                lua:concat_append(table.map(\%alias_args, compile), ", ")
-                lua:append(") return compile.action[", \%actions[1].stub:as_lua(), "](")
-                lua:concat_append(\%compiled_args, ", ")
-                lua:append(") end")
+                lua:add("function(")
+                lua:concat_add(table.map(\%alias_args, compile), ", ")
+                lua:add(") return compile.action[", \%actions[1].stub:as_lua(), "](")
+                lua:concat_add(\%compiled_args, ", ")
+                lua:add(") end")
             end
         end
         return lua"
@@ -137,9 +137,9 @@ test:
         ..
         local lua = LuaCode()
         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
-        lua:append(fn_name, " = ", \(\(%action -> %body) as lua), ";")
+        lua:add(fn_name, " = ", \(\(%action -> %body) as lua), ";")
         return lua"
 
 (%actions all mean %body) compiles to:
@@ -152,18 +152,18 @@ test:
             local alias = \%actions[i]
             local alias_name = alias.stub:as_lua_id()
             local \%alias_args = List(alias:get_args())
-            lua:append("\\n")
+            lua:add("\\n")
             if alias.target then
-                lua:append(compile(alias.target), ".")
+                lua:add(compile(alias.target), ".")
             else
                 lua:add_free_vars({alias_name})
             end
-            lua:append(alias_name, " = ")
+            lua:add(alias_name, " = ")
             if \%args == \%alias_args then
-                if target then lua:append(target, ".") end
-                lua:append(fn_name, ";")
+                if target then lua:add(target, ".") end
+                lua:add(fn_name, ";")
             else
-                lua:append(\(\(%alias_args -> %actions.1) as lua), ";")
+                lua:add(\(\(%alias_args -> %actions.1) as lua), ";")
             end
         end
         return lua"
@@ -393,10 +393,10 @@ test:
     lua> "\
         ..local lua = \(Lua "do return ")
         for i=1,select('#',...) do
-            if i > 1 then lua:append(", ") end
-            lua:append(_1_as_lua((select(i, ...))))
+            if i > 1 then lua:add(", ") end
+            lua:add(_1_as_lua((select(i, ...))))
         end
-        lua:append(" end")
+        lua:add(" end")
         return lua"
 
 # Literals
diff --git a/core/operators.nom b/core/operators.nom
index 9997a47..fc90699 100644
--- a/core/operators.nom
+++ b/core/operators.nom
@@ -39,14 +39,14 @@ test:
         local lua = LuaCode()
         if \%var.type == "List" then
             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)
-                lua:append(assignment_lua)
+                lua:add(assignment_lua)
                 if \%assignment.type == 'Var' then
                     lua:add_free_vars({assignment_lua:text()})
                 end
             end
-            lua:append(' = ')
+            lua:add(' = ')
             if \%value.type == "List" then
                 if #\%value ~= #\%var then
                     compile_error_at(\%value,
@@ -55,21 +55,21 @@ test:
         ..=' operator.")
                 end
                 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)
-                    lua:append(val_lua)
+                    lua:add(val_lua)
                 end
-                lua:append(";")
+                lua:add(";")
             else
-                lua:append(\(%value as lua expr), ';')
+                lua:add(\(%value as lua expr), ';')
             end
         else
             local var_lua = \(%var as lua expr)
-            lua:append(var_lua)
+            lua:add(var_lua)
             if \%var.type == 'Var' then
                 lua:add_free_vars({var_lua:text()})
             end
-            lua:append(' = ', \(%value as lua expr), ';')
+            lua:add(' = ', \(%value as lua expr), ';')
         end
         return lua"
 
@@ -122,11 +122,11 @@ test:
             end
             local value_lua = \%value and \(%value as lua) or "nil"
             if i > 1 then
-                lhs:append(", ")
-                rhs:append(", ")
+                lhs:add(", ")
+                rhs:add(", ")
             end
-            lhs:append(target_lua)
-            rhs:append(value_lua)
+            lhs:add(target_lua)
+            rhs:add(value_lua)
             vars[i] = target_lua:text()
         end
         \%lua:remove_free_vars(vars)