WIP on typechecker refactor

[scheme.git] / tests.scm

diff --git a/tests.scm b/tests.scm
index 65b99d9c5a3574e331228c21933528d1a3490e76..15e14eae419698fa141c23cfc7f4844bf1b7de92 100644 (file)
--- a/tests.scm
+++ b/tests.scm
@@ -8,7 +8,14 @@
                   expected actual))))
 
 (define (test . xs) (apply test-f (cons equal? xs)))
-(define (test-types . xs) (apply test-f (cons types-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
@@ -22,13 +29,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)))
@@ -38,7 +45,7 @@
 
                                        ; recursive types
 
-(test-types (substitute '((t1 (abs t1 t10))) 't1) '(abs t1 t10))
+(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)))])
@@ -50,7 +57,43 @@
                    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)
@@ -77,7 +120,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)