diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-06-02 20:54:21 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2003-06-02 20:54:21 +0000 |
commit | e90c3a895d37efba2a31995ec85984ec205db974 (patch) | |
tree | 18ffd7ad4bc7fe348dfb911f4b907e4307271cec /libguile/eval.h | |
parent | 14b18ed6f596c22e62f0b2afecb5cfd4401acee4 (diff) | |
download | guile-e90c3a895d37efba2a31995ec85984ec205db974.tar.gz |
* deprecated.c, deprecated.h, eval.c, eval.h: Deprecated
scm_s_expression, scm_s_test, scm_s_body, scm_s_bindings,
scm_s_variable, scm_s_clauses, scm_s_formals. In eval.c the
definitions are make static and renamed from scm_s_xxx to s_xxx.
In deprecated.c the original definitions are copied.
* deprecated.h, eval.c, eval: Deprecated SCM_EVALIM2, SCM_EVALIM,
SCM_XEVAL and SCM_XEVALCAR. The macro definitions are moved from
eval.h into eval.c and a copy (slightly modified to work in user
code) is placed into deprecated.h.
* eval.c: Use the local static s_xxx definitions instead of the
scm_s_xxx definitions throughout.
Diffstat (limited to 'libguile/eval.h')
-rw-r--r-- | libguile/eval.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/libguile/eval.h b/libguile/eval.h index d7d510519..b9ff5743b 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -94,25 +94,7 @@ SCM_API scm_t_bits scm_tc16_promise; /* {Evaluator} - * - * For an explanation of symbols containing "EVAL", see beginning of eval.c. */ -#define SCM_EVALIM2(x) \ - ((SCM_EQ_P ((x), SCM_EOL) \ - ? scm_misc_error (NULL, scm_s_expression, SCM_EOL), 0 \ - : 0), \ - (x)) -#define SCM_EVALIM(x, env) (SCM_ILOCP (x) \ - ? *scm_ilookup ((x), env) \ - : SCM_EVALIM2(x)) -#define SCM_XEVAL(x, env) (SCM_IMP (x) \ - ? SCM_EVALIM2(x) \ - : (*scm_ceval_ptr) ((x), (env))) -#define SCM_XEVALCAR(x, env) (SCM_IMP (SCM_CAR (x)) \ - ? SCM_EVALIM (SCM_CAR (x), env) \ - : (SCM_SYMBOLP (SCM_CAR (x)) \ - ? *scm_lookupcar (x, env, 1) \ - : (*scm_ceval_ptr) (SCM_CAR (x), env))) typedef SCM (*scm_t_trampoline_0) (SCM proc); typedef SCM (*scm_t_trampoline_1) (SCM proc, SCM arg1); @@ -128,14 +110,6 @@ typedef SCM (*scm_t_trampoline_2) (SCM proc, SCM arg1, SCM arg2); -SCM_API const char scm_s_expression[]; -SCM_API const char scm_s_test[]; -SCM_API const char scm_s_body[]; -SCM_API const char scm_s_bindings[]; -SCM_API const char scm_s_variable[]; -SCM_API const char scm_s_clauses[]; -SCM_API const char scm_s_formals[]; - SCM_API SCM scm_sym_and; SCM_API SCM scm_sym_begin; SCM_API SCM scm_sym_case; |