Some changes to the error API, a fix for statement block parsing, and

replacing ((foo 1 baz)'s meaning) with $(foo 1 baz).

16 files changed, 24 insertions, 22 deletions

diff --git a/compatibility/2.3.nom b/compatibility/2.3.nom
index bbe868b..5b62bc3 100644
--- a/compatibility/2.3.nom
+++ b/compatibility/2.3.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     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 8c948b0..213966b 100644
--- a/compatibility/2.4.nom
+++ b/compatibility/2.4.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     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 6ee5959..52f21eb 100644
--- a/compatibility/2.5.5.5.nom
+++ b/compatibility/2.5.5.5.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     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 a32bbaf..92fb2ac 100644
--- a/compatibility/2.5.nom
+++ b/compatibility/2.5.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <2.5 to Nomsu 2.5
     
diff --git a/compatibility/2.nom b/compatibility/2.nom
index 6335df0..cd84546 100644
--- a/compatibility/2.nom
+++ b/compatibility/2.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu 1 to Nomsu 2
     
diff --git a/compatibility/3.5.5.6.nom b/compatibility/3.5.5.6.nom
index a93c9a9..4323749 100644
--- a/compatibility/3.5.5.6.nom
+++ b/compatibility/3.5.5.6.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     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 8925bc4..2f1a460 100644
--- a/compatibility/3.6.nom
+++ b/compatibility/3.6.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <3.6 to 3.6
     
diff --git a/compatibility/3.7.nom b/compatibility/3.7.nom
index 914c3aa..b68d64c 100644
--- a/compatibility/3.7.nom
+++ b/compatibility/3.7.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <3.7 to 3.7
     
diff --git a/compatibility/3.8.nom b/compatibility/3.8.nom
index 89d2970..feaa593 100644
--- a/compatibility/3.8.nom
+++ b/compatibility/3.8.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <3.8 to 3.8 (Text method changes)
     
diff --git a/compatibility/3.nom b/compatibility/3.nom
index 0a745f6..9606073 100644
--- a/compatibility/3.nom
+++ b/compatibility/3.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <=2 to Nomsu 3
     
diff --git a/compatibility/4.10.12.7.nom b/compatibility/4.10.12.7.nom
index c423f6c..e8a3161 100644
--- a/compatibility/4.10.12.7.nom
+++ b/compatibility/4.10.12.7.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <4.10.12.7 to 4.10.12.7
 use "compatibility/compatibility.nom"
@@ -24,8 +24,10 @@ upgrade action ($e for $i in $start to $stop by $step) to "4.10.12.7" as
 upgrade action ($e for $i in $start to $stop via $step) to "4.10.12.7" as
     [: for $i in $start to $stop by $step: add $e]
 
-upgrade action ($k = $v for $ in $items) to "4.10.12.7" as
-    {: for $ in $items: add $k = $v}
+upgrade action ($k = $v for $ in $items) to "4.10.12.7" as {
+    : for $ in $items:
+        add $k = $v
+}
 
 upgrade action ($k = $v for $k0 = $v0 in $items) to "4.10.12.7" as
     {: for $k0 = $v0 in $items: add $k = $v}
diff --git a/compatibility/4.11.nom b/compatibility/4.11.nom
index a5c9c12..8ca9edc 100644
--- a/compatibility/4.11.nom
+++ b/compatibility/4.11.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <4.11 to Nomsu 4.11
     (overhaul of function literals, deleting (if all of ...), etc. shorthand)
diff --git a/compatibility/4.12.nom b/compatibility/4.12.nom
index 7ca2e3b..215c114 100644
--- a/compatibility/4.12.nom
+++ b/compatibility/4.12.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <4.11 to Nomsu 4.11
     (overhaul of function literals, deleting (if all of ...), etc. shorthand)
diff --git a/compatibility/4.8.10.nom b/compatibility/4.8.10.nom
index 66fdfa1..0752744 100644
--- a/compatibility/4.8.10.nom
+++ b/compatibility/4.8.10.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <4.8.10 to 4.8.10 (renaming "action" -> "means")
 use "compatibility/compatibility.nom"
diff --git a/compatibility/4.9.nom b/compatibility/4.9.nom
index c2064ec..c1b5d3e 100644
--- a/compatibility/4.9.nom
+++ b/compatibility/4.9.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file defines upgrades from Nomsu <4.9 to 4.9
 use "compatibility/compatibility.nom"
diff --git a/compatibility/compatibility.nom b/compatibility/compatibility.nom
index e017728..60baf17 100644
--- a/compatibility/compatibility.nom
+++ b/compatibility/compatibility.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.13.12.8
+#!/usr/bin/env nomsu -V6.14
 #
     This file contains code for defining ways to upgrade code between different versions
     of Nomsu.
@@ -85,16 +85,16 @@ externally [
                 $tree with $ ->:
                     if (($ is "Action" syntax tree) and $ACTION_UPGRADES.$ver.($.stub)):
                         $with_upgraded_args = {
-                            : for $k = $v in $: add $k = ($v upgraded from $start_version to $end_version)
+                            : for $k = $v in $:
+                                add $k = ($v upgraded from $start_version to $end_version)
                         }
                         set $with_upgraded_args's metatable to ($'s metatable)
                         return ($ACTION_UPGRADES.$ver.($.stub) $with_upgraded_args $end_version)
         
         if $UPGRADES.$ver:
             $with_upgraded_args = {
-                :
-                    for $k = $v in $tree:
-                        add $k = ($v upgraded from $start_version to $end_version)
+                : for $k = $v in $tree:
+                    add $k = ($v upgraded from $start_version to $end_version)
             }
             set $with_upgraded_args's metatable to ($tree's metatable)
             $tree = ($UPGRADES.$ver $with_upgraded_args $end_version)