X-Git-Url: http://git.lukelau.me/?p=scheme.git;a=blobdiff_plain;f=ast.scm;h=5064ca554bc8033bdbc0b483ac79249cd3312f73;hp=1a4afe21f3258d829c4f305ea78fd2f804cca2ad;hb=844dcd052c6f551d9936693c2b4c49cf920c7051;hpb=25ef5a684dec5eedfc4e34a12b00a04e2d6b2b1b

diff --git a/ast.scm b/ast.scm
index 1a4afe2..5064ca5 100644
--- a/ast.scm
+++ b/ast.scm
@@ -73,9 +73,9 @@
 (define (let-bindings e)
   (define (pattern-match x body)
     (if (eqv? (ast-type x) 'var)
-	(cons x body)
+	(list (cons x body))
 	(let* ([constructor (car x)]
-	      [destructor (lambda (i) `(destruct ,i ,constructor))])
+	       [destructor (lambda (i) (dtor-name constructor i))])
 	  (flat-map (lambda (y i)
 		      (pattern-match y (list (destructor i) body)))
 		    (cdr x)
@@ -108,6 +108,48 @@
      ,@(filter (lambda (x) (eqv? (statement-type x) 'expr))
 	       program)))
 
+					; gets both constructors and destructors
+					; (data A (foo Int Bool)
+					;         (bar Bool))
+					;        |
+					;        v
+					; (foo . (abs Int (abs Bool A)))
+					; (foo~0 . (abs A Int)
+					; (foo~1 . (abs A Bool)
+					; (bar . (abs Bool A)
+					; (bar~0 . (abs A Bool)
+
+(define (data-tors data-def)
+  (define (constructor-type t products)
+    (fold-right (lambda (x acc) `(abs ,x ,acc)) t products))
+
+  (define (destructor ctor-name prod-type part-type index)
+    (let ([name (dtor-name ctor-name index)])
+      (cons name `(abs ,prod-type ,part-type))))
+  
+  (let ([type-name (cadr data-def)]
+        [ctors (cddr data-def)])
+    (fold-right
+     (lambda (ctor acc)       
+       (let* ([ctor-name (car ctor)]
+	      [products (cdr ctor)]
+	      
+	      [maker (cons ctor-name (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))))
+     '()
+     ctrs)))
+
+(define (dtor-name ctor-name index)
+  (string->symbol
+   (string-append (symbol->string ctor-name)
+		  "~"
+		  (number->string index))))
+
 ; for use in normalized form
 (define lambda-arg caadr)
 ; for use elsewhere