X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=a3f4913a75d5e9177843da3d5a71ce2d24b0a8b4;hp=fa5b195e1b2575c4d14f9e385c854aad53dd0823;hb=a457cd3bb5ce9366db3ca0731a07abc50ecbc1f3;hpb=006b94f5a24a794665788737fec8d54086284317

diff --git a/tests.scm b/tests.scm
index fa5b195..a3f4913 100644
--- a/tests.scm
+++ b/tests.scm
@@ -70,10 +70,10 @@
 			(bar Bool))))
       '((foo (A foo constructor)
 	     abs Int (abs Bool A))
-	(foo~0 (A foo 0) abs A Int)
-	(foo~1 (A foo 1) abs A Bool)
+	(foo~0 (A foo 0 Int) abs A Int)
+	(foo~1 (A foo 1 Bool) abs A Bool)
 	(bar (A bar constructor) abs Bool A)
-	(bar~0 (A bar 0) abs A Bool)))
+	(bar~0 (A bar 0 Bool) abs A Bool)))
 
 (test (data-tors-type-env
        '(A . ((foo Int Bool)
@@ -155,9 +155,7 @@
 
 (test-types
  (typecheck
-  '((data A
-	  [foo Int]
-	  [bar Bool])
+  '((data A [foo Int])
     (let ([x (foo 42)]
 	  [(foo y) x])
       x)))
@@ -165,14 +163,25 @@
 
 (test-types
  (typecheck
-  '((data A
-	  [foo Int]
-	  [bar Bool])
+  '((data A [foo Int])
     (let ([x (foo 42)]
 	  [(foo y) x])
       y)))
  'Int)
 
+					; case statements
+(test-types
+ (typecheck '((data A (foo B))
+	      (data B (bar Int))
+	      (case (foo (bar 32))
+		[(foo x) x])))
+ 'B)
+
+(test-types
+ (typecheck '((case 42
+		[23 (= 1 2)]
+		[x (= x 1)])))
+ 'Bool)
 
 					; type annotations
 
@@ -259,3 +268,42 @@
 	     (let ([(foo x y) (foo (= 3 3) 42)])
 	       y))
 	   42)
+
+(test-exception (expand-pattern-matches
+		 '((data A [foo Int]
+		   [bar Bool])
+		   (let ([(foo x) (foo 0)]) x))))
+
+(test-prog '((data A [foo Int])
+	     (let ([x (foo 42)])
+	       (let ([(foo y) x])
+		 (+ 2 y))))
+	   44)
+
+(test-prog '((data A [foo Bool Int Int])
+	     (let ([x (foo (= 2 1) 123 45)]
+		   [(foo a b c) x])
+	       (+ b c)))
+	   (+ 123 45))
+
+(test-prog '((data A [foo Int])
+	     (data B [bar A])
+	     (let ([(bar (foo x)) (bar (foo 42))])
+	       x))
+	   42)
+
+(test-prog '((data Foo [a] [b] [c])
+	     (let ([x b])
+	       (case x
+		 [a 3]
+		 [b 2]
+		 [c 1])))
+	   2)
+
+(test-prog '((data Foo [foo Int Int] [bar Bool])
+	     (case (foo 42 12)
+	       [(foo 20 x) 0]
+	       [(foo 42 x) x]
+	       [(bar x) 0]))
+	   12)
+