Auto-upgraded to 3.7

10 files changed, 21 insertions, 19 deletions

diff --git a/compatibility/2.3.nom b/compatibility/2.3.nom
index 5e75ce7..4df7850 100644
--- a/compatibility/2.3.nom
+++ b/compatibility/2.3.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <2.3 to Nomsu 2.3
 
diff --git a/compatibility/2.4.nom b/compatibility/2.4.nom
index 4b416fb..741b7eb 100644
--- a/compatibility/2.4.nom
+++ b/compatibility/2.4.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <2.4 to Nomsu 2.4
 
diff --git a/compatibility/2.5.5.5.nom b/compatibility/2.5.5.5.nom
index cd266da..b086a9d 100644
--- a/compatibility/2.5.5.5.nom
+++ b/compatibility/2.5.5.5.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <2.5.5.5 to Nomsu 2.5.5.5
 
diff --git a/compatibility/2.5.nom b/compatibility/2.5.nom
index 4c67809..27473e7 100644
--- a/compatibility/2.5.nom
+++ b/compatibility/2.5.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <2.5 to Nomsu 2.5
 
diff --git a/compatibility/2.nom b/compatibility/2.nom
index 1fdfa50..06e3bff 100644
--- a/compatibility/2.nom
+++ b/compatibility/2.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu 1 to Nomsu 2
 
@@ -26,8 +26,8 @@ upgrade %tree to "2" as:
     for %n in %need_blocks:
         if (%tree.stub is %n):
             %bits = (((% upgraded) if (% is syntax tree) else %) for % in %tree)
-            unless ((last in %bits) is "Block" syntax tree):
-                %body = (last in %bits)
-                %bits.(length of %bits) = (=lua "Block(\%body.source, \%body)")
+            unless ((%bits::last) is "Block" syntax tree):
+                %body = (%bits::last)
+                %bits.(size of %bits) = (=lua "Block(\%body.source, \%body)")
             
             return (=lua "Action(\%tree.source, unpack(\%bits))")
diff --git a/compatibility/3.5.5.6.nom b/compatibility/3.5.5.6.nom
index a8b8a69..892725f 100644
--- a/compatibility/3.5.5.6.nom
+++ b/compatibility/3.5.5.6.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <3.5.5.6 to Nomsu 3.5.5.6
 
diff --git a/compatibility/3.6.nom b/compatibility/3.6.nom
index e813f7b..c6afc75 100644
--- a/compatibility/3.6.nom
+++ b/compatibility/3.6.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.7
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <3.6 to 3.6
 
diff --git a/compatibility/3.7.nom b/compatibility/3.7.nom
index 6472a50..dda2b5a 100644
--- a/compatibility/3.7.nom
+++ b/compatibility/3.7.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.7
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <3.7 to 3.7
 
@@ -10,15 +10,17 @@ upgrade action [%index rd to last in %list] to "3.7" as (%list::%index rd to las
 upgrade action [%index th to last in %list] to "3.7" as (%list::%index rd th last)
 upgrade action [last in %list] to "3.7" as (%list::last)
 upgrade action [first in %list] to "3.7" as (%list::first)
-upgrade action [%item is in %list, %list contains %item, %list has %item] to "3.7" as (..)
-    %list::has %item
+upgrade action [%item is in %list, %list contains %item, %list has %item]
+..to "3.7" as (%list::has %item)
 
 upgrade action [..]
     %item isn't in %list, %item is not in %list, %list doesn't contain %item
     %list does not contain %item, %list doesn't have %item, %list does not have %item
 ..to "3.7" as (not (%list::has %item))
 
-upgrade action [%list has key %index, %list has index %index] to "3.7" as (%list.%index != (nil))
+upgrade action [%list has key %index, %list has index %index] to "3.7" as (..)
+    %list.%index != (nil)
+
 upgrade action [..]
     %list doesn't have key %index, %list does not have key %index
     %list doesn't have index %index, %list does not have index %index
diff --git a/compatibility/3.nom b/compatibility/3.nom
index ea33b14..d1599cc 100644
--- a/compatibility/3.nom
+++ b/compatibility/3.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file defines upgrades from Nomsu <=2 to Nomsu 3
 
diff --git a/compatibility/compatibility.nom b/compatibility/compatibility.nom
index f9f006c..b775172 100644
--- a/compatibility/compatibility.nom
+++ b/compatibility/compatibility.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.7
+#!/usr/bin/env nomsu -V3.7.5.6
 #
     This file contains code for defining ways to upgrade code between different versions
     of Nomsu.
@@ -45,11 +45,11 @@ compile [upgrade action %actions to %version as %body] to:
                         if ((type of %k) == "number"):
                             %args::add (make tree %v)
                         ..else:
-                            %args::add "\%k=\(make tree %v)"
+                            %args::add "\(%k)=\(make tree %v)"
+                    
                     return "\(%t.type){\(%args joined with ", ")}"
                 
-                else:
-                    return (quote %t)
+                else: return (quote %t)
         
         unless ("\%lua" == ""): %lua::append "\n"
         %retval = (make tree %body)