(scm_num_eq_p): On 64-bit systems, be careful about

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

diff --git a/libguile/eval.h b/libguile/eval.h
index 3f6acb5..f1b94a0 100644 (file)
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -3,7 +3,8 @@
 #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,2004
+ * 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
@@ -59,27 +60,22 @@ SCM_API SCM scm_eval_options_interface (SCM setting);
  * 
  */
 #define SCM_ILOCP(n)           (SCM_ITAG8(n)==scm_tc8_iloc)
-#define SCM_ICDR               (0x00080000L)
-#define SCM_IFRINC             (0x00000100L)
-#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
 
 /* {Promises}
  */
 
-#define SCM_F_PROMISE_COMPUTED (1L << 16)
+#define SCM_F_PROMISE_COMPUTED (1L << 0)
 #define SCM_PROMISE_COMPUTED_P(promise) \
-  (SCM_F_PROMISE_COMPUTED & SCM_CELL_WORD_0 (promise))
+  (SCM_F_PROMISE_COMPUTED & SCM_SMOB_FLAGS (promise))
 #define SCM_SET_PROMISE_COMPUTED(promise) \
-  SCM_SET_CELL_WORD_0 (promise, scm_tc16_promise | SCM_F_PROMISE_COMPUTED)
-#define SCM_PROMISE_MUTEX(promise) \
-  ((scm_t_rec_mutex *) SCM_CELL_WORD_2 (promise))
-#define SCM_PROMISE_DATA SCM_CELL_OBJECT_1
-#define SCM_SET_PROMISE_DATA SCM_SET_CELL_OBJECT_1
+  SCM_SET_SMOB_FLAGS ((promise), SCM_F_PROMISE_COMPUTED)
+#define SCM_PROMISE_MUTEX     SCM_SMOB_OBJECT_2
+#define SCM_PROMISE_DATA      SCM_SMOB_OBJECT
+#define SCM_SET_PROMISE_DATA  SCM_SET_SMOB_OBJECT
+
+
 SCM_API scm_t_bits scm_tc16_promise;
 
 \f
@@ -131,8 +127,6 @@ 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_unmemocar (SCM form, SCM env);
-SCM_API SCM scm_unmemocopy (SCM form, SCM env);
 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);
@@ -168,8 +162,6 @@ 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);
-SCM_API SCM scm_deval (SCM x, SCM env);
 SCM_API SCM scm_call_0 (SCM proc);
 SCM_API SCM scm_call_1 (SCM proc, SCM arg1);
 SCM_API SCM scm_call_2 (SCM proc, SCM arg1, SCM arg2);
@@ -186,7 +178,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_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);
 SCM_API SCM scm_closure (SCM code, SCM env);
@@ -202,6 +193,10 @@ SCM_API SCM scm_primitive_eval_x (SCM exp);
 SCM_API SCM scm_eval (SCM exp, SCM module);
 SCM_API SCM scm_eval_x (SCM exp, SCM module);
 
+SCM_API void scm_i_print_iloc (SCM /*iloc*/, SCM /*port*/);
+SCM_API void scm_i_print_isym (SCM /*isym*/, SCM /*port*/);
+SCM_API SCM scm_i_unmemocopy_expr (SCM expr, SCM env);
+SCM_API SCM scm_i_unmemocopy_body (SCM forms, SCM env);
 SCM_API void scm_init_eval (void);
 
 
@@ -212,6 +207,15 @@ 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);
 
+/* Deprecated in guile 1.7.0 on 2003-11-16.  */
+SCM_API SCM scm_unmemocar (SCM form, SCM env);
+SCM_API SCM scm_macroexp (SCM x, SCM env);
+
+/* Deprecated in guile 1.7.0 on 2004-03-29.  */
+SCM_API SCM scm_ceval (SCM x, SCM env);
+SCM_API SCM scm_deval (SCM x, SCM env);
+SCM_API SCM (*scm_ceval_ptr) (SCM x, SCM env);
+
 #endif