Merge pull request #99 from gavwhela/syntax-error-call-fix

case and exclusive-cond syntax-error calls
cisco · Aug 22, 2016 · 2004f91 · 2004f91
2 parents 99b763e + 17a5c5d
commit 2004f91
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/LOG b/LOG
@@ -296,3 +296,6 @@
   can be overridden, as we do in our own make files.
     cafe.ss,
     7.ms
+- fixed a bug in case and exclusive-cond syntax-error calls causing an
+  exception in syntax-error instead of the intended error message.
+    s/syntax.ss
diff --git a/s/syntax.ss b/s/syntax.ss
@@ -7243,7 +7243,7 @@
             #;[(e0) (make-clause clause #'e0)]
             [(e0 => e1) (make-clause clause #'e1)]
             [(e0 e1 e2 ...) (make-clause clause #'e1)]
-            [_ (syntax-error "invalid exclusive-cond clause" clause)]))
+            [_ (syntax-error clause "invalid exclusive-cond clause")]))
         (define (sort-em clause*)
           (if sort?
               (sort (lambda (cl1 cl2) (> (clause-weight cl1) (clause-weight cl2)))
@@ -7530,7 +7530,7 @@
             (syntax-case clause ()
               [((k ...) e1 e2 ...) (make-clause #'(k ...) #'(e1 e2 ...))]
               [(k e1 e2 ...) (make-clause #'(k) #'(e1 e2 ...))]
-              [_ (syntax-error "invalid case clause" clause)])))
+              [_ (syntax-error clause "invalid case clause")])))
         (define emit
           (lambda (kcond clause*)
             #`(let ([t #,key-expr])