*** empty log message ***

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

diff --git a/libguile/eval.h b/libguile/eval.h
index ec387a4..418844c 100644 (file)
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -1,8 +1,8 @@
 /* classes: h_files */
 
-#ifndef EVALH
-#define EVALH
-/*     Copyright (C) 1995, 1996 ,1998, 1999, 2000 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
@@ -46,8 +46,6 @@
 
 #include "libguile/__scm.h"
 
-/* Needed by SCM_TOP_LEVEL_LOOKUP_CLOSURE below. */
-
 #include "struct.h"
 
 \f
@@ -55,14 +53,14 @@
 /* {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 setting);
 
@@ -70,7 +68,10 @@ extern 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_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
 
@@ -85,7 +86,7 @@ extern SCM scm_eval_options_interface (SCM setting);
 #define SCM_ICDR               (0x00080000L)
 #define SCM_IFRINC             (0x00000100L)
 #define SCM_IDSTMSK            (-SCM_IDINC)
-#define SCM_IFRAME(n)          ((int)((SCM_ICDR-SCM_IFRINC)>>8) \
+#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))
@@ -97,9 +98,11 @@ extern SCM scm_eval_options_interface (SCM setting);
  *
  * For an explanation of symbols containing "EVAL", see beginning of eval.c.
  */
-#define SCM_EVALIM2(x) (((x) == SCM_EOL) \
-                       ? scm_misc_error (NULL, scm_s_expression, SCM_EOL), 0 \
-                       : (x))
+#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) \
@@ -131,15 +134,14 @@ extern SCM scm_eval_options_interface (SCM setting);
 
 /*fixme* This should probably be removed throught the code. */
 
-#define SCM_TOP_LEVEL_LOOKUP_CLOSURE \
-  SCM_MODULE_EVAL_CLOSURE (scm_current_module ())
+#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
 
-extern SCM scm_system_transformer;
 
 \f
 extern const char scm_s_expression[];
@@ -180,16 +182,15 @@ extern SCM scm_sym_args;
 
 extern SCM scm_f_apply;
 
-extern scm_bits_t scm_tc16_macro;
-
 /* 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 (SCM_PACK (SCM_UNPACK (x) - 1L)))
-#define SCM_GLOC_VAL(x) (SCM_CDR (SCM_PACK (SCM_UNPACK (x) - 1L)))
-#define SCM_GLOC_VAL_LOC(x) (SCM_CDRLOC (SCM_PACK (SCM_UNPACK (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
 
@@ -233,6 +234,15 @@ 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);
@@ -259,7 +269,7 @@ extern SCM scm_eval_x (SCM exp, SCM module);
 
 extern void scm_init_eval (void);
 
-#endif  /* EVALH */
+#endif  /* SCM_EVAL_H */
 
 /*
   Local Variables: