diff options
author | Andy Wingo <wingo@pobox.com> | 2009-08-21 01:06:00 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-01 21:00:25 +0100 |
commit | 44acb034222f51b10a0a445862601f1a60ed9b3b (patch) | |
tree | 6b917e2aba813c1462b3c643c79d82ef9745fc86 /libguile/eval.c | |
parent | 25e8a4721e20e116646a55313a3c8b92ccfa4e71 (diff) | |
download | guile-44acb034222f51b10a0a445862601f1a60ed9b3b.tar.gz |
more ceval excision
* libguile/eval.c:
* libguile/eval.i.c: Rename deval to eval. Substitute in some
preprocessor macros.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r-- | libguile/eval.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libguile/eval.c b/libguile/eval.c index 29157b098..1d51c83be 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -74,7 +74,7 @@ static SCM unmemoize_exprs (SCM expr, SCM env); static SCM canonicalize_define (SCM expr); static SCM *scm_lookupcar1 (SCM vloc, SCM genv, int check); static SCM unmemoize_builtin_macro (SCM expr, SCM env); -static SCM deval (SCM x, SCM env); +static SCM eval (SCM x, SCM env); @@ -2610,7 +2610,7 @@ scm_badargsp (SCM formals, SCM args) : (SCM_VARIABLEP (x) \ ? SCM_VARIABLE_REF (x) \ : (scm_is_pair (x) \ - ? deval ((x), (env)) \ + ? eval ((x), (env)) \ : (x)))) #define SCM_I_XEVALCAR(x, env) \ @@ -2619,7 +2619,7 @@ scm_badargsp (SCM formals, SCM args) : (SCM_VARIABLEP (SCM_CAR (x)) \ ? SCM_VARIABLE_REF (SCM_CAR (x)) \ : (scm_is_pair (SCM_CAR (x)) \ - ? deval (SCM_CAR (x), (env)) \ + ? eval (SCM_CAR (x), (env)) \ : (!scm_is_symbol (SCM_CAR (x)) \ ? SCM_CAR (x) \ : *scm_lookupcar ((x), (env), 1))))) @@ -3782,7 +3782,7 @@ SCM_DEFINE (scm_eval, "eval", 2, 0, 0, #undef FUNC_NAME -/* At this point, deval and scm_dapply are generated. +/* At this point, eval and scm_apply are generated. */ static void @@ -3809,9 +3809,7 @@ ceval_letrec_inits (SCM env, SCM init_forms, SCM **init_values_eol) } } -#define DEVAL #include "eval.i.c" -#undef DEVAL void |