X-Git-Url: https://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=c4b81f15158e4a7f63152edab863dc9c5e10988b;hp=6b66bec1ae3b6de291a2636778fc2656a6c246a6;hb=6b60f721c4be97e0a79e1b16028a5d180eb0ba1e;hpb=d0e9f5296b7510fe057be4a2f9e2a31ed856652c

diff --git a/tests.scm b/tests.scm
index 6b66bec..c4b81f1 100644
--- a/tests.scm
+++ b/tests.scm
@@ -8,7 +8,7 @@
 		   expected actual))))
 
 (define (test . xs) (apply test-f (cons equal? xs)))
-(define (test-types . xs) (apply test-f (cons types-unify? xs)))
+(define (test-types . xs) (apply test-f (cons types-equal? xs)))
 
 (define (read-file file)
   (call-with-input-file file
@@ -22,13 +22,13 @@
 (define (test-prog prog exit-code)
   (display prog)
   (newline)
-  (compile-to-binary prog "/tmp/test-prog" 'darwin)
+  (compile-to-binary prog "/tmp/test-prog" host-os)
   (test (system "/tmp/test-prog") exit-code))
 
 (define (test-prog-stdout prog output)
   (display prog)
   (newline)
-  (compile-to-binary prog "/tmp/test-prog" 'darwin)
+  (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)))
@@ -43,14 +43,33 @@
 (test-types (typecheck '(let ([bar (lambda (y) y)]
 			      [foo (lambda (x) (foo (bar #t)))])
 			  foo))
-	    '(abs bool t0))
+	    '(abs bool a))
 
 (test-types (typecheck '(let ([bar (lambda (y) y)]
 			[foo (lambda (x) (foo (bar #t)))])
 		    bar))
-      '(abs t0 t0))
+	    '(abs a a))
+
+(test-types (typecheck '(let ([foo 3]
+			      [bar (+ foo baz)]
+			      [baz (- bar 1)])
+			  bar))
+	    'int)
+
+(test-types (typecheck '(let ([foo 3]
+			      [bar (baz foo)]
+			      [baz (lambda (x) x)])
+			  baz))
+	    '(abs a a))
+
+(test-types (typecheck '(let ([foo 3]
+			      [bar (baz foo)]
+			      [baz (lambda (x) x)])
+			  bar))
+	    'int)
 
 (test-prog '(+ 1 2) 3)
+(test-prog '(bool->int (= 2 0)) 0)
 (test-prog '((lambda (x) ((lambda (y) (+ x y)) 42)) 100) 142)
 
 (test-prog '(* 10 5) 50)
@@ -77,7 +96,28 @@
 (test-prog '((lambda (f) (f 3 3)) (lambda (x y) (bool->int (= x y)))) 1)
 (test-prog '(bool->int ((lambda (f) (! (f 2 3))) =)) 1)
 
-					; recursion (hangs at typechecking)
-(test-prog '(let [(fac (lambda (f n x) (if (= n 0) x (f f (- n 1) (* x x)))))]
-	      (fac fac 3 2))
+					; recursion
+(test-prog '(let [(inc (lambda (f n x)
+			 (if (= n 0)
+			     x
+			     (f f (- n 1) (+ x 1)))))]
+	      (inc inc 3 2))
+	   5)
+
+(test-prog '(let ([go (lambda (n m x)
+			(if (= n 0)
+			     x
+			     (go (- n 1) m (* x m))))]
+		  [pow (lambda (p y) (go p y 1))])
+		     
+	      (pow 3 2))
 	   8)
+
+(test-prog '(let ([pow (lambda (p y)
+			 (let ([go (lambda (n x)
+				     (if (= n 0)
+					 x
+					 (go (- n 1) (* x y))))])
+			   (go p 1)))])
+	      (pow 4 2))
+	   16)