Fully updated to 3.6, deprecated old LuaCode global functions like "to 1

write 2" and replaced them with method calls like "1::append 2"

code_obj.lua

@@ -505,12 +505,12 @@ do
   end
   NomsuCode = _class_0
 end
-Code.__base.append_1 = Code.__base.append
+Code.__base.append_1 = assert(Code.__base.append)
-Code.__base.append_1_joined_by_2 = Code.__base.concat_append
+Code.__base.append_1_joined_by_2 = assert(Code.__base.concat_append)
-Code.__base.prepend_1 = Code.__base.prepend
+Code.__base.prepend_1 = assert(Code.__base.prepend)
-Code.__base.declare_locals_1 = Code.__base.declare_locals
+LuaCode.__base.declare_locals_1 = assert(LuaCode.__base.declare_locals)
-Code.__base.remove_free_vars_1 = Code.__base.remove_free_vars
+LuaCode.__base.remove_free_vars_1 = assert(LuaCode.__base.remove_free_vars)
-Code.__base.add_free_vars_1 = Code.__base.add_free_vars
+LuaCode.__base.add_free_vars_1 = assert(LuaCode.__base.add_free_vars)
 return {
   Code = Code,
   NomsuCode = NomsuCode,

code_obj.moon

@@ -256,11 +256,11 @@ class NomsuCode extends Code
     __repr: Code.__repr
     __len: Code.__len
 
-Code.__base.append_1 = Code.__base.append
+Code.__base.append_1 = assert Code.__base.append
-Code.__base.append_1_joined_by_2 = Code.__base.concat_append
+Code.__base.append_1_joined_by_2 = assert Code.__base.concat_append
-Code.__base.prepend_1 = Code.__base.prepend
+Code.__base.prepend_1 = assert Code.__base.prepend
-Code.__base.declare_locals_1 = Code.__base.declare_locals
+LuaCode.__base.declare_locals_1 = assert LuaCode.__base.declare_locals
-Code.__base.remove_free_vars_1 = Code.__base.remove_free_vars
+LuaCode.__base.remove_free_vars_1 = assert LuaCode.__base.remove_free_vars
-Code.__base.add_free_vars_1 = Code.__base.add_free_vars
+LuaCode.__base.add_free_vars_1 = assert LuaCode.__base.add_free_vars
 
 return {:Code, :NomsuCode, :LuaCode, :Source}

compatibility/3.6.nom

@@ -1,21 +1,20 @@
-#!/usr/bin/env nomsu -V3
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines upgrades from Nomsu <3.6 to 3.6
 
 use "compatibility/compatibility.nom"
 
-upgrade action (to %1 write %2) to "3.6" as (..)
+upgrade action (to %1 write %2) to "3.6" as (%1::append %2)
-    %1::append %2
+upgrade action (%1 <-write %2) to "3.6" as (%1::append %2)
-upgrade action (%1 <-write %2) to "3.6" as (..)
-    %1::append %2
 upgrade action (to %1 write %2 joined by %3) to "3.6" as (..)
     %1::append %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 (..)
     %lua::declare locals %locs
+
 upgrade action (add free vars %vars to %lua) to "3.6" as (..)
     %lua::add free vars %vars
+
 upgrade action (remove free vars %vars from %lua) to "3.6" as (..)
     %lua::remove free vars %vars
-

core/collections.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains code that supports manipulating and using collections like lists
     and dictionaries.

core/control_flow.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains compile-time actions that define basic control flow structures
     like "if" statements and loops.
@@ -117,10 +117,10 @@ compile [repeat while %condition %body] to:
                 \(%body as lua statements)
     
     if (%body has subtree \(do next)):
-        to %lua write "\n    ::continue::"
+        %lua::append "\n    ::continue::"
     if (%body has subtree \(do next repeat)):
-        to %lua write "\n    ::continue_repeat::"
+        %lua::append "\n    ::continue_repeat::"
-    to %lua write "\nend --while-loop"
+    %lua::append "\nend --while-loop"
     if (%body has subtree \(stop repeating)):
         %lua = (..)
             Lua ".."
@@ -145,10 +145,10 @@ compile [repeat %n times %body] to:
                 \(%body as lua statements)
     
     if (%body has subtree \(do next)):
-        to %lua write "\n    ::continue::"
+        %lua::append "\n    ::continue::"
     if (%body has subtree \(do next repeat)):
-        to %lua write "\n    ::continue_repeat::"
+        %lua::append "\n    ::continue_repeat::"
-    to %lua write "\nend --numeric for-loop"
+    %lua::append "\nend --numeric for-loop"
     if (%body has subtree \(stop repeating)):
         %lua = (..)
             Lua ".."
@@ -205,10 +205,10 @@ compile [..]
                 \(%body as lua statements)
     
     if (%body has subtree \(do next)):
-        to %lua write "\n    ::continue::"
+        %lua::append "\n    ::continue::"
     if (%body has subtree \(do next %var)):
-        to %lua write "\n    \(compile as (===next %var ===))"
+        %lua::append "\n    \(compile as (===next %var ===))"
-    to %lua write "\nend --numeric for-loop"
+    %lua::append "\nend --numeric for-loop"
     if (%body has subtree \(stop %var)):
         %lua = (..)
             Lua ".."
@@ -248,10 +248,10 @@ compile [for %var in %iterable %body] to:
                 \(%body as lua statements)
     
     if (%body has subtree \(do next)):
-        to %lua write "\n    ::continue::"
+        %lua::append "\n    ::continue::"
     if (%body has subtree \(do next %var)):
-        to %lua write (Lua "\n\(compile as (===next %var ===))")
+        %lua::append (Lua "\n\(compile as (===next %var ===))")
-    to %lua write "\nend --foreach-loop"
+    %lua::append "\nend --foreach-loop"
     if (%body has subtree \(stop %var)):
         %lua = (..)
             Lua ".."
@@ -289,17 +289,17 @@ compile [..]
                 \(%body as lua statements)
     
     if (%body has subtree \(do next)):
-        to %lua write "\n    ::continue::"
+        %lua::append "\n    ::continue::"
     if (%body has subtree \(do next %key)):
-        to %lua write (Lua "\n\(compile as (===next %key ===))")
+        %lua::append (Lua "\n\(compile as (===next %key ===))")
     if (%body has subtree \(do next %value)):
-        to %lua write (Lua "\n\(compile as (===next %value ===))")
+        %lua::append (Lua "\n\(compile as (===next %value ===))")
-    to %lua write "\nend --foreach-loop"
+    %lua::append "\nend --foreach-loop"
     %stop_labels = (Lua "")
     if (%body has subtree \(stop %key)):
-        to %stop_labels write "\n\(compile as (===stop %key ===))"
+        %stop_labels::append "\n\(compile as (===stop %key ===))"
     if (%body has subtree \(stop %value)):
-        to %stop_labels write "\n\(compile as (===stop %value ===))"
+        %stop_labels::append "\n\(compile as (===stop %value ===))"
     if ((length of "\%stop_labels") > 0):
         %lua = (..)
             Lua ".."
@@ -347,14 +347,14 @@ compile [if %body, when %body] to:
                 compile error at %line.source ".."
                     Can't have an 'else' block without a preceeding condition
             
-            to %code write ".."
+            %code::append ".."
                 
                 else
                     \(%action as lua statements)
             
             %else_allowed = (no)
         ..else:
-            to %code write "\%clause "
+            %code::append "\%clause "
             for %i in 1 to ((length of %line) - 1):
                 unless (%line.%i is syntax tree):
                     compile error at %line.source ".."
@@ -362,10 +362,10 @@ compile [if %body, when %body] to:
                         %s
                 
                 if (%i > 1):
-                    to %code write " or "
+                    %code::append " or "
-                to %code write (%line.%i as lua expr)
+                %code::append (%line.%i as lua expr)
             
-            to %code write ".."
+            %code::append ".."
                  then
                     \(%action as lua statements)
             
@@ -373,7 +373,7 @@ compile [if %body, when %body] to:
     
     if ((length of "\%code") == 0):
         compile error at %body.source "'if' block has an empty body"
-    to %code write "\nend --when"
+    %code::append "\nend --when"
     return %code
 
 test:
@@ -410,14 +410,14 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
                 compile error at %line.source ".."
                     Can't have an 'else' block without a preceeding condition
             
-            to %code write ".."
+            %code::append ".."
                 
                 else
                     \(%action as lua statements)
             
             %else_allowed = (no)
         ..else:
-            to %code write "\%clause "
+            %code::append "\%clause "
             for %i in 1 to ((length of %line) - 1):
                 unless (%line.%i is syntax tree):
                     compile error at %line.source ".."
@@ -425,10 +425,10 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
                         %s
                 
                 if (%i > 1):
-                    to %code write " or "
+                    %code::append " or "
-                to %code write "branch_value == \(%line.%i as lua expr)"
+                %code::append "branch_value == \(%line.%i as lua expr)"
             
-            to %code write ".."
+            %code::append ".."
                  then
                     \(%action as lua statements)
             
@@ -436,7 +436,7 @@ compile [if %branch_value is %body, when %branch_value is %body] to:
     
     if ((length of "\%code") == 0):
         compile error at %body.source "'if % is % %' block has an empty body"
-    to %code write "\nend --when"
+    %code::append "\nend --when"
     return (..)
         Lua ".."
             do --if % is
@@ -504,11 +504,11 @@ compile [for %var in recursive %structure %body] to (..)
                         \(%body as lua statements)
         
         if (%body has subtree \(do next)):
-            to %lua write "\n        ::continue::"
+            %lua::append "\n        ::continue::"
         if (%body has subtree \(do next %var)):
-            to %lua write "\n        \(compile as (===next %var ===))"
+            %lua::append "\n        \(compile as (===next %var ===))"
-        to %lua write "\n    end -- Recursive loop"
+        %lua::append "\n    end -- Recursive loop"
         if (%body has subtree \(stop %var)):
-            to %lua write "\n        \(compile as (===stop %var ===))"
+            %lua::append "\n        \(compile as (===stop %var ===))"
-        to %lua write "\nend -- Recursive scope"
+        %lua::append "\nend -- Recursive scope"
         return %lua

core/coroutines.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines the code that creates and manipulates coroutines
 

core/errors.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains basic error reporting code
 

core/io.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains basic input/output code
 

core/math.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines some common math literals and functions
 

core/metaprogramming.nom

@@ -297,25 +297,6 @@ action [%tree with %patt ~> %replacement]:
             end)
         end)
 
-compile [declare locals in %code] to (..)
-    Lua value "\(%code as lua expr):declare_locals()"
-
-compile [declare locals %locals in %code] to (..)
-    Lua value "\(%code as lua expr):declare_locals(\(%locals as lua expr))"
-
-compile [add free vars %vars to %code] to (..)
-    Lua "\(%code as lua expr):add_free_vars(\(%vars as lua expr));"
-
-compile [remove free vars %vars from %code] to (..)
-    Lua "\(%code as lua expr):remove_free_vars(\(%vars as lua expr));"
-
-compile [%lua <-write %code, to %lua write %code] to (..)
-    Lua "\(%lua as lua expr):append(\(%code as lua expr));"
-
-compile [to %lua write %code joined by %glue] to (..)
-    Lua ".."
-        \(%lua as lua expr):concat_append(\(%code as lua expr), \(%glue as lua expr));
-
 test:
     assume (..)
         (..)

core/operators.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains definitions of operators like "+" and "and".
 

core/scopes.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains definitions pertaining to variable scoping
 
@@ -29,12 +29,12 @@ compile [with local %locals %body, with local %locals do %body] to:
                     \(compile as (<- %locals))
                     \%body_lua
             
-            declare locals ("\(%.1 as lua)" for % in %locals) in %body_lua
+            %body_lua::declare locals ("\(%.1 as lua)" for % in %locals)
         
         "List":
-            declare locals ("\(% as lua)" for % in %locals) in %body_lua
+            %body_lua::declare locals ("\(% as lua)" for % in %locals)
         "Var" "Action":
-            declare locals ["\(%locals as lua)"] in %body_lua
+            %body_lua::declare locals ["\(%locals as lua)"]
         else:
             compile error at %locals.source "Unexpected locals: %s"
     

core/text.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains some definitions of text escape sequences, including ANSI console
     color codes.

examples/how_do_i.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 # How do I...
 # Write a comment? Put a # and go till the end of the line
 # How do I write a multi-line comment?

lib/base64.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines actions for encoding/decoding base 64, as specified in:
     https://tools.ietf.org/html/rfc4648

lib/consolecolor.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines actions for ANSI console color escape codes.
 

lib/file_hash.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines some actions for hashing files and looking up files by hash.
 

lib/object.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains the implementation of an Object-Oriented programming system.
 

lib/os.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file defines some actions that interact with the operating system and filesystem.
 

lib/training_wheels.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 #
     This file contains a set of definitions that bring some familiar language features
     from other languages into nomsu (e.g. "||" and "continue")

lib/version.nom

@@ -1,3 +1,3 @@
-#!/usr/bin/env nomsu -V3.5.5.6
+#!/usr/bin/env nomsu -V3.6.5.6
 # This file sets the current library version.
 lua> "NOMSU_LIB_VERSION = 6"