Merge pull request #58 from cmsc430/main-crook

crook

Author: dvanhorn

iniquity/interp.rkt

@@ -66,16 +66,13 @@
                (interp-e e (zip xs vs) 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))]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

jig/interp.rkt

@@ -66,16 +66,13 @@
                (interp-e e (zip xs vs) 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))]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

knock/interp.rkt

@@ -70,16 +70,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)

loot/interp.rkt

@@ -75,16 +75,13 @@
            (interp-e e (append (zip xs vs) r) 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))]))
 
 ;; Id Env [Listof Defn] -> Answer
 (define (interp-var x r ds)