mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
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.
This commit is contained in:
parent
67e2d80a6a
commit
5f1611640a
16 changed files with 7422 additions and 7126 deletions
|
@ -848,11 +848,8 @@ scm_closure (SCM code, SCM env)
|
|||
}
|
||||
|
||||
|
||||
SCM_DEFINE (scm_primitive_eval, "primitive-eval", 1, 0, 0,
|
||||
(SCM exp),
|
||||
"Evaluate @var{exp} in the top-level environment specified by\n"
|
||||
"the current module.")
|
||||
#define FUNC_NAME s_scm_primitive_eval
|
||||
static SCM
|
||||
scm_c_primitive_eval (SCM exp)
|
||||
{
|
||||
SCM transformer = scm_current_module_transformer ();
|
||||
if (scm_is_true (transformer))
|
||||
|
@ -860,7 +857,14 @@ SCM_DEFINE (scm_primitive_eval, "primitive-eval", 1, 0, 0,
|
|||
exp = scm_memoize_expression (exp);
|
||||
return eval (exp, SCM_EOL);
|
||||
}
|
||||
#undef FUNC_NAME
|
||||
|
||||
static SCM var_primitive_eval;
|
||||
SCM
|
||||
scm_primitive_eval (SCM exp)
|
||||
{
|
||||
return scm_c_vm_run (scm_the_vm (), scm_variable_ref (var_primitive_eval),
|
||||
&exp, 1);
|
||||
}
|
||||
|
||||
|
||||
/* Eval does not take the second arg optionally. This is intentional
|
||||
|
@ -928,6 +932,8 @@ scm_apply (SCM proc, SCM arg1, SCM args)
|
|||
void
|
||||
scm_init_eval ()
|
||||
{
|
||||
SCM primitive_eval;
|
||||
|
||||
scm_init_opts (scm_evaluator_traps,
|
||||
scm_evaluator_trap_table);
|
||||
scm_init_opts (scm_eval_options_interface,
|
||||
|
@ -938,6 +944,11 @@ scm_init_eval ()
|
|||
f_apply = scm_c_define_subr ("apply", scm_tc7_lsubr_2, scm_apply);
|
||||
scm_permanent_object (f_apply);
|
||||
|
||||
primitive_eval = scm_c_make_gsubr ("primitive-eval", 1, 0, 0,
|
||||
scm_c_primitive_eval);
|
||||
var_primitive_eval = scm_define (SCM_SUBR_NAME (primitive_eval),
|
||||
primitive_eval);
|
||||
|
||||
#include "libguile/eval.x"
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue