1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-12 00:30:20 +02:00

Fix @ and @@ to not capture lexicals; new @@ @@ form for R6RS libraries

* module/ice-9/psyntax.scm (@): Return top-wrap instead of the wrap
  applied to the '@' form, so that the symbol will be interpreted as a
  top-level identifier and never refer to any lexical variable.

  (@@): Change the syntax used to support R6RS 'library' forms to:
  (@@ @@ (mod ...) body).  Change the behavior of the documented
  (@@ (mod ...) id) form to be the same as that of @, except for the use
  of 'private' instead of 'public' in the psyntax mod: use syntax->datum
  on the identifier, and return top-wrap instead of the wrap applied to
  the '@@' form.

  This fixes <http://bugs.gnu.org/10756> reported by Ludovic Courtès.

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

* module/ice-9/r6rs-libraries.scm (library): Use '@@ @@' syntax instead
  of the older '@@' syntax.

* test-suite/tests/syncase.test (changes to expansion environment): Use
  '@@ @@' syntax.

* module/Makefile.am: Add explicit dependencies for boot-9.go on the
  files that it includes: quasisyntax.scm and r6rs-libraries.scm.
This commit is contained in:
Mark H Weaver 2012-03-08 01:24:25 -05:00 committed by Andy Wingo
parent 5f8d67ad09
commit 8210c8538a
5 changed files with 53 additions and 22 deletions

View file

@ -115,16 +115,16 @@
'foo)))
(with-test-prefix "changes to expansion environment"
(pass-if "expander detects changes to current-module with @@"
(pass-if "expander detects changes to current-module with @@ @@"
(compile '(begin
(define-module (new-module))
(@@ (new-module)
(define-syntax new-module-macro
(lambda (stx)
(syntax-case stx ()
((_ arg) (syntax arg))))))
(@@ (new-module)
(new-module-macro #t)))
(@@ @@ (new-module)
(define-syntax new-module-macro
(lambda (stx)
(syntax-case stx ()
((_ arg) (syntax arg))))))
(@@ @@ (new-module)
(new-module-macro #t)))
#:env (current-module))))
(define-module (test-suite test-syncase-2)