summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2012-10-10 13:13:19 -0400
committerMark H Weaver <mhw@netris.org>2012-10-10 13:13:19 -0400
commit8b22ced1c9dee2743eedb5658172e931a42e8453 (patch)
tree512ef4d11db068e2b1cfbdd0885c43b89a6b602e
parent3e3d32dd9b2d71ffb0703dedc4d47387e981c9b5 (diff)
downloadguile-8b22ced1c9dee2743eedb5658172e931a42e8453.tar.gz
Revert "Preserve keyword identifier in 'syntax-rules' and 'define-syntax-rule'"
This reverts commit 3e3d32dd9b2d71ffb0703dedc4d47387e981c9b5.
-rw-r--r--module/ice-9/psyntax-pp.scm24
-rw-r--r--module/ice-9/psyntax.scm8
2 files changed, 16 insertions, 16 deletions
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index b148c9ade..68d1bf6eb 100644
--- a/module/ice-9/psyntax-pp.scm
+++ b/module/ice-9/psyntax-pp.scm
@@ -2551,13 +2551,12 @@
(cons '#(syntax-object syntax-case ((top)) (hygiene guile))
(cons '#(syntax-object x ((top)) (hygiene guile))
(cons k
- (map (lambda (tmp-2 tmp-1 tmp)
- (list (cons tmp tmp-1)
+ (map (lambda (tmp-1 tmp)
+ (list (cons '#(syntax-object dummy ((top)) (hygiene guile)) tmp)
(list '#(syntax-object syntax ((top)) (hygiene guile))
- tmp-2)))
+ tmp-1)))
template
- pattern
- keyword))))))
+ pattern))))))
tmp)
(let ((tmp ($sc-dispatch tmp-1 '(_ each-any any . #(each ((any . any) any))))))
(if (if tmp
@@ -2577,13 +2576,12 @@
(cons '#(syntax-object syntax-case ((top)) (hygiene guile))
(cons '#(syntax-object x ((top)) (hygiene guile))
(cons k
- (map (lambda (tmp-2 tmp-1 tmp)
- (list (cons tmp tmp-1)
+ (map (lambda (tmp-1 tmp)
+ (list (cons '#(syntax-object dummy ((top)) (hygiene guile)) tmp)
(list '#(syntax-object syntax ((top)) (hygiene guile))
- tmp-2)))
+ tmp-1)))
template
- pattern
- keyword))))))
+ pattern))))))
tmp)
(syntax-violation
#f
@@ -2603,7 +2601,8 @@
name
(list '#(syntax-object syntax-rules ((top)) (hygiene guile))
'()
- (list (cons name pattern) template))))
+ (list (cons '#(syntax-object _ ((top)) (hygiene guile)) pattern)
+ template))))
tmp)
(let ((tmp ($sc-dispatch tmp-1 '(_ (any . any) any any))))
(if (if tmp
@@ -2617,7 +2616,8 @@
(list '#(syntax-object syntax-rules ((top)) (hygiene guile))
'()
docstring
- (list (cons name pattern) template))))
+ (list (cons '#(syntax-object _ ((top)) (hygiene guile)) pattern)
+ template))))
tmp)
(syntax-violation
#f
diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm
index dc32f5a92..6c264a6df 100644
--- a/module/ice-9/psyntax.scm
+++ b/module/ice-9/psyntax.scm
@@ -2789,7 +2789,7 @@
#((macro-type . syntax-rules)
(patterns pattern ...))
(syntax-case x (k ...)
- ((keyword . pattern) #'template)
+ ((dummy . pattern) #'template)
...)))
((_ (k ...) docstring ((keyword . pattern) template) ...)
(string? (syntax->datum #'docstring))
@@ -2799,7 +2799,7 @@
#((macro-type . syntax-rules)
(patterns pattern ...))
(syntax-case x (k ...)
- ((keyword . pattern) #'template)
+ ((dummy . pattern) #'template)
...))))))
(define-syntax define-syntax-rule
@@ -2808,13 +2808,13 @@
((_ (name . pattern) template)
#'(define-syntax name
(syntax-rules ()
- ((name . pattern) template))))
+ ((_ . pattern) template))))
((_ (name . pattern) docstring template)
(string? (syntax->datum #'docstring))
#'(define-syntax name
(syntax-rules ()
docstring
- ((name . pattern) template)))))))
+ ((_ . pattern) template)))))))
(define-syntax let*
(lambda (x)