Merge pull request #105 from cmsc430/outlaw

Fix interp-env* bug when later args error.

Author: dvanhorn

langs/iniquity-gc/interp.rkt

@@ -93,7 +93,9 @@
     [(cons e es)
      (match (interp-env e r ds)
        ['err 'err]
-       [v (cons v (interp-env* es r ds))])]))
+       [v (match (interp-env* es r ds)
+            ['err 'err]
+            [vs (cons v vs)])])]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

langs/iniquity-gc/test/test-runner.rkt

@@ -179,7 +179,10 @@
                         (cons (add1 (car xs))
                               (map-add1 (cdr xs)))))
                  '(map-add1 (cons 1 (cons 2 (cons 3 '())))))
-                '(2 3 4))  
+                '(2 3 4))
+  (check-equal? (run '(define (f x y) y)
+                     '(f 1 (add1 #f)))
+                'err)
 
   (check-equal? (run '(collect-garbage)) (void))
   (check-equal? (run '(begin (box 0) (collect-garbage))) (void))

langs/iniquity/interp.rkt

@@ -91,7 +91,9 @@
     [(cons e es)
      (match (interp-env e r ds)
        ['err 'err]
-       [v (cons v (interp-env* es r ds))])]))
+       [v (match (interp-env* es r ds)
+            ['err 'err]
+            [vs (cons v vs)])])]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

langs/iniquity/test/test-runner.rkt

@@ -179,7 +179,10 @@
                         (cons (add1 (car xs))
                               (map-add1 (cdr xs)))))
                  '(map-add1 (cons 1 (cons 2 (cons 3 '())))))
-                '(2 3 4)))
+                '(2 3 4))
+  (check-equal? (run '(define (f x y) y)
+                     '(f 1 (add1 #f)))
+                'err))
 
 (define (test-runner-io run)
   ;; Evildoer examples

langs/jig/interp.rkt

@@ -91,7 +91,9 @@
     [(cons e es)
      (match (interp-env e r ds)
        ['err 'err]
-       [v (cons v (interp-env* es r ds))])]))
+       [v (match (interp-env* es r ds)
+            ['err 'err]
+            [vs (cons v vs)])])]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

langs/jig/test/interp.rkt

@@ -0,0 +1,8 @@
+#lang racket
+(require "test-runner.rkt"
+         "../parse.rkt"
+         "../interp.rkt"
+         "../interp-io.rkt")
+
+(test-runner    (λ p (interp (parse p))))
+(test-runner-io (λ (s . p) (interp/io (parse p) s)))

langs/jig/test/test-runner.rkt

@@ -199,8 +199,10 @@
                  '(define (f x y)
                     10)
                  '(let ((z 2)) (f 1 2)))
-                10))
-
+                10)
+    (check-equal? (run '(define (f x y) y)
+                     '(f 1 (add1 #f)))
+                'err))
 
 (define (test-runner-io run)
   ;; Evildoer examples

langs/knock/interp.rkt

@@ -128,7 +128,9 @@
     [(cons e es)
      (match (interp-env e r ds)
        ['err 'err]
-       [v (cons v (interp-env* es r ds))])]))
+       [v (match (interp-env* es r ds)
+            ['err 'err]
+            [vs (cons v vs)])])]))
 
 ;; Defns Symbol -> Defn
 (define (defns-lookup ds f)

langs/knock/test/test-runner.rkt

@@ -200,6 +200,9 @@
                     10)
                  '(let ((z 2)) (f 1 2)))
                 10)
+  (check-equal? (run '(define (f x y) y)
+                     '(f 1 (add1 #f)))
+                'err)
 
   ;; Knock examples
   (check-equal? (run '(match 1)) 'err)

langs/loot/interp-defun.rkt

@@ -144,7 +144,9 @@
     [(cons e es)
      (match (interp-env e r ds)
        ['err 'err]
-       [v (cons v (interp-env* es r ds))])]))
+       [v (match (interp-env* es r ds)
+            ['err 'err]
+            [vs (cons v vs)])])]))
 
 ;; Defns Symbol -> [Maybe Defn]
 (define (defns-lookup ds f)