mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-10 14:00:21 +02:00
Preserve keyword identifier in 'syntax-rules' and 'define-syntax-rule'
* module/ice-9/psyntax-pp.scm (syntax-rule, define-syntax-rule): Preserve the keyword identifier. * module/ice-9/psyntax-pp.scm: Regenerate.
This commit is contained in:
parent
75a5de18a0
commit
3e3d32dd9b
2 changed files with 16 additions and 16 deletions
|
@ -2551,12 +2551,13 @@
|
|||
(cons '#(syntax-object syntax-case ((top)) (hygiene guile))
|
||||
(cons '#(syntax-object x ((top)) (hygiene guile))
|
||||
(cons k
|
||||
(map (lambda (tmp-1 tmp)
|
||||
(list (cons '#(syntax-object dummy ((top)) (hygiene guile)) tmp)
|
||||
(map (lambda (tmp-2 tmp-1 tmp)
|
||||
(list (cons tmp tmp-1)
|
||||
(list '#(syntax-object syntax ((top)) (hygiene guile))
|
||||
tmp-1)))
|
||||
tmp-2)))
|
||||
template
|
||||
pattern))))))
|
||||
pattern
|
||||
keyword))))))
|
||||
tmp)
|
||||
(let ((tmp ($sc-dispatch tmp-1 '(_ each-any any . #(each ((any . any) any))))))
|
||||
(if (if tmp
|
||||
|
@ -2576,12 +2577,13 @@
|
|||
(cons '#(syntax-object syntax-case ((top)) (hygiene guile))
|
||||
(cons '#(syntax-object x ((top)) (hygiene guile))
|
||||
(cons k
|
||||
(map (lambda (tmp-1 tmp)
|
||||
(list (cons '#(syntax-object dummy ((top)) (hygiene guile)) tmp)
|
||||
(map (lambda (tmp-2 tmp-1 tmp)
|
||||
(list (cons tmp tmp-1)
|
||||
(list '#(syntax-object syntax ((top)) (hygiene guile))
|
||||
tmp-1)))
|
||||
tmp-2)))
|
||||
template
|
||||
pattern))))))
|
||||
pattern
|
||||
keyword))))))
|
||||
tmp)
|
||||
(syntax-violation
|
||||
#f
|
||||
|
@ -2601,8 +2603,7 @@
|
|||
name
|
||||
(list '#(syntax-object syntax-rules ((top)) (hygiene guile))
|
||||
'()
|
||||
(list (cons '#(syntax-object _ ((top)) (hygiene guile)) pattern)
|
||||
template))))
|
||||
(list (cons name pattern) template))))
|
||||
tmp)
|
||||
(let ((tmp ($sc-dispatch tmp-1 '(_ (any . any) any any))))
|
||||
(if (if tmp
|
||||
|
@ -2616,8 +2617,7 @@
|
|||
(list '#(syntax-object syntax-rules ((top)) (hygiene guile))
|
||||
'()
|
||||
docstring
|
||||
(list (cons '#(syntax-object _ ((top)) (hygiene guile)) pattern)
|
||||
template))))
|
||||
(list (cons name pattern) template))))
|
||||
tmp)
|
||||
(syntax-violation
|
||||
#f
|
||||
|
|
|
@ -2789,7 +2789,7 @@
|
|||
#((macro-type . syntax-rules)
|
||||
(patterns pattern ...))
|
||||
(syntax-case x (k ...)
|
||||
((dummy . pattern) #'template)
|
||||
((keyword . 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 ...)
|
||||
((dummy . pattern) #'template)
|
||||
((keyword . pattern) #'template)
|
||||
...))))))
|
||||
|
||||
(define-syntax define-syntax-rule
|
||||
|
@ -2808,13 +2808,13 @@
|
|||
((_ (name . pattern) template)
|
||||
#'(define-syntax name
|
||||
(syntax-rules ()
|
||||
((_ . pattern) template))))
|
||||
((name . pattern) template))))
|
||||
((_ (name . pattern) docstring template)
|
||||
(string? (syntax->datum #'docstring))
|
||||
#'(define-syntax name
|
||||
(syntax-rules ()
|
||||
docstring
|
||||
((_ . pattern) template)))))))
|
||||
((name . pattern) template)))))))
|
||||
|
||||
(define-syntax let*
|
||||
(lambda (x)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue