mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-24 12:20:20 +02:00
Code Activity

primitive-eval takes expanded, not memoized, source

Browse source 
* module/ice-9/eval.scm (primitive-eval):
* libguile/eval.c (scm_c_primitive_eval): Don't expect a memoized
  expression -- expect either raw source or an *expanded* expression. We
  handle memoization ourselves.

* libguile/expand.c (scm_macroexpand): Settle down into its proper name,
  "macroexpand", even as we comment that it is but a fleeting boot
  expander.
  (scm_macroexpanded_p): New predicate for expanded code.

* libguile/expand.h: Add scm_macroexpanded_p.

* libguile/memoize.c (scm_memoize_expression): Require that the
  expression be expanded.
  (scm_init_memoize): Don't alias memoize-expression to macroexpand.

* module/ice-9/psyntax-pp.scm:
* module/ice-9/psyntax.scm: Always produce macroexpanded expressions,
  and hand them to primitive-eval. No more calls to memoize-expression
  here.

* test-suite/tests/optargs.test: Remove some tests, as unfortunately we
  have no way to invoke the boot expander after boot.
This commit is contained in:
Andy Wingo 2010-05-20 12:25:52 +02:00
parent 3e5ea35c2f
commit a310a1d12e
8 changed files with 1485 additions and 1516 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/eval.c
View file

@ -37,6 +37,7 @@
#include "libguile/deprecation.h"
#include "libguile/dynwind.h"
#include "libguile/eq.h"
#include "libguile/expand.h"
#include "libguile/feature.h"
#include "libguile/fluids.h"
#include "libguile/goops.h"
@ -832,13 +833,9 @@ scm_for_each (SCM proc, SCM arg1, SCM args)
static SCM
scm_c_primitive_eval (SCM exp)
{
if (!SCM_MEMOIZED_P (exp))
if (!SCM_EXPANDED_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);
return eval (scm_memoize_expression (exp), SCM_EOL);
}
static SCM var_primitive_eval;

12
libguile/expand.c
View file

@ -1162,7 +1162,8 @@ expand_set_x (SCM expr, SCM env)
SCM_DEFINE (scm_macroexpand, "macroexpand*", 1, 0, 0,
/* This is the boot expander. It is later replaced with psyntax's sc-expand. */
SCM_DEFINE (scm_macroexpand, "macroexpand", 1, 0, 0,
(SCM exp),
"Expand the expression @var{exp}.")
#define FUNC_NAME s_scm_macroexpand
@ -1171,6 +1172,15 @@ SCM_DEFINE (scm_macroexpand, "macroexpand*", 1, 0, 0,
}
#undef FUNC_NAME
SCM_DEFINE (scm_macroexpanded_p, "macroexpanded?", 1, 0, 0,
(SCM exp),
"Return @code{#t} if @var{exp} is an expanded expression.")
#define FUNC_NAME s_scm_macroexpanded_p
{
return scm_from_bool (SCM_EXPANDED_P (exp));
}
#undef FUNC_NAME

1
libguile/expand.h
View file

@ -333,6 +333,7 @@ enum
SCM_INTERNAL SCM scm_macroexpand (SCM exp);
SCM_INTERNAL SCM scm_macroexpanded_p (SCM exp);
SCM_INTERNAL void scm_init_expand (void);

5
libguile/memoize.c
View file

@ -404,8 +404,7 @@ SCM_DEFINE (scm_memoize_expression, "memoize-expression", 1, 0, 0,
"Memoize the expression @var{exp}.")
#define FUNC_NAME s_scm_memoize_expression
{
if (!SCM_EXPANDED_P (exp))
exp = scm_macroexpand (exp);
SCM_ASSERT_TYPE (SCM_EXPANDED_P (exp), exp, 1, FUNC_NAME, "expanded");
return memoize (exp, scm_current_module ());
}
#undef FUNC_NAME
@ -803,8 +802,6 @@ scm_init_memoize ()
#include "libguile/memoize.x"
scm_c_define ("macroexpand",
scm_variable_ref (scm_c_lookup ("memoize-expression")));
list_of_guile = scm_list_1 (scm_from_locale_symbol ("guile"));
}