* eval.c, eval.h (scm_m_expand_body, m_expand_body): Deprecated

[bpt/guile.git] / libguile / eval.h

diff --git a/libguile/eval.h b/libguile/eval.h
index 9ecb881..3f6acb5 100644 (file)
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -3,7 +3,7 @@
 #ifndef SCM_EVAL_H
 #define SCM_EVAL_H
 
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -33,7 +33,7 @@
 
 SCM_API scm_t_option scm_eval_opts[];
 
-#define SCM_EVAL_STACK        scm_eval_opts[0].val
+#define SCM_EVAL_STACK         scm_eval_opts[0].val
 #define SCM_N_EVAL_OPTIONS 1
 
 SCM_API long scm_eval_stack;
@@ -46,9 +46,9 @@ SCM_API SCM scm_eval_options_interface (SCM setting);
 #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_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_ENTER_FRAME_HDLR   (SCM_PACK (scm_evaluator_trap_table[4].val))
+#define SCM_APPLY_FRAME_HDLR   (SCM_PACK (scm_evaluator_trap_table[5].val))
+#define SCM_EXIT_FRAME_HDLR    (SCM_PACK (scm_evaluator_trap_table[6].val))
 #define SCM_N_EVALUATOR_TRAPS 7
 
 \f
@@ -59,21 +59,12 @@ SCM_API SCM scm_eval_options_interface (SCM setting);
  * 
  */
 #define SCM_ILOCP(n)           (SCM_ITAG8(n)==scm_tc8_iloc)
-#define SCM_ILOC00             SCM_MAKE_ITAG8(0L, scm_tc8_iloc)
-#define SCM_IDINC              (0x00100000L)
 #define SCM_ICDR               (0x00080000L)
 #define SCM_IFRINC             (0x00000100L)
-#define SCM_IDSTMSK            (-SCM_IDINC)
 #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))
-#define SCM_MAKE_ILOC(frame_nr, binding_nr, last_p) \
-  SCM_PACK ( \
-    ((frame_nr) << 8) \
-    + ((binding_nr) << 20) \
-    + ((last_p) ? SCM_ICDR : 0) \
-    + scm_tc8_iloc )
 
 \f
 
@@ -94,25 +85,7 @@ SCM_API scm_t_bits scm_tc16_promise;
 \f
 
 /* {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);
@@ -127,13 +100,6 @@ typedef SCM (*scm_t_trampoline_2) (SCM proc, SCM arg1, SCM arg2);
 #define SCM_TOP_LEVEL_LOOKUP_CLOSURE (scm_current_module_lookup_closure())
 
 \f
-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;
@@ -151,7 +117,6 @@ SCM_API SCM scm_sym_quasiquote;
 SCM_API SCM scm_sym_unquote;
 SCM_API SCM scm_sym_uq_splicing;
 
-SCM_API SCM scm_sym_dot;
 SCM_API SCM scm_sym_atapply;
 SCM_API SCM scm_sym_atcall_cc;
 SCM_API SCM scm_sym_at_call_with_values;
@@ -198,6 +163,9 @@ SCM_API SCM scm_m_nil_cond (SCM xorig, SCM env);
 SCM_API SCM scm_m_atfop (SCM xorig, SCM env);
 #endif /* SCM_ENABLE_ELISP */
 SCM_API SCM scm_m_atbind (SCM xorig, SCM env);
+SCM_API SCM scm_m_atslot_ref (SCM xorig, SCM env);
+SCM_API SCM scm_m_atslot_set_x (SCM xorig, SCM env);
+SCM_API SCM scm_m_atdispatch (SCM xorig, SCM env);
 SCM_API SCM scm_m_at_call_with_values (SCM xorig, SCM env);
 SCM_API int scm_badargsp (SCM formals, SCM args);
 SCM_API SCM scm_ceval (SCM x, SCM env);
@@ -218,7 +186,6 @@ 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);
-SCM_API SCM scm_m_expand_body (SCM xorig, SCM env);
 SCM_API SCM scm_macroexp (SCM x, SCM env);
 SCM_API SCM scm_map (SCM proc, SCM arg1, SCM args);
 SCM_API SCM scm_for_each (SCM proc, SCM arg1, SCM args);
@@ -237,6 +204,17 @@ SCM_API SCM scm_eval_x (SCM exp, SCM module);
 
 SCM_API void scm_init_eval (void);
 
+
+#if (SCM_ENABLE_DEPRECATED == 1)
+
+SCM_API SCM scm_m_undefine (SCM x, SCM env);
+
+/* Deprecated in guile 1.7.0 on 2003-11-09.  */
+SCM_API SCM scm_m_expand_body (SCM xorig, SCM env);
+
+#endif
+
+
 #endif  /* SCM_EVAL_H */
 
 /*