summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-05-07 10:51:28 +0200
committerAndy Wingo <wingo@pobox.com>2010-05-07 22:22:19 +0200
commit4f692ace90f2dc75b83aa9e10d9cd107d2ea924e (patch)
treef01b7c934fe781a95ac5d95f8257d78db35b8e11 /libguile
parentb79ba0b01e7dc89d2ba8da2c5cf4e200f4bb5de1 (diff)
downloadguile-4f692ace90f2dc75b83aa9e10d9cd107d2ea924e.tar.gz
macro expanders return memoized expressions
* libguile/eval.c (scm_c_primitive_eval): * module/ice-9/eval.scm (primitive-eval): Rely on the expander to produce a memoized expression. If the expression is already memoized, just pass it through (the equivalent of the old "noexpand" hack). * libguile/memoize.c (scm_init_memoize): Initialize `memoize-expression' as the initial binding of `macroexpand'. * libguile/modules.c (scm_module_transformer): Before modules are booted, look for `macroexpand', not `%pre-modules-transformer'. * module/ice-9/boot-9.scm: No more %pre-modules-transformer. Loading psyntax extends `macroexpand'. (make-module): `macroexpand' is the default transformer. * module/ice-9/psyntax.scm: No more `noexpand'. (top-level-eval-hook, local-eval-hook): Instead of annotating with noexpand, memoize the expression before handing it to primitive-eval. (macroexpand): No more noexpand hack -- in its place we have another hack, to memoize the result when running in eval mode. * module/ice-9/psyntax-pp.scm: Regenerated.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/eval.c10
-rw-r--r--libguile/memoize.c3
-rw-r--r--libguile/modules.c12
3 files changed, 15 insertions, 10 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index f775d31b1..f2cbebe64 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -844,10 +844,12 @@ scm_for_each (SCM proc, SCM arg1, SCM args)
static SCM
scm_c_primitive_eval (SCM exp)
{
- SCM transformer = scm_current_module_transformer ();
- if (scm_is_true (transformer))
- exp = scm_call_1 (transformer, exp);
- exp = scm_memoize_expression (exp);
+ if (!SCM_MEMOIZED_P (exp))
+ exp = scm_call_1 (scm_current_module_transformer (), exp);
+ if (!SCM_MEMOIZED_P (exp))
+ scm_misc_error ("primitive-eval",
+ "expander did not return a memoized expression",
+ scm_list_1 (exp));
return eval (exp, SCM_EOL);
}
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 0427cea76..aeb42a31c 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -1326,6 +1326,9 @@ scm_init_memoize ()
scm_set_smob_print (scm_tc16_memoized, scm_print_memoized);
#include "libguile/memoize.x"
+
+ scm_c_define ("macroexpand",
+ scm_variable_ref (scm_c_lookup ("memoize-expression")));
}
/*
diff --git a/libguile/modules.c b/libguile/modules.c
index ac15eaaac..a0c47f2db 100644
--- a/libguile/modules.c
+++ b/libguile/modules.c
@@ -564,7 +564,7 @@ scm_current_module_lookup_closure ()
return SCM_BOOL_F;
}
-SCM_SYMBOL (sym_sys_pre_modules_transformer, "%pre-modules-transformer");
+SCM_SYMBOL (sym_macroexpand, "macroexpand");
SCM_DEFINE (scm_module_transformer, "module-transformer", 1, 0, 0,
(SCM module),
@@ -572,13 +572,13 @@ SCM_DEFINE (scm_module_transformer, "module-transformer", 1, 0, 0,
#define FUNC_NAME s_scm_module_transformer
{
if (SCM_UNLIKELY (scm_is_false (module)))
- { SCM v = scm_hashq_ref (scm_pre_modules_obarray,
- sym_sys_pre_modules_transformer,
+ {
+ SCM v = scm_hashq_ref (scm_pre_modules_obarray,
+ sym_macroexpand,
SCM_BOOL_F);
if (scm_is_false (v))
- return SCM_BOOL_F;
- else
- return SCM_VARIABLE_REF (v);
+ SCM_MISC_ERROR ("no module, and `macroexpand' unbound", SCM_EOL);
+ return SCM_VARIABLE_REF (v);
}
else
{