[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-36-g8b22ced

[Mark H Weaver]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=8b22ced1c9dee2743eedb5658172e931a42e8453

The branch, stable-2.0 has been updated
       via  8b22ced1c9dee2743eedb5658172e931a42e8453 (commit)
      from  3e3d32dd9b2d71ffb0703dedc4d47387e981c9b5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8b22ced1c9dee2743eedb5658172e931a42e8453
Author: Mark H Weaver <address@hidden>
Date:   Wed Oct 10 13:13:19 2012 -0400

    Revert "Preserve keyword identifier in 'syntax-rules' and 
'define-syntax-rule'"
    
    This reverts commit 3e3d32dd9b2d71ffb0703dedc4d47387e981c9b5.

-----------------------------------------------------------------------

Summary of changes:
 module/ice-9/psyntax-pp.scm |   24 ++++++++++++------------
 module/ice-9/psyntax.scm    |    8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm
index b148c9a..68d1bf6 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 dc32f5a..6c264a6 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)


hooks/post-receive
-- 
GNU Guile