diff options
author | Andy Wingo <wingo@pobox.com> | 2009-12-01 23:54:25 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-03 00:00:38 +0100 |
commit | 5f1611640ad6a2e3af74f97c0bc4bed230130bb6 (patch) | |
tree | 02c49643062c49241b4dcf654596330025319f6d /libguile/modules.c | |
parent | 67e2d80a6a97b51aefea701cf10112102b09b392 (diff) | |
download | guile-5f1611640ad6a2e3af74f97c0bc4bed230130bb6.tar.gz |
really boot primitive-eval from scheme.
* libguile/eval.c (scm_primitive_eval, scm_c_primitive_eval):
(scm_init_eval): Rework so that scm_primitive_eval always calls out to
the primitive-eval variable. The previous definition is the default
value, which is probably overridden by scm_init_eval_in_scheme.
* libguile/init.c (scm_i_init_guile): Move ports and load-path up, so we
can debug when initing eval. Call scm_init_eval_in_scheme. Awesome.
* libguile/load.h:
* libguile/load.c (scm_init_eval_in_scheme): New procedure, loads up
ice-9/eval.scm to replace the primitive-eval definition, if everything
is there and up-to-date.
* libguile/modules.c (scm_module_transformer): Export to Scheme, so it's
there for eval.go.
* module/ice-9/boot-9.scm: No need to define module-transformer.
* module/ice-9/eval.scm (capture-env): Only reference the-root-module if
modules are booted.
(primitive-eval): Inline a definition for identity. Throw a more
standard error for "wrong number of arguments".
* module/ice-9/psyntax.scm (chi-install-global): The macro binding for a
syncase macro is now a pair: the transformer, and the module that was
current when the transformer was installed. The latter is used for
hygiene purposes, replacing the use of procedure-module, which didn't
work with the interpreter's shared-code closures.
(chi-macro): Adapt for the binding being a pair, and get the hygiene
from the cdr.
(eval-local-transformer): Adapt to new form of macro bindings.
* module/ice-9/psyntax-pp.scm: Regenerated.
* .gitignore: Ignore eval.go.stamp.
* module/Makefile.am: Reorder for fastest serial compilation, now that
there are no ordering constraints. I did a number of experiments here
and this seems to be the best; but the bulk of the time is compiling
psyntax-pp.scm with eval.scm. Not so great.
* libguile/vm-engine.c (vm-engine): Throw a more standard error for
"wrong type to apply".
* test-suite/tests/gc.test ("gc"): Remove a hack that shouldn't affect
the new evaluator, and throw in another (gc) for good measure.
* test-suite/tests/goops.test ("defining classes"):
* test-suite/tests/hooks.test (proc1): We can't currently check what the
arity is of a closure made by eval.scm -- or more accurately all
closures have 0 required args and no rest args. So punt for now.
* test-suite/tests/syntax.test ("letrec"): The scheme evaluator can't
check that a variable is unbound, currently; perhaps the full "fixing
letrec" expansion could fix this. But barring that, punt.
Diffstat (limited to 'libguile/modules.c')
-rw-r--r-- | libguile/modules.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libguile/modules.c b/libguile/modules.c index e653571bb..c48c2e8a0 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -561,8 +561,10 @@ scm_current_module_lookup_closure () SCM_SYMBOL (sym_sys_pre_modules_transformer, "%pre-modules-transformer"); -SCM -scm_module_transformer (SCM module) +SCM_DEFINE (scm_module_transformer, "module-transformer", 1, 0, 0, + (SCM module), + "Returns the syntax expander for the given module.") +#define FUNC_NAME s_scm_module_transformer { if (SCM_UNLIKELY (scm_is_false (module))) { SCM v = scm_hashq_ref (scm_pre_modules_obarray, @@ -574,8 +576,12 @@ scm_module_transformer (SCM module) return SCM_VARIABLE_REF (v); } else - return SCM_MODULE_TRANSFORMER (module); + { + SCM_VALIDATE_MODULE (SCM_ARG1, module); + return SCM_MODULE_TRANSFORMER (module); + } } +#undef FUNC_NAME SCM scm_current_module_transformer () |