diff options
author | Andy Wingo <wingo@pobox.com> | 2009-03-30 22:06:35 -0700 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-04-17 15:20:17 +0200 |
commit | 8e1d0d507ac3400fb57fce4196cc8cbc91977135 (patch) | |
tree | 71226009aa5bcdcd2245dc1698059c5be1eeacbc /module/language/scheme | |
parent | daedb4920acdf6db31c375b4fdd142b002ddc77a (diff) | |
download | guile-8e1d0d507ac3400fb57fce4196cc8cbc91977135.tar.gz |
more work on modules and hygiene, not finished yet, alas.
* module/ice-9/compile-psyntax.scm: No more expansion-eval-closure.
* module/ice-9/expand-support.scm (strip-expansion-structures): Only @@
names whose module is not the current module. Actually @@ serialization
is disabled for this commit, just to get this one in and keep things
working.
* module/ice-9/psyntax-pp.scm: Recompiled.
* module/ice-9/psyntax.scm (put-global-definition-hook)
(get-global-definition-hook): Instead of going through that stupid
getprop/putprop interface, let's just inline Guile-specific code here.
(build-global-reference, build-global-assignment): Fix a bug where the
module and public? were switched, which happily allowed things to
compile. (We reintroduce a similar bug above in expand-support.)
(lookup): Add a module argument.
(global-extend): Adapt for put-global-definition-hook invocation.
(syntax-type): Lookup with mod. Return mod even for lexicals and
define-form -- why not.
(chi-top, fluid-let-syntax, syntax, set!): Lookup with mod. Wrap with
mod.
* module/ice-9/syncase.scm (expansion-eval-closure)
(current-eval-closure, env->eval-closure): OK! So the idea is: module
hygiene is syncase's business, not ours. So lose the eval-closure
fluid. Also, eval closures are so 1990s.
(sc-macro): But, we have to take the module from the env, sadly. In the
future this will be different.
Remove the rest of the eval-closure bits. Enable source reporting,
while we're debugging.
* module/language/scheme/compile-ghil.scm (lookup-transformer): Adapt for
eval closure fluid changes.
Diffstat (limited to 'module/language/scheme')
-rw-r--r-- | module/language/scheme/compile-ghil.scm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/module/language/scheme/compile-ghil.scm b/module/language/scheme/compile-ghil.scm index d622c277b..bd4fc2cfe 100644 --- a/module/language/scheme/compile-ghil.scm +++ b/module/language/scheme/compile-ghil.scm @@ -115,13 +115,11 @@ ((eq? val sc-macro) ;; syncase! - (let* ((eec (@@ (ice-9 syncase) expansion-eval-closure)) - (sc-expand3 (@@ (ice-9 syncase) sc-expand3))) + (let ((sc-expand3 (@@ (ice-9 syncase) sc-expand3))) (lambda (env loc exp) (retrans - (with-fluids ((eec (module-eval-closure mod))) - (strip-expansion-structures - (sc-expand3 exp 'c '(compile load eval)))))))) + (strip-expansion-structures + (sc-expand3 exp 'c '(compile load eval))))))) ((primitive-macro? val) (syntax-error #f "unhandled primitive macro" head)) |