X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=tests.scm;h=168cf6613d4559b6403c97af1a858e35405eed3f;hp=964b6443fec10001cb73798836c33a2b6a919e9c;hb=6684c39cf92a0fa6c21339c6fec8a6e4cf4f463d;hpb=e51b9e423665428c41cddac0642d1e34b18ca1da

diff --git a/tests.scm b/tests.scm
index 964b644..168cf66 100644
--- a/tests.scm
+++ b/tests.scm
@@ -16,21 +16,38 @@
             result
             (loop (read-char p) (string-append result (string next))))))))
 
-(define (test-prog prog output)
+(define (test-prog prog exit-code)
+  (display prog)
+  (newline)
+  (compile-to-binary prog "/tmp/test-prog")
+  (test (system "/tmp/test-prog") exit-code))
+
+(define (test-prog-stdout prog output)
+  (display prog)
+  (newline)
   (compile-to-binary prog "/tmp/test-prog")
   (system "/tmp/test-prog > /tmp/test-output.txt")
   (let ((str (read-file "/tmp/test-output.txt")))
-    (test (substring str 0 (- (string-length str) 1))
-	  output)))
+    (test str output)))
 
 (test (typecheck '(lambda (x) (+ ((lambda (y) (x y 3)) 5) 2)))
       '(abs (abs int (abs int int)) int))
 
-(test-prog '(+ 1 2) "3")
-(test-prog '((lambda (x) ((lambda (y) (+ x y)) 42)) 100) "142")
-; todo: support recursive let
+(test-prog '(+ 1 2) 3)
+(test-prog '((lambda (x) ((lambda (y) (+ x y)) 42)) 100) 142)
+
+(test-prog '(* 10 5) 50)
+
 (test-prog '(let ((x (+ 1 32))
 		  (y x))
-	      ((lambda (z) (+ 1 z)) (* y x)))
-	   "1090")
+	      ((lambda (z) (+ 2 z)) (* y x)))
+	   67) ; exit code modulos at 256
+(test-prog '(if ((lambda (x) (= x 2)) 1) 0 (- 32 1)) 31)
+
+(test-prog-stdout '(if (= 3 2) 1 (let () (print "hello world!") 0)) "hello world!")
+
+(test-prog '((lambda (x y) (+ x y)) 1 2) 3)
+(test-prog '((lambda (x) (+ ((lambda (y) (+ y 1)) 3) x)) 2) 6)
 
+					; passing closures about
+(test-prog '((lambda (z) ((lambda (x) (x 1)) (lambda (y) (+ z y)))) 2) 3)