X-Git-Url: https://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=7a9b3bffd34df74b48680816cf8e7ceb50b7adbc;hp=ecee99eed962aa94ea39ed8c0f16f4b9c32bc4fa;hb=HEAD;hpb=8e106ca13666680051f91ab3f49ce2bd7e19ead7

diff --git a/tests.scm b/tests.scm
index ecee99e..7a9b3bf 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)
@@ -93,6 +93,13 @@
 	      [z (f 123)])
 	  x)))
 
+(test (singletons '((A [foo] [bar Int]) (B [baz Int] [qux])))
+      '(foo qux))
+
+(test (map (lambda (x) (data-sum-tag '((A [foo] [bar Int]) (B [baz Int] [qux])) x))
+	   '(foo bar baz qux))
+      '(0 1 0 1))
+
 (test-exception
  (expand-pattern-matches '((data A (foo Int Int))
 			   (let ([(foo x) (foo 123 234)])
@@ -106,12 +113,12 @@
 (test-types (substitute '((t1 . (abs t1 t10))) 't1) '(abs t1 t10))
 
 (test-types (typecheck '((let ([bar (lambda (y) y)]
-			       [foo (lambda (x) (foo (bar #t)))])
+			       [foo (lambda (x) (foo (bar true)))])
 			   foo)))
 	    '(abs Bool a))
 
 (test-types (typecheck '((let ([bar (lambda (y) y)]
-			       [foo (lambda (x) (foo (bar #t)))])
+			       [foo (lambda (x) (foo (bar true)))])
 			   bar)))
 	    '(abs a a))
 
@@ -169,6 +176,19 @@
       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
 
@@ -204,8 +224,8 @@
 
 					; passing builtins about
 (test-expr '((lambda (x) ((lambda (a b) (a b 3)) + x)) 3) 6)
-(test-expr '(bool->int ((lambda (x) (x #f)) !)) 1)
-(test-expr '((lambda (f) (f #t)) bool->int) 1)
+(test-expr '(bool->int ((lambda (x) (x false)) !)) 1)
+(test-expr '((lambda (f) (f true)) bool->int) 1)
 (test-prog-stdout '((let () ((lambda (f) (f "foo")) print) 0)) "foo")
 (test-expr '((lambda (f) (f 3 3)) (lambda (x y) (bool->int (= x y)))) 1)
 (test-expr '(bool->int ((lambda (f) (! (f 2 3))) =)) 1)
@@ -264,11 +284,64 @@
 (test-prog '((data A [foo Int])
 	     (let ([x (foo 42)])
 	       (let ([(foo y) x])
-		 (+ 1 y))))
-	   43)
+		 (+ 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]
+	       [(foo y x) 0]
+	       [(bar x) 0]))
+	   12)
+
+(test-prog '((data Foo [foo Int])
+	     (data Bar [bar Foo])
+	     (case (bar (foo 42))
+	       [(bar (foo x)) x]))
+	   42)
+
+
+					; mix of singleton and non singleton constructors
+(test-prog '((data A [foo Int] [bar])
+	     (case (foo 42)
+	       [(foo x) x]
+	       [bar 0]))
+	   42)
+
+(test-prog '((data A [foo Int] [bar])
+	     (case bar
+	       [(foo x) 0]
+	       [bar 12]))
+	     12)
+					; todo: make this error for incomplete pattern match 
+(test-exception
+ (codegen '((data A [foo Int] [bar Int B])
+	    (data B [baz Int])
+	    (let ([val (bar 42 (baz 12))])
+	      (case val
+		[(foo 42) 0]
+		[(bar 32 (baz 12)) 1]
+		[(bar 42 (baz x)) x]
+		[(foo x) 2])))))
+