X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=4e6818578f8e37ee3e88205e4b47aff44b9130cb;hp=d2711d7739ffaa2a671835d9be7f4bf6ed211f0d;hb=639c992ea2c89ef0b6421279a76e637c7f469517;hpb=fff1029008b7399f597e0227fff2bf05b8a27b3c

diff --git a/tests.scm b/tests.scm
index d2711d7..4e68185 100644
--- a/tests.scm
+++ b/tests.scm
@@ -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))
 
@@ -217,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)
@@ -312,14 +319,27 @@
 	     (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-prog '((data A [foo Int] [bar Int B])
+(test-exception '((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])))
-	   12)
+		      [(foo x) 2]))))