crook

Author: dvanhorn

iniquity/parse.rkt

@@ -35,7 +35,7 @@
   (define (rec ss fs)
     (match ss
       [(list s) fs]
-      [(cons (cons 'define sd) sr)
+      [(cons (cons (? (not-in fs) 'define) sd) sr)
        (match (parse-defn-name sd)
          [f (if (memq f fs)
                 (error "duplicate definition" f)

iniquity/test/parse.rkt

@@ -55,10 +55,18 @@
                 (Prog (list (Defn 'define '() (Lit 0)))
                       (App 'define '())))
   (check-exn exn:fail? (λ () (parse '(define (f y y) y) 1)))
+  (check-exn exn:fail? (λ () (parse '(define (f y) y) '(define (f x) x) 1)))
   (check-equal? (parse-closed '(define (f x) (g x))
                               '(define (g x) (f x))
                               '(f 0))
                 (Prog (list (Defn 'f '(x) (App 'g (list (Var 'x))))
                             (Defn 'g '(x) (App 'f (list (Var 'x)))))
-                      (App 'f (list (Lit 0))))))
+                      (App 'f (list (Lit 0)))))
+  (check-equal? (parse '(define (define x) x)
+                       '(define 1))
+                (Prog (list (Defn 'define '(x) (Var 'x)))
+                      (App 'define (list (Lit 1)))))
+  (check-exn exn:fail? (λ () (parse '(define (define x) x)
+                                    '(define (g x) x)
+                                    '(define (g 1))))))
 

jig/parse.rkt

@@ -35,7 +35,7 @@
   (define (rec ss fs)
     (match ss
       [(list s) fs]
-      [(cons (cons 'define sd) sr)
+      [(cons (cons (? (not-in fs) 'define) sd) sr)
        (match (parse-defn-name sd)
          [f (if (memq f fs)
                 (error "duplicate definition" f)

jig/test/parse.rkt

@@ -47,6 +47,7 @@
   (check-equal? (parse "asdf") (p (Lit "asdf")))
   (check-equal? (parse '(make-string 10 #\a))
                 (p (Prim2 'make-string (Lit 10) (Lit #\a)))))
+
 (begin ; Iniquity
   (check-equal? (parse '(define (f x) x) 1)
                 (Prog (list (Defn 'f '(x) (Var 'x))) (Lit 1)))

knock/parse.rkt

@@ -41,7 +41,7 @@
   (define (rec ss fs)
     (match ss
       [(list s) fs]
-      [(cons (cons 'define sd) sr)
+      [(cons (cons (? (not-in fs) 'define) sd) sr)
        (match (parse-defn-name sd)
          [f (if (memq f fs)
                 (error "duplicate definition" f)
@@ -126,14 +126,14 @@
                    (list ys gs (Let x e1 e2))])])]
             [_ (error "let: bad syntax" s)])]
          ['match
-           (match sr
-             [(cons s sr)
-              (match (rec s xs ys gs)
-                [(list ys gs e)
-                 (match (parse-match-clauses/acc sr fs xs ys gs)
-                   [(list ys gs ps es)
-                    (list ys gs (Match e ps es))])])]
-             [_ (error "match: bad syntax" s)])]
+          (match sr
+            [(cons s sr)
+             (match (rec s xs ys gs)
+               [(list ys gs e)
+                (match (parse-match-clauses/acc sr fs xs ys gs)
+                  [(list ys gs ps es)
+                   (list ys gs (Match e ps es))])])]
+            [_ (error "match: bad syntax" s)])]
          [_
           (match (parse-es/acc sr fs xs ys gs)
             [(list ys gs es)

knock/test/parse.rkt

@@ -47,6 +47,7 @@
   (check-equal? (parse "asdf") (p (Lit "asdf")))
   (check-equal? (parse '(make-string 10 #\a))
                 (p (Prim2 'make-string (Lit 10) (Lit #\a)))))
+
 (begin ; Iniquity
   (check-equal? (parse '(define (f x) x) 1)
                 (Prog (list (Defn 'f '(x) (Var 'x))) (Lit 1)))

loot/parse.rkt

@@ -41,7 +41,7 @@
   (define (rec ss fs)
     (match ss
       [(list s) fs]
-      [(cons (cons 'define sd) sr)
+      [(cons (cons (? (not-in fs) 'define) sd) sr)
        (match (parse-defn-name sd)
          [f (if (memq f fs)
                 (error "duplicate definition" f)
@@ -116,14 +116,14 @@
                    (list ys (Let x e1 e2))])])]
             [_ (error "let: bad syntax" s)])]
          ['match
-           (match sr
-             [(cons s sr)
-              (match (rec s xs ys)
-                [(list ys e)
-                 (match (parse-match-clauses/acc sr xs ys)
-                   [(list ys ps es)
-                    (list ys (Match e ps es))])])]
-             [_ (error "match: bad syntax" s)])]
+          (match sr
+            [(cons s sr)
+             (match (rec s xs ys)
+               [(list ys e)
+                (match (parse-match-clauses/acc sr xs ys)
+                  [(list ys ps es)
+                   (list ys (Match e ps es))])])]
+            [_ (error "match: bad syntax" s)])]
 
          [(or 'λ 'lambda)
           (match sr

loot/test/parse.rkt

@@ -47,6 +47,7 @@
   (check-equal? (parse "asdf") (p (Lit "asdf")))
   (check-equal? (parse '(make-string 10 #\a))
                 (p (Prim2 'make-string (Lit 10) (Lit #\a)))))
+
 (begin ; Iniquity
   (check-equal? (parse '(define (f x) x) 1)
                 (Prog (list (Defn 'f '(x) (Var 'x))) (Lit 1)))