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

diff --git a/tests.scm b/tests.scm
index 531efe2..c4b81f1 100644
--- a/tests.scm
+++ b/tests.scm
@@ -50,7 +50,26 @@
 		    bar))
 	    '(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)