Move expanding pattern matches to its own transformations

[scheme.git] / typecheck.scm

diff --git a/typecheck.scm b/typecheck.scm
index 35e818866df9603a3ecaa4cc721b548035d26abc..a526620e7139665fd72273394914462419cb45d0 100644 (file)
--- a/typecheck.scm
+++ b/typecheck.scm
@@ -259,7 +259,8 @@
 
                                        ; we typecheck the lambda calculus only (only single arg lambdas)
 (define (typecheck prog)
-  (cadr (check (init-adts-env prog) (normalize (program-body prog)))))
+  (let ([expanded (program-map-exprs expand-pattern-matches prog)])
+    (cadr (check (init-adts-env expanded) (normalize (program-body expanded))))))
 
 
                                        ; before passing annotated types onto codegen
@@ -309,8 +310,11 @@
 
 (define ann-expr car)
 (define ann-type caddr)
+
+                                       ; prerequisites: expand-pattern-matches
 (define (annotate-types prog)
-  (denormalize (program-body prog)
+  (denormalize
+   (program-body prog)
    (caddr (check (init-adts-env prog)(normalize (program-body prog))))))