mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Fix bound-identifier=? to compare binding names, not just symbolic names.

Browse source 
Fixes <http://bugs.gnu.org/16158>.

* module/ice-9/psyntax.scm (bound-id=?): Use 'id-var-name' to compare
  binding names (gensyms), not just symbolic names.

* module/ice-9/psyntax-pp.scm: Regenerate.

* test-suite/tests/syntax.test: Add test.
This commit is contained in:
Mark H Weaver 2013-12-15 19:04:59 -05:00
parent 032a16fced
commit 70c74b8476
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
module/ice-9/psyntax-pp.scm
View file

@ -484,6 +484,7 @@
(lambda (i j) (lambda (i j)
(if (and (syntax-object? i) (syntax-object? j)) (if (and (syntax-object? i) (syntax-object? j))
(and (eq? (syntax-object-expression i) (syntax-object-expression j)) (and (eq? (syntax-object-expression i) (syntax-object-expression j))
(eq? (id-var-name i '(())) (id-var-name j '(())))
(same-marks? (same-marks?
(car (syntax-object-wrap i)) (car (syntax-object-wrap i))
(car (syntax-object-wrap j)))) (car (syntax-object-wrap j))))

1
module/ice-9/psyntax.scm
View file

@ -885,6 +885,7 @@
(if (and (syntax-object? i) (syntax-object? j)) (if (and (syntax-object? i) (syntax-object? j))
(and (eq? (syntax-object-expression i) (and (eq? (syntax-object-expression i)
(syntax-object-expression j)) (syntax-object-expression j))
(eq? (id-var-name i empty-wrap) (id-var-name j empty-wrap))
(same-marks? (wrap-marks (syntax-object-wrap i)) (same-marks? (wrap-marks (syntax-object-wrap i))
(wrap-marks (syntax-object-wrap j)))) (wrap-marks (syntax-object-wrap j))))
(eq? i j)))) (eq? i j))))

5
test-suite/tests/syntax.test
View file

@ -1172,6 +1172,11 @@
(r 'outer)) (r 'outer))
#t))) #t)))
(pass-if "bound-identifier=?"
(let* ((x 1) (s1 #'x)
(x 2) (s2 #'x))
(not (bound-identifier=? s1 s2))))
(with-test-prefix "syntax-case" (with-test-prefix "syntax-case"
(pass-if-syntax-error "duplicate pattern variable" (pass-if-syntax-error "duplicate pattern variable"