Clean up 'when' syntax

1 files changed, 28 insertions, 6 deletions

diff --git a/test/enums.tm b/test/enums.tm
index 1bc26203..9f700410 100644
--- a/test/enums.tm
+++ b/test/enums.tm
@@ -1,4 +1,19 @@
-enum Foo(Zero, One(x:Int), Two(x,y:Int))
+enum Foo(Zero, One(x:Int), Two(x:Int, y:Int), Three(x:Int, y:Text, z:Bool), Four(x,y,z,w:Int), Last(t:Text))
+
+func choose_text(f:Foo)->Text:
+	>> f
+	when f is Zero:
+		return "Zero"
+	is One(one):
+		return "One: {one}"
+	is Two(x, y):
+		return "Two: x={x}, y={y}"
+	is Three(three):
+		return "Three: {three}"
+	is Four:
+		return "Four"
+	else:
+		return "else: {f}"
 
 func main():
 	>> Foo.Zero
@@ -27,9 +42,16 @@ func main():
 	>> t[Foo.Zero]
 	= "missing"
 
-	when x is o:One:
-		>> o.x
-		= 123
-	else:
-		fail("Oops")
+	>> choose_text(Foo.Zero)
+	= "Zero"
+	>> choose_text(Foo.One(123))
+	= "One: 123"
+	>> choose_text(Foo.Two(123, 456))
+	= "Two: x=123, y=456"
+	>> choose_text(Foo.Three(123, "hi", yes))
+	= "Three: Three(x=123, y=\"hi\", z=yes)"
+	>> choose_text(Foo.Four(1,2,3,4))
+	= "Four"
+	>> choose_text(Foo.Last("XX"))
+	= "else: Foo.Last(t=\"XX\")"