/* classes: h_files */
-#ifndef EVALH
-#define EVALH
-/* Copyright (C) 1995,1996,1998 Free Software Foundation, Inc.
+#ifndef SCM_EVAL_H
+#define SCM_EVAL_H
+/* Copyright (C) 1995,1996,1998,1999,2000,2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "libguile/__scm.h"
+#include "struct.h"
+
\f
/* {Options}
*/
-extern scm_option scm_eval_opts[];
+extern scm_t_option scm_eval_opts[];
#define SCM_EVAL_STACK scm_eval_opts[0].val
#define SCM_N_EVAL_OPTIONS 1
-extern int scm_eval_stack;
+extern long scm_eval_stack;
-extern scm_option scm_evaluator_trap_table[];
+extern scm_t_option scm_evaluator_trap_table[];
-extern SCM scm_eval_options_interface SCM_P ((SCM setting));
+extern SCM scm_eval_options_interface (SCM setting);
#define SCM_TRAPS_P scm_evaluator_trap_table[0].val
#define SCM_ENTER_FRAME_P scm_evaluator_trap_table[1].val
#define SCM_APPLY_FRAME_P scm_evaluator_trap_table[2].val
#define SCM_EXIT_FRAME_P scm_evaluator_trap_table[3].val
-#define SCM_N_EVALUATOR_TRAPS 4
+#define SCM_ENTER_FRAME_HDLR (SCM)(scm_evaluator_trap_table[4].val)
+#define SCM_APPLY_FRAME_HDLR (SCM)(scm_evaluator_trap_table[5].val)
+#define SCM_EXIT_FRAME_HDLR (SCM)(scm_evaluator_trap_table[6].val)
+#define SCM_N_EVALUATOR_TRAPS 7
\f
#define SCM_ICDR (0x00080000L)
#define SCM_IFRINC (0x00000100L)
#define SCM_IDSTMSK (-SCM_IDINC)
-#define SCM_IFRAME(n) ((int)((SCM_ICDR-SCM_IFRINC)>>8) & ((int)(n)>>8))
-#define SCM_IDIST(n) (((unsigned long)(n))>>20)
-#define SCM_ICDRP(n) (SCM_ICDR & (n))
+#define SCM_IFRAME(n) ((long)((SCM_ICDR-SCM_IFRINC)>>8) \
+ & (SCM_UNPACK (n) >> 8))
+#define SCM_IDIST(n) (SCM_UNPACK (n) >> 20)
+#define SCM_ICDRP(n) (SCM_ICDR & SCM_UNPACK (n))
\f
*
* 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))
#ifdef MEMOIZE_LOCALS
-#define SCM_EVALIM(x, env) (SCM_ILOCP(x)?*scm_ilookup((x), env):x)
+#define SCM_EVALIM(x, env) (SCM_ILOCP (x) \
+ ? *scm_ilookup ((x), env) \
+ : SCM_EVALIM2(x))
#else
-#define SCM_EVALIM(x, env) x
+#define SCM_EVALIM(x, env) SCM_EVALIM2(x)
#endif
#ifdef DEBUG_EXTENSIONS
-#define SCM_XEVAL(x, env) (SCM_IMP(x) \
- ? (x) \
- : (*scm_ceval_ptr) ((x), (env)))
-#define SCM_XEVALCAR(x, env) (SCM_NCELLP(SCM_CAR(x)) \
- ? (SCM_IMP(SCM_CAR(x)) \
- ? SCM_EVALIM(SCM_CAR(x), env) \
- : SCM_GLOC_VAL(SCM_CAR(x))) \
- : (SCM_SYMBOLP(SCM_CAR(x)) \
- ? *scm_lookupcar(x, env, 1) \
- : (*scm_ceval_ptr) (SCM_CAR(x), env)))
+#define SCM_XEVAL(x, env) (SCM_IMP (x) \
+ ? SCM_EVALIM2(x) \
+ : (*scm_ceval_ptr) ((x), (env)))
+#define SCM_XEVALCAR(x, env) (SCM_NCELLP (SCM_CAR (x)) \
+ ? (SCM_IMP (SCM_CAR (x)) \
+ ? SCM_EVALIM (SCM_CAR (x), env) \
+ : SCM_GLOC_VAL (SCM_CAR (x))) \
+ : (SCM_SYMBOLP (SCM_CAR (x)) \
+ ? *scm_lookupcar (x, env, 1) \
+ : (*scm_ceval_ptr) (SCM_CAR (x), env)))
#else
-#define SCM_XEVAL(x, env) (SCM_IMP(x)?(x):scm_ceval((x), (env)))
-#define SCM_XEVALCAR(x, env) EVALCAR(x, env)
+#define SCM_XEVAL(x, env) (SCM_IMP (x) \
+ ? SCM_EVALIM2(x) \
+ : scm_ceval ((x), (env)))
+#define SCM_XEVALCAR(x, env) EVALCAR (x, env)
#endif /* DEBUG_EXTENSIONS */
\f
#define SCM_EXTEND_ENV scm_acons
+/*fixme* This should probably be removed throught the code. */
+
+#define SCM_TOP_LEVEL_LOOKUP_CLOSURE (scm_current_module_lookup_closure())
+
+#if SCM_DEBUG_DEPRECATED == 0
+
+extern SCM scm_top_level_lookup_closure_var;
+extern SCM scm_system_transformer;
+#endif
+
+
\f
extern const char scm_s_expression[];
extern const char scm_s_test[];
extern const char scm_s_formals[];
extern const char scm_s_set_x[];
-extern SCM scm_i_dot;
-extern SCM scm_i_quote;
-extern SCM scm_i_quasiquote;
-extern SCM scm_i_lambda;
-extern SCM scm_i_let;
-extern SCM scm_i_arrow;
-extern SCM scm_i_else;
-extern SCM scm_i_unquote;
-extern SCM scm_i_uq_splicing;
-extern SCM scm_i_apply;
+extern SCM scm_sym_and;
+extern SCM scm_sym_begin;
+extern SCM scm_sym_case;
+extern SCM scm_sym_cond;
+extern SCM scm_sym_define;
+extern SCM scm_sym_do;
+extern SCM scm_sym_if;
+extern SCM scm_sym_lambda;
+extern SCM scm_sym_let;
+extern SCM scm_sym_letstar;
+extern SCM scm_sym_letrec;
+extern SCM scm_sym_quote;
+extern SCM scm_sym_quasiquote;
+extern SCM scm_sym_unquote;
+extern SCM scm_sym_uq_splicing;
+
+extern SCM scm_sym_dot;
+extern SCM scm_sym_atapply;
+extern SCM scm_sym_atcall_cc;
+extern SCM scm_sym_at_call_with_values;
+extern SCM scm_sym_delay;
+extern SCM scm_sym_arrow;
+extern SCM scm_sym_else;
+extern SCM scm_sym_apply;
extern SCM scm_sym_set_x;
extern SCM scm_sym_args;
-extern long scm_tc16_macro;
+extern SCM scm_f_apply;
/* A resolved global variable reference in the CAR position
- * of a list is stored (in code only) as a pointer to a pair with a
+ * of a list is stored (in code only) as a pointer to a variable with a
* tag of 1. This is called a "gloc".
*/
-#define SCM_GLOC_SYM(x) (SCM_CAR((x)-1L))
-#define SCM_GLOC_VAL(x) (SCM_CDR((x)-1L))
-#define SCM_GLOC_VAL_LOC(x) (SCM_CDRLOC((x)-1L))
+#define SCM_GLOC_VAR(x) (SCM_PACK(SCM_UNPACK(x)-scm_tc3_cons_gloc))
+#define SCM_GLOC_VAL(x) (SCM_VARIABLE_REF (SCM_GLOC_VAR (x)))
+#define SCM_GLOC_SET_VAL(x, y) (SCM_VARIABLE_SET (SCM_GLOC_VAR (x), y))
+#define SCM_GLOC_VAL_LOC(x) (SCM_VARIABLE_LOC (SCM_GLOC_VAR (x)))
\f
-extern SCM * scm_ilookup SCM_P ((SCM iloc, SCM env));
-extern SCM * scm_lookupcar SCM_P ((SCM vloc, SCM genv, int check));
-extern SCM scm_unmemocar SCM_P ((SCM form, SCM env));
-extern SCM scm_unmemocopy SCM_P ((SCM form, SCM env));
-extern SCM scm_eval_car SCM_P ((SCM pair, SCM env));
-extern SCM scm_eval_args SCM_P ((SCM i, SCM env, SCM proc));
-extern SCM scm_deval_args SCM_P ((SCM l, SCM env, SCM proc, SCM *lloc));
-extern SCM scm_m_quote SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_begin SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_if SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_set_x SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_vref SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_vset SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_and SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_or SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_case SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_cond SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_lambda SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_letstar SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_do SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_quasiquote SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_delay SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_define SCM_P ((SCM x, SCM env));
-extern SCM scm_m_letrec SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_let SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_apply SCM_P ((SCM xorig, SCM env));
-extern SCM scm_m_cont SCM_P ((SCM xorig, SCM env));
+extern SCM * scm_ilookup (SCM iloc, SCM env);
+extern SCM * scm_lookupcar (SCM vloc, SCM genv, int check);
+extern SCM scm_unmemocar (SCM form, SCM env);
+extern SCM scm_unmemocopy (SCM form, SCM env);
+extern SCM scm_eval_car (SCM pair, SCM env);
+extern SCM scm_eval_body (SCM code, SCM env);
+extern SCM scm_eval_args (SCM i, SCM env, SCM proc);
+extern SCM scm_deval_args (SCM l, SCM env, SCM proc, SCM *lloc);
+extern SCM scm_m_quote (SCM xorig, SCM env);
+extern SCM scm_m_begin (SCM xorig, SCM env);
+extern SCM scm_m_if (SCM xorig, SCM env);
+extern SCM scm_m_set_x (SCM xorig, SCM env);
+extern SCM scm_m_vref (SCM xorig, SCM env);
+extern SCM scm_m_vset (SCM xorig, SCM env);
+extern SCM scm_m_and (SCM xorig, SCM env);
+extern SCM scm_m_or (SCM xorig, SCM env);
+extern SCM scm_m_case (SCM xorig, SCM env);
+extern SCM scm_m_cond (SCM xorig, SCM env);
+extern SCM scm_m_lambda (SCM xorig, SCM env);
+extern SCM scm_m_letstar (SCM xorig, SCM env);
+extern SCM scm_m_do (SCM xorig, SCM env);
+extern SCM scm_m_quasiquote (SCM xorig, SCM env);
+extern SCM scm_m_delay (SCM xorig, SCM env);
+extern SCM scm_m_define (SCM x, SCM env);
+extern SCM scm_m_letrec (SCM xorig, SCM env);
+extern SCM scm_m_let (SCM xorig, SCM env);
+extern SCM scm_m_apply (SCM xorig, SCM env);
+extern SCM scm_m_cont (SCM xorig, SCM env);
extern SCM scm_m_nil_cond (SCM xorig, SCM env);
extern SCM scm_m_nil_ify (SCM xorig, SCM env);
extern SCM scm_m_t_ify (SCM xorig, SCM env);
extern SCM scm_m_1_ify (SCM xorig, SCM env);
extern SCM scm_m_atfop (SCM xorig, SCM env);
extern SCM scm_m_atbind (SCM xorig, SCM env);
-extern int scm_badargsp SCM_P ((SCM formals, SCM args));
-extern SCM scm_ceval SCM_P ((SCM x, SCM env));
-extern SCM scm_deval SCM_P ((SCM x, SCM env));
-extern SCM scm_nconc2last SCM_P ((SCM lst));
-extern SCM scm_apply SCM_P ((SCM proc, SCM arg1, SCM args));
-extern SCM scm_dapply SCM_P ((SCM proc, SCM arg1, SCM args));
-extern SCM scm_m_expand_body SCM_P ((SCM xorig, SCM env));
-extern SCM scm_macroexp SCM_P ((SCM x, SCM env));
-extern SCM scm_map SCM_P ((SCM proc, SCM arg1, SCM args));
-extern SCM scm_for_each SCM_P ((SCM proc, SCM arg1, SCM args));
-extern SCM scm_closure SCM_P ((SCM code, SCM env));
-extern SCM scm_makprom SCM_P ((SCM code));
-extern SCM scm_force SCM_P ((SCM x));
-extern SCM scm_promise_p SCM_P ((SCM x));
+extern SCM scm_m_at_call_with_values (SCM xorig, SCM env);
+extern int scm_badargsp (SCM formals, SCM args);
+extern SCM scm_ceval (SCM x, SCM env);
+extern SCM scm_deval (SCM x, SCM env);
+extern SCM scm_call_0 (SCM proc);
+extern SCM scm_call_1 (SCM proc, SCM arg1);
+extern SCM scm_call_2 (SCM proc, SCM arg1, SCM arg2);
+extern SCM scm_call_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3);
+extern SCM scm_call_4 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4);
+extern SCM scm_apply_0 (SCM proc, SCM args);
+extern SCM scm_apply_1 (SCM proc, SCM arg1, SCM args);
+extern SCM scm_apply_2 (SCM proc, SCM arg1, SCM arg2, SCM args);
+extern SCM scm_apply_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM args);
+extern SCM scm_nconc2last (SCM lst);
+extern SCM scm_apply (SCM proc, SCM arg1, SCM args);
+extern SCM scm_dapply (SCM proc, SCM arg1, SCM args);
+extern SCM scm_m_expand_body (SCM xorig, SCM env);
+extern SCM scm_macroexp (SCM x, SCM env);
+extern SCM scm_map (SCM proc, SCM arg1, SCM args);
+extern SCM scm_for_each (SCM proc, SCM arg1, SCM args);
+extern SCM scm_closure (SCM code, SCM env);
+extern SCM scm_makprom (SCM code);
+extern SCM scm_force (SCM x);
+extern SCM scm_promise_p (SCM x);
extern SCM scm_cons_source (SCM xorig, SCM x, SCM y);
-extern SCM scm_copy_tree SCM_P ((SCM obj));
-extern SCM scm_eval_3 SCM_P ((SCM obj, int copyp, SCM env));
-extern SCM scm_eval2 SCM_P ((SCM obj, SCM env_thunk));
-extern SCM scm_eval SCM_P ((SCM obj));
-extern SCM scm_eval_x SCM_P ((SCM obj));
-extern void scm_init_eval SCM_P ((void));
-
-#endif /* EVALH */
+extern SCM scm_copy_tree (SCM obj);
+#if SCM_DEBUG_DEPRECATED == 0
+extern SCM scm_eval_3 (SCM obj, int copyp, SCM env);
+extern SCM scm_eval2 (SCM obj, SCM env_thunk);
+#endif
+extern SCM scm_i_eval_x (SCM exp, SCM env);
+extern SCM scm_i_eval (SCM exp, SCM env);
+extern SCM scm_primitive_eval (SCM exp);
+extern SCM scm_primitive_eval_x (SCM exp);
+extern SCM scm_eval (SCM exp, SCM module);
+extern SCM scm_eval_x (SCM exp, SCM module);
+
+extern void scm_init_eval (void);
+
+#endif /* SCM_EVAL_H */
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/