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

diff --git a/tests.scm b/tests.scm
index 168cf66..531efe2 100644
--- a/tests.scm
+++ b/tests.scm
@@ -1,12 +1,15 @@
 (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 (test-types . xs) (apply test-f (cons types-equal? xs)))
+
 (define (read-file file)
   (call-with-input-file file
     (lambda (p)
@@ -19,20 +22,34 @@
 (define (test-prog prog exit-code)
   (display prog)
   (newline)
-  (compile-to-binary prog "/tmp/test-prog")
+  (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")
+  (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-prog '(+ 1 2) 3)
 (test-prog '((lambda (x) ((lambda (y) (+ x y)) 42)) 100) 142)
 
@@ -51,3 +68,16 @@
 
 					; 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 (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))
+	   8)