X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=15e14eae419698fa141c23cfc7f4844bf1b7de92;hp=89ca852986f7e921f7a54e1153edc9be0be2f33c;hb=9d93b066cfd6505849dff12146159bedeadf96b9;hpb=5d4aafc1235538212989893f15006acc5d7d8f03

diff --git a/tests.scm b/tests.scm
index 89ca852..15e14ea 100644
--- a/tests.scm
+++ b/tests.scm
@@ -1,12 +1,22 @@
 (load "codegen.scm")
 (load "typecheck.scm")
 
-(define (test actual expected)
-  (when (not (equal? actual expected))
+(define (test-f pred actual expected)
+  (when (not (pred actual expected))
     (error #f
 	   (format "test failed:\nexpected: ~a\nactual:   ~a"
 		   expected actual))))
 
+(define (test . xs) (apply test-f (cons equal? xs)))
+
+(define-syntax test-types
+  (syntax-rules ()
+    ((_ a e)
+     (begin
+       (display (quote a))
+       (newline)
+       (test-f types-equal? a e)))))
+
 (define (read-file file)
   (call-with-input-file file
     (lambda (p)
@@ -19,21 +29,71 @@
 (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)))
 
-(test (typecheck '(lambda (x) (+ ((lambda (y) (x y 3)) 5) 2)))
+(test-types (typecheck '(lambda (x) (+ ((lambda (y) (x y 3)) 5) 2)))
 	    '(abs (abs int (abs int int)) int))
 
+					; recursive types
+
+(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))
+	    '(abs bool a))
+
+(test-types (typecheck '(let ([bar (lambda (y) y)]
+			      [foo (lambda (x) (foo (bar #t)))])
+		    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)
+
+					; mutual recursion
+(test-types (typecheck '(let ([f (lambda (n) (if (= n 0)
+						 0
+						 (+ 1 (g (- n 1)))))]
+			      [g (lambda (m) (f m))])
+			  (f 10)))
+	    'int)
+
+(test-types (typecheck '(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)))
+	    '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)
@@ -51,3 +111,37 @@
 
 					; passing closures about
 (test-prog '((lambda (z) ((lambda (x) (x 1)) (lambda (y) (+ z y)))) 2) 3)
+
+					; passing builtins about
+(test-prog '((lambda (x) ((lambda (a b) (a b 3)) + x)) 3) 6)
+(test-prog '(bool->int ((lambda (x) (x #f)) !)) 1)
+(test-prog '((lambda (f) (f #t)) bool->int) 1)
+(test-prog-stdout '(let () ((lambda (f) (f "foo")) print) 0) "foo")
+(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
+(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)