diff options
Diffstat (limited to 'libguile/eval.h')
-rw-r--r-- | libguile/eval.h | 62 |
1 files changed, 4 insertions, 58 deletions
diff --git a/libguile/eval.h b/libguile/eval.h index 0e990cf26..fbb5bf512 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -27,6 +27,7 @@ #include "libguile/__scm.h" #include "libguile/struct.h" +#include "libguile/memoize.h" @@ -79,42 +80,6 @@ typedef SCM (*scm_t_trampoline_2) (SCM proc, SCM arg1, SCM arg2); -SCM_API SCM scm_sym_and; -SCM_API SCM scm_sym_begin; -SCM_API SCM scm_sym_case; -SCM_API SCM scm_sym_cond; -SCM_API SCM scm_sym_define; -SCM_API SCM scm_sym_do; -SCM_API SCM scm_sym_if; -SCM_API SCM scm_sym_lambda; -SCM_API SCM scm_sym_let; -SCM_API SCM scm_sym_letstar; -SCM_API SCM scm_sym_letrec; -SCM_API SCM scm_sym_quote; -SCM_API SCM scm_sym_quasiquote; -SCM_API SCM scm_sym_unquote; -SCM_API SCM scm_sym_uq_splicing; - -SCM_API SCM scm_sym_at; -SCM_API SCM scm_sym_atat; -SCM_API SCM scm_sym_atapply; -SCM_API SCM scm_sym_atcall_cc; -SCM_API SCM scm_sym_at_call_with_values; -SCM_API SCM scm_sym_delay; -SCM_API SCM scm_sym_eval_when; -SCM_API SCM scm_sym_arrow; -SCM_API SCM scm_sym_else; -SCM_API SCM scm_sym_apply; -SCM_API SCM scm_sym_set_x; -SCM_API SCM scm_sym_args; - - - -SCM_API SCM * scm_ilookup (SCM iloc, SCM env); -SCM_API SCM * scm_lookupcar (SCM vloc, SCM genv, int check); -SCM_API SCM scm_eval_car (SCM pair, SCM env); -SCM_API SCM scm_eval_body (SCM code, SCM env); -SCM_API SCM scm_eval_args (SCM i, SCM env, SCM proc); SCM_API int scm_badargsp (SCM formals, SCM args); SCM_API SCM scm_call_0 (SCM proc); SCM_API SCM scm_call_1 (SCM proc, SCM arg1); @@ -126,42 +91,23 @@ SCM_API SCM scm_apply_1 (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args); SCM_API SCM scm_apply_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM args); SCM_INTERNAL SCM scm_i_call_closure_0 (SCM proc); -SCM_API scm_t_trampoline_0 scm_trampoline_0 (SCM proc); -SCM_API scm_t_trampoline_1 scm_trampoline_1 (SCM proc); -SCM_API scm_t_trampoline_2 scm_trampoline_2 (SCM proc); SCM_API SCM scm_nconc2last (SCM lst); SCM_API SCM scm_apply (SCM proc, SCM arg1, SCM args); -SCM_API SCM scm_dapply (SCM proc, SCM arg1, SCM args); +#define scm_dapply(proc,arg1,args) scm_apply (proc, arg1, args) SCM_API SCM scm_map (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_for_each (SCM proc, SCM arg1, SCM args); SCM_API SCM scm_closure (SCM code, SCM env); SCM_API SCM scm_make_promise (SCM thunk); SCM_API SCM scm_force (SCM x); SCM_API SCM scm_promise_p (SCM x); -SCM_API SCM scm_i_eval_x (SCM exp, SCM env) /* not internal */; -SCM_INTERNAL SCM scm_i_eval (SCM exp, SCM env); SCM_API SCM scm_primitive_eval (SCM exp); -SCM_API SCM scm_primitive_eval_x (SCM exp); +#define scm_primitive_eval_x(exp) scm_primitive_eval (exp) SCM_API SCM scm_eval (SCM exp, SCM module); -SCM_API SCM scm_eval_x (SCM exp, SCM module); +#define scm_eval_x(exp, module) scm_eval (exp, module) -SCM_INTERNAL void scm_i_print_iloc (SCM /*iloc*/, SCM /*port*/); -SCM_INTERNAL void scm_i_print_isym (SCM /*isym*/, SCM /*port*/); -SCM_INTERNAL SCM scm_i_unmemocopy_expr (SCM expr, SCM env); -SCM_INTERNAL SCM scm_i_unmemocopy_body (SCM forms, SCM env); SCM_INTERNAL void scm_init_eval (void); -#if (SCM_ENABLE_DEPRECATED == 1) - -/* Deprecated in guile 1.7.0 on 2004-03-29. */ -SCM_DEPRECATED SCM scm_ceval (SCM x, SCM env); -SCM_DEPRECATED SCM scm_deval (SCM x, SCM env); -SCM_DEPRECATED SCM (*scm_ceval_ptr) (SCM x, SCM env); - -#endif - - #endif /* SCM_EVAL_H */ /* |