X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=a3f4913a75d5e9177843da3d5a71ce2d24b0a8b4;hp=2b6e09a4c2c63207707f061f722ca4ca3c377a66;hb=a457cd3bb5ce9366db3ca0731a07abc50ecbc1f3;hpb=86531822ef58c5b29751976f5b41d1c631bdd459

diff --git a/tests.scm b/tests.scm
index 2b6e09a..a3f4913 100644
--- a/tests.scm
+++ b/tests.scm
@@ -7,7 +7,13 @@
 	   (format "test failed:\nexpected: ~a\nactual:   ~a"
 		   expected actual))))
 
-(define (test . xs) (apply test-f (cons equal? xs)))
+(define-syntax test
+  (syntax-rules ()
+    ((_ a e)
+     (begin
+       (display (quote a))
+       (newline)
+       (test-f equal? a e)))))
 
 (define-syntax test-types
   (syntax-rules ()
@@ -30,7 +36,7 @@
   (display prog)
   (newline)
   (compile-to-binary prog "/tmp/test-prog" host-os)
-  (test (system "/tmp/test-prog") exit-code))
+  (test-f equal? (system "/tmp/test-prog") exit-code))
 
 (define (test-expr prog exit-code)
   (test-prog (list prog) exit-code))
@@ -41,16 +47,33 @@
   (compile-to-binary prog "/tmp/test-prog" host-os)
   (system "/tmp/test-prog > /tmp/test-output.txt")
   (let ((str (read-file "/tmp/test-output.txt")))
-    (test str output)))
+    (test-f equal? str output)))
+
+(define-syntax test-exception
+  (syntax-rules ()
+    ((_ f)
+     (begin
+       (display (quote f))
+       (newline)
+       (call/cc (lambda (k)
+		  (with-exception-handler
+		   (lambda (x)
+		     (when (eqv? 'no-exception x)
+		       (error #f "test failed: no exception thrown"))
+		     (k))
+		   (lambda ()
+		     (begin
+		       f
+		       (raise 'no-exception))))))))))
 
 (test (data-tors '(A . ((foo Int Bool)
 			(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)
@@ -61,6 +84,20 @@
 	(bar . (abs Bool A))
 	(bar~0 . (abs A Bool))))
 
+(test (expand-pattern-matches
+       '((data A (foo Int Int))
+	 (let ([(foo x y) (foo 123 234)] [z (f 123)]) x)))
+      '((data A (foo Int Int))
+	(let ([x (foo~0 (foo 123 234))]
+	      [y (foo~1 (foo 123 234))]
+	      [z (f 123)])
+	  x)))
+
+(test-exception
+ (expand-pattern-matches '((data A (foo Int Int))
+			   (let ([(foo x) (foo 123 234)])
+			     x))))
+
 (test-types (typecheck '((lambda (x) (+ ((lambda (y) (x y 3)) 5) 2))))
 	    '(abs (abs Int (abs Int Int)) Int))
 
@@ -118,9 +155,7 @@
 
 (test-types
  (typecheck
-  '((data A
-	  [foo Int]
-	  [bar Bool])
+  '((data A [foo Int])
     (let ([x (foo 42)]
 	  [(foo y) x])
       x)))
@@ -128,22 +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)
 
-					; pattern matching
-(test (let-bindings '(let ([(foo x) a]) x))
-      '((x (foo~0 a))))
-
-(test (let-bindings '(let ([x (foo 42)] [(foo y) x]) x))
-      '((x (foo 42))
-	(y (foo~0 x))))
+(test-types
+ (typecheck '((case 42
+		[23 (= 1 2)]
+		[x (= x 1)])))
+ 'Bool)
 
 					; type annotations
 
@@ -230,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)
+