Merge pull request #13 from cmsc430/crook

crook

Author: dvanhorn

iniquity-plus/interp.rkt

@@ -71,16 +71,13 @@
               (apply-fun fun (append vs ws) ds)])
            (raise 'err)))]))
 
-;; (Listof Expr) REnv Defns -> (Listof Value) | 'err
+;; (Listof Expr) REnv Defns -> (Listof Value) { raises 'err }
 (define (interp-e* es r ds)
   (match es
     ['() '()]
     [(cons e es)
-     (match (interp-e e r ds)
-       ['err 'err]
-       [v (match (interp-e* es r ds)
-            ['err 'err]
-            [vs (cons v vs)])])]))
+     (cons (interp-e e r ds)
+           (interp-e* es r ds))]))
 
 ;; Fun [Listof Values] Defns -> Answer
 (define (apply-fun f vs ds)

knock-plus/interp.rkt

@@ -72,16 +72,13 @@
      (let ((v (interp-e e r ds)))
        (interp-match v ps es r ds))]))
 
-;; (Listof Expr) REnv Defns -> (Listof Value) | 'err
+;; (Listof Expr) REnv Defns -> (Listof Value) { raises 'err }
 (define (interp-e* es r ds)
   (match es
     ['() '()]
     [(cons e es)
-     (match (interp-e e r ds)
-       ['err 'err]
-       [v (match (interp-e* es r ds)
-            ['err 'err]
-            [vs (cons v vs)])])]))
+     (cons (interp-e e r ds)
+           (interp-e* es r ds))]))
 
 ;; Value [Listof Pat] [Listof Expr] Env Defns -> Answer
 (define (interp-match v ps es r ds)