Tweaks to the API for text matching.

2 files changed, 58 insertions, 2 deletions

diff --git a/compatibility/2.4.nom b/compatibility/2.4.nom
new file mode 100644
index 0000000..ae0cfba
--- /dev/null
+++ b/compatibility/2.4.nom
@@ -0,0 +1,56 @@
+#!/usr/bin/env nomsu -V2.4
+use "core"
+use "compatibility/compatibility.nom"
+
+upgrade %tree to "2.4" as:
+    unless (%tree is "Action" syntax tree): return
+    if %tree.stub is:
+        "when %":
+            %conditions = []
+            %new_lines = []
+            %body = ((%tree.2 upgraded) if (%tree.2 is "Block" syntax tree) else [%tree.2 upgraded])
+            for %line in %body:
+                if:
+                    (not (%line is syntax tree)):
+                        compile error at %tree.source "WUT: %s"
+                    (not (%line is "Action" syntax tree)):
+                        add %line to %new_lines
+                    (%line.stub is "* %"):
+                        add %line.2 to %conditions
+                    (%line.stub == "* else %"):
+                        add (\(else %block) with vars {block:%line.3}) to %new_lines
+                    (%line.stub != "* % %"):
+                        add %line to %new_lines
+                    else:
+                        add %line.2 to %conditions
+                        %action = %line.3
+                        unless (%action is "Block" syntax tree):
+                            %action = (=lua "Block(\%action.source, \%action)")
+                        add %action to %conditions
+                        add (=lua "Action(\%conditions[1].source, unpack(\%conditions))") to %new_lines
+                        %conditions = []
+            return (\(if %body) with vars {body:=lua "Block(\%tree[2].source, unpack(\%new_lines))"})
+
+        "when % is ? %" "when % = ? %":
+            %values = []
+            %new_lines = []
+            %body = ((%tree.5 upgraded) if (%tree.5 is "Block" syntax tree) else [%tree.5 upgraded])
+            for %line in %body:
+                if:
+                    (not (%line is "Action" syntax tree)):
+                        add %line to %new_lines
+                    (%line.stub is "* %"):
+                        add %line.2 to %values
+                    (%line.stub == "* else %"):
+                        add (\(else %block) with vars {block:%line.3}) to %new_lines
+                    (%line.stub != "* % %"):
+                        add %line to %new_lines
+                    else:
+                        add %line.2 to %values
+                        %action = %line.3
+                        unless (%action is "Block" syntax tree):
+                            %action = (=lua "Block(\%action.source, \%action)")
+                        add %action to %values
+                        add (=lua "Action(\%values[1].source, unpack(\%values))") to %new_lines
+                        %values = []
+            return (\(if %var is %body) with vars {var: %tree.2 upgraded, body:=lua "Block(\%tree[5].source, unpack(\%new_lines))"})
diff --git a/compatibility/compatibility.nom b/compatibility/compatibility.nom
index c5ac55f..87ba321 100644
--- a/compatibility/compatibility.nom
+++ b/compatibility/compatibility.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V2.3.4.3
+#!/usr/bin/env nomsu -V2.5
 use "core"
 use "lib/os.nom"
 
@@ -42,7 +42,7 @@ action [..]
     %tree upgraded from %start_version to %end_version
     %tree upgraded to %end_version from %start_version
 ..:
-    local action [%ver as list] ((% as number) for % where %ver matches "[0-9]+")
+    local action [%ver as list] ((% as number) for % in %ver matching "[0-9]+")
     %versions = {}
     for %v = % in %UPGRADES: %versions.%v = (yes)
     for %v = % in %ACTION_UPGRADES: %versions.%v = (yes)