mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 04:10:18 +02:00
8e1d0d507a
* 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.
27 lines
851 B
Scheme
27 lines
851 B
Scheme
(use-modules (ice-9 syncase))
|
|
|
|
;; XXX - We need to be inside (ice-9 syncase) since psyntax.ss calls
|
|
;; `eval' int he `interaction-environment' aka the current module and
|
|
;; it expects to have `andmap' there. The reason for this escapes me
|
|
;; at the moment.
|
|
;;
|
|
(define-module (ice-9 syncase))
|
|
|
|
(define source (list-ref (command-line) 1))
|
|
(define target (list-ref (command-line) 2))
|
|
|
|
(let ((in (open-input-file source))
|
|
(out (open-output-file (string-append target ".tmp"))))
|
|
(let loop ((x (read in)))
|
|
(if (eof-object? x)
|
|
(begin
|
|
(close-port out)
|
|
(close-port in))
|
|
(begin
|
|
(write (strip-expansion-structures
|
|
(sc-expand3 x 'c '(compile load eval)))
|
|
out)
|
|
(newline out)
|
|
(loop (read in))))))
|
|
|
|
(system (format #f "mv -f ~s.tmp ~s" target target))
|