X-Git-Url: https://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=ast.scm;h=9af36531e7ef38bb1affc652eb09c5afa46a3dcc;hp=6b546ac6f4214a2a9891e10da74ea8df7b5c1ed0;hb=86531822ef58c5b29751976f5b41d1c631bdd459;hpb=190fc656a7b4e12e6fcf640c56e6ff71b5a39e40

diff --git a/ast.scm b/ast.scm
index 6b546ac..9af3653 100644
--- a/ast.scm
+++ b/ast.scm
@@ -118,18 +118,19 @@
      ,@(filter (lambda (x) (eqv? (statement-type x) 'expr))
 	       program)))
 
-
-
-					; 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)
@@ -137,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)])
@@ -146,7 +147,7 @@
        (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
@@ -156,7 +157,7 @@
      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)