Upgraded version to 3.5.5.6, corresponding to Object Oriented changes.

compatibility/2.3.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu <2.3 to Nomsu 2.3
 

compatibility/2.4.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu <2.4 to Nomsu 2.4
 

compatibility/2.5.5.5.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.4
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu <2.5.5.5 to Nomsu 2.5.5.5
 

compatibility/2.5.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu <2.5 to Nomsu 2.5
 

compatibility/2.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu 1 to Nomsu 2
 

compatibility/3.nom

@@ -1,11 +1,13 @@
-#!/usr/bin/env nomsu -V3
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines upgrades from Nomsu <=2 to Nomsu 3
 
 use "compatibility/compatibility.nom"
 
 upgrade action (method %spec %body) to "3" as (my action %spec %body)
-upgrade action (me) to "3" as (%me)
-upgrade action (@) to "3" as (%me)
-upgrade action (as % %) to "3" via (..)
-    [] -> (barf "Object API has changed. Use (%obj::action 1 2) instead of (as %obj: action 1 2)")
+upgrade action (me) to "3" as %me
+upgrade action (@) to "3" as %me
+upgrade action "as 1 2" to "3" via (..)
+    [] -> (..)
+        barf ".."
+            Object API has changed. Use (%obj::action 1 2) instead of (as %obj: action 1 2)

compatibility/compatibility.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file contains code for defining ways to upgrade code between different versions
     of Nomsu.
@@ -9,10 +9,8 @@ use "lib/os.nom"
 action [upgrade to %version via %upgrade_fn]:
     %UPGRADES.%version = %upgrade_fn
 
-%ACTION_UPGRADES = {}
+%ACTION_UPGRADES = ({} with fallback % -> [])
 action [upgrade action %stub to %version via %upgrade_fn]:
-    unless %ACTION_UPGRADES.%version:
-        %ACTION_UPGRADES.%version = []
     %ACTION_UPGRADES.%version.%stub = %upgrade_fn
 
 parse [upgrade %tree to %version as %body] as (..)

core/collections.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file contains compile-time actions that define basic control flow structures
     like "if" statements and loops.

core/coroutines.nom

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

core/errors.nom

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

core/io.nom

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

core/math.nom

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

core/metaprogramming.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This File contains actions for making actions and compile-time actions and some helper
     functions to make that easier.
@@ -334,8 +334,8 @@ compile [type of %obj] to (Lua value "type(\(%obj as lua expr))")
 test:
     assume ((parse "foo %") == \(foo \%))
     %a = (parse "\\1")
-    %b = \\1
-    assume ((parse "\\1") == \\1)
+    %b = \(\(1))
+    assume ((parse "\\1") == \(\(1)))
 compile [parse %text] to (Lua value "nomsu:parse(\(%text as lua expr))")
 compile [parse %text from %filename] to (..)
     Lua value ".."
@@ -356,7 +356,7 @@ compile [run %nomsu_code] to (..)
         ..)
 
 test:
-    assume ((\(\5 + \5) as value) == 10) or barf "%tree as value failed."
+    assume ((\(\(5) + \(5)) as value) == 10) or barf "%tree as value failed."
 action [run tree %tree, %tree as value] (lua> "return nomsu:run(\%tree)")
 compile [compile %block, compiled %block, %block compiled] to (..)
     Lua value "nomsu:compile(\(%block as lua))"

core/operators.nom

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

core/scopes.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file contains definitions pertaining to variable scoping
 

core/text.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file defines actions for ANSI console color escape codes.
 

lib/file_hash.nom

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

lib/object.nom

@@ -1,17 +1,16 @@
-#!/usr/bin/env nomsu -V3
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     This file contains the implementation of an Object-Oriented programming system.
 
 test:
     object "Dog":
         (Dog).genus = "Canus"
-        my action [set up]:
-            %me.barks or= 0
+        my action [set up]: %me.barks or= 0
         my action [bark, woof]:
             %barks = ("Bark!" for % in 1 to %me.barks)
             return (%barks joined with " ")
-        my action [get pissed off]:
-            %me.barks += 1
+        
+        my action [get pissed off]: %me.barks += 1
     
     %d = (new Dog {barks:2})
     assume (%d.barks == 2)
@@ -26,8 +25,8 @@ test:
     assume (%d.barks == 3)
     %d2 = (new Dog)
     assume (%d2.barks == 0) or barf "Default initializer failed"
-    with {%d:new Dog {barks:1}}: assume ((%d::bark) == "Bark!")
-    
+    with {%d:new Dog {barks:1}}:
+        assume ((%d::bark) == "Bark!")
     object "Corgi" extends (Dog):
         my action [sploot] "splooted"
         my action [bark, woof]:
@@ -43,13 +42,14 @@ test:
     
     with {%d:new Dog {barks:2}}:
         assume ((%d::bark) == "Bark! Bark!")
-
 compile [my action %actions %body] to:
     lua> ".."
         local fn_name = "A"..string.as_lua_id(\%actions[1].stub)
         local \%args = table.map(\%actions[1]:get_args(), function(a) return tostring(nomsu:compile(a)) end)
         table.insert(\%args, \(\%me as lua id))
-        local lua = LuaCode(tree.source, "class.", fn_name, " = ", \(compile as (%args -> %body)))
+        local lua = LuaCode(tree.source, "class.", fn_name, " = ", \(..)
+            compile as (%args -> %body)
+        ..)
         for i=2,#\%actions do
             local alias = \%actions[i]
             local alias_name = "A"..string.as_lua_id(alias.stub)

lib/os.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.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 -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 # This file sets the current library version.
-lua> "NOMSU_LIB_VERSION = 5"
+lua> "NOMSU_LIB_VERSION = 6"

tools/autoformat.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     Auto-format Nomsu code. Usage:
         nomsu tools/autoformat.nom [-i] file1 file2 directory1 ...

tools/find_action.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     Find an action by its stub. Usage:
         nomsu tools/find_action.nom "foo %" file1 file2 directory1 ...
@@ -8,7 +8,7 @@ use "lib/os.nom"
 use "lib/consolecolor.nom"
 
 %stub = (command line args).1
-say "Looking for stub: \%stub (from \(command line args))"
+say "Looking for stub: \%stub..."
 %files = ((command line args).% for % in 2 to (|| (command line args) ||))
 for %path in %files:
     for file %filename in %path:

tools/parse.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     Tool to print out a parse tree of files in an easy-to-read format. Usage:
         nomsu tools/parse.nom file1 file2 directory1 ...        

tools/test.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     Tool to run all tests in a file (i.e. the code block inside a call to 'test %'). Usage:
         nomsu tools/test.nom file1 file2 directory1 ...

tools/upgrade.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.5.5.5
+#!/usr/bin/env nomsu -V3.5.5.6
 #
     Tool to automatically update code from old versions of Nomsu. Usage:
         nomsu tools/upgrade.nom [-i] file1 file2 directory1 ...