Forgot to pushed closed spec.

Author: dvanhorn

langs/neerdowell/ast.rkt

@@ -55,6 +55,7 @@
 ;;            | (PAnd Pat Pat)
 ;;            | (PSymb Symbol)
 ;;            | (PStr String)
+;;            | (PStruct Id (Listof Pat))
 ;; type Lit   = Boolean
 ;;            | Character
 ;;            | Integer

langs/neerdowell/compile-expr.rkt

@@ -310,4 +310,42 @@
                    (Label fail)
                    (Add rsp (* 8 (length cm))) ; haven't pushed anything yet
                    (Jmp next))
-              cm2))])])]))
+              cm2))])])]
+    [(PStruct n ps)
+     (match (compile-struct-patterns ps (cons #f cm) next 1)
+       [(list i f cm)
+        (let ((fail (gensym)))
+          (list
+           (seq (Mov r8 rax)
+                (And r8 ptr-mask)
+                (Cmp r8 type-struct)
+                (Jne fail)
+                (Xor rax type-struct)
+                (Mov r8 (Offset rax 0))
+                (Lea r9 (Plus (symbol->data-label n) type-symb))
+                (Cmp r8 r9)
+                (Jne fail)
+                (Push rax)
+                i)
+           (seq f
+                (Label fail)
+                (Add rsp (* 8 (length cm)))
+                (Jmp next))
+           cm))])]))
+
+;; [Listof Pat] CEnv Symbol Nat -> (list Asm Asm CEnv)
+(define (compile-struct-patterns ps cm next i)
+  (match ps
+    ['() (list '() '() cm)]
+    [(cons p ps)
+     (match (compile-pattern p cm next)
+       [(list i1 f1 cm1)
+        (match (compile-struct-patterns ps cm1 next (add1 i))
+          [(list is fs cmn)
+           (list
+            (seq (Mov rax (Offset rax (* 8 i)))
+                 i1
+                 (Mov rax (Offset rsp (* 8 (sub1 (length cm1)))))
+                 is)
+            (seq f1 fs)
+            cmn)])])]))

langs/neerdowell/fv.rkt

@@ -30,4 +30,5 @@
     [(PCons p1 p2) (append (bv-pat* p1) (bv-pat* p2))]
     [(PAnd p1 p2) (append (bv-pat* p1) (bv-pat* p2))]
     [(PBox p) (bv-pat* p)]
+    [(PStruct n ps) (append-map bv-pat* ps)]
     [_ '()]))

langs/neerdowell/parse.rkt

@@ -126,7 +126,9 @@
      (PLit '())]
     [(cons 'list (cons p1 ps))
      (PCons (parse-pat p1)
-            (parse-pat (cons 'list ps)))]))    
+            (parse-pat (cons 'list ps)))]
+    [(cons (? symbol? n) ps)
+     (PStruct n (map parse-pat ps))]))
 
 (define (self-quoting? x)
   (or (integer? x)

www/assignments/6.scrbl

@@ -50,6 +50,9 @@ Here are the properties that should be checked of each program:
 
 @itemlist[
 
+@item{Programs are @emph{closed}; there are no unbound variables in
+the program.}
+
 @item{Every @racket[define]d function should have a distinct name.}
 
 @item{Every function parameter should be distinct from the other