Re-implement multiple patterns for `when` blocks

2 files changed, 24 insertions, 7 deletions

diff --git a/test/enums.tm b/test/enums.tm
index 19590353..a11f95f9 100644
--- a/test/enums.tm
+++ b/test/enums.tm
@@ -66,6 +66,18 @@ func main():
 	while when cases[i] is One(x):
 		>> x
 		i += 1
+
+	>> [
+		(
+			when x is One(y), Two(y,_):
+				"Small $y"
+			is Zero:
+				"Zero"
+			else:
+				"Other"
+		) for x in [Foo.Zero, Foo.One(1), Foo.Two(2,2), Foo.Three(3,"",no)]
+	]
+	= ["Zero", "Small 1", "Small 2", "Other"]
 	
 	>> expr := when cases[1] is One(y):
 		y + 1
diff --git a/test/when.tm b/test/when.tm
index 77c97af5..d93745dd 100644
--- a/test/when.tm
+++ b/test/when.tm
@@ -1,13 +1,18 @@
 # Tests for the 'when' block
 
 func main():
-    str := "B"
-    when str is "A":
-        fail("First")
-    is "B":
-        say("Success")
-    is "C":
-        fail("Third")
+    answers := [
+        (
+            when x is "A","B":
+                "A or B"
+            is "C":
+                "C"
+            else:
+                "Other"
+        ) for x in ["A", "B", "C", "D"]
+    ]
+    >> answers
+    = ["A or B", "A or B", "C", "Other"]
 
     n := 23
     >> when n is 1: Int64(1)