ADT codegen working for simple types

[scheme.git] / ast.scm

diff --git a/ast.scm b/ast.scm
index 4ca6eb1e1dc57100a344310ea1494ea2139236e0..9af36531e7ef38bb1affc652eb09c5afa46a3dcc 100644 (file)
--- a/ast.scm
+++ b/ast.scm
@@ -17,6 +17,7 @@
       ('lambda 'lambda)      
       ('closure 'closure) ; only available in codegen
       ('static-string 'static-string) ; only available in codegen
+      ('stack 'stack) ; only available in codegen (tag that value is passed via stack)
       (else 'app)))
    ((builtin? x) 'builtin)
    ((symbol? x) 'var)
@@ -32,6 +33,7 @@
     ('app (map f x))
     ('lambda `(lambda ,(lambda-args x) ,(f (lambda-body x))))
     ('if `(if ,@(map f (cdr x))))
+    ('stack `(stack ,(cadr x) ,(map f (caddr x))))
     (else x)))
 
 (define (ast-collect f x)
@@ -46,7 +48,8 @@
                     (inner (lambda-body x)))]
     ['if (append (f x)
                 (flat-map inner (cdr x)))]
-    ['closure (flat-map inner (caddr x))]
+    ['stack (append (f x)
+                   (inner (caddr x)))]
     [else (f x)]))
 
 (define (ast-find p x)
@@ -69,6 +72,7 @@
     ['lambda (either (p x)
                     (inner (lambda-body x)))]
     ['if (either (p x) (any inner (cdr x)))]
+    ['stack (either (p x) (inner (caddr x)))]
     [else (p x)]))
 
 (define (let-bindings e)
@@ -96,9 +100,13 @@
         (eqv? (car x) 'define)) 'define]
    [else 'expr]))
 
-(define (program-datas program)
-  (filter (lambda (x) (eqv? (statement-type x) 'data))
-         program))
+
+                                       ; (A ((foo (Int Bool))
+                                       ;     (bar (Bool)))
+(define (program-data-layouts program)
+  (map (lambda (x) (cons (car x) (cdr x))) ; convert to assoc list
+       (map cdr (filter (lambda (x) (eqv? (statement-type x) 'data))
+                       program))))
 
 (define (program-defines program)
   (filter (lambda (x) (eqv? (statement-type x) 'defines))
@@ -110,22 +118,19 @@
      ,@(filter (lambda (x) (eqv? (statement-type x) 'expr))
               program)))
 
-
-                                       ; (A ((foo (Int Bool))
-                                       ;     (bar (Bool)))
-
-(define data-layout cdr)
-
-                                       ; gets both constructors and destructors
+                                       ; a data tor is either a constructor or destructor for an ADT
+                                       ; data-tors returns constructors and destructors for a data-layout
                                        ; (data A (foo Int Bool)
                                        ;         (bar Bool))
                                        ;        |
                                        ;        v
-                                       ; (foo . (constructor . (abs Int (abs Bool A))))
-                                       ; (foo~0 . (0 . (abs A Int)))
-                                       ; (foo~1 . (1 . (abs A Bool)))
-                                       ; (bar . (constructor . (abs Bool A)))
-                                       ; (bar~0 . (0 . (abs A Bool)))
+                                       ; (foo   . ((A foo constructor) . (abs Int (abs Bool A))))
+                                       ; (foo~0 . ((A foo 0)           . (abs A Int)))
+                                       ; (foo~1 . ((A foo 1)           . (abs A Bool)))
+                                       ; (bar   . ((A bar constructor) . (abs Bool A)))
+                                       ; (bar~0 . ((A bar 0)           . (abs A Bool)))
+                                       ;  ------+-------------------------------------
+                                       ;  tor   | info                 | type
 
 (define (data-tors data-layout)
   (define (constructor-type t products)
@@ -133,7 +138,7 @@
 
   (define (destructor ctor-name prod-type part-type index)
     (let ([name (dtor-name ctor-name index)])
-      (cons name (cons index `(abs ,prod-type ,part-type)))))
+      (cons name (cons (list prod-type ctor-name index) `(abs ,prod-type ,part-type)))))
   
   (let ([type-name (car data-layout)]
         [ctors (cdr data-layout)])
@@ -142,18 +147,17 @@
        (let* ([ctor-name (car ctor)]
              [products (cdr ctor)]
              
-             [maker (cons ctor-name (cons 'constructor (constructor-type type-name products)))]
+             [maker (cons ctor-name (cons (list type-name ctor-name 'constructor) (constructor-type type-name products)))]
              
              [dtors (map (lambda (t i) (destructor ctor-name type-name t i))
                          products
                          (range 0 (length products)))])
-        
         (cons maker (append dtors acc))))
      '()
      ctors)))
 
                                        ; creates a type environment for a given adt definition
-(define (data-tors-env data-layout)
+(define (data-tors-type-env data-layout)
   (map (lambda (x) (cons (car x) (cddr x))) (data-tors data-layout)))
 
 (define (dtor-name ctor-name index)