Lots of fixes to the upgrading and codegen/autoformatting pipeline, also

deleted nomnom files, since they're mostly not needed anymore.

1 files changed, 3 insertions, 3 deletions

diff --git a/compatibility/2.nom b/compatibility/2.nom
index 5c78e29..84331a6 100644
--- a/compatibility/2.nom
+++ b/compatibility/2.nom
@@ -23,13 +23,13 @@ upgrade %tree to "2" as:
         "if", "unless", "for 1 in", "for 1 = 2 in", "repeat while 1"
         "repeat 1 times", "repeat", "repeat until 1", "for 1 in 2 to 3 by"
         "for 1 in 2 to 3 via", "for 1 in 2 to", "for 1 2 in"
-        "do", "for 1 in recursive", "test", "with", "result of"
+        "do", "for 1 in recursive", "test", "with", "result of", "when"
     
     for %n in %need_blocks:
         if (%tree.stub is %n):
             %bits = (((% upgraded) if (% is syntax tree) else %) for % in %tree)
             unless ((%bits::last) is "Block" syntax tree):
                 %body = (%bits::last)
-                %bits.(size of %bits) = (=lua "Block(\%body.source, \%body)")
+                %bits.(size of %bits) = (=lua "SyntaxTree{type='Block', source=\%body.source, \%body}")
             
-            return (=lua "Action(\%tree.source, unpack(\%bits))")
+            return (=lua "SyntaxTree{type='Action', source=\%tree.source, unpack(\%bits)}")