WIP on typechecker refactor

[scheme.git] / tests.scm

diff --git a/tests.scm b/tests.scm
index c4b81f15158e4a7f63152edab863dc9c5e10988b..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
@@ -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)))])
@@ -68,6 +75,23 @@
                          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)