Rename scm_call_varargs -> scm_call

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

diff --git a/libguile/eval.h b/libguile/eval.h
index 4467358..014f0de 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,2004,2008,2009
+/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011
  * Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -27,6 +27,7 @@
 #include "libguile/__scm.h"
 
 #include "libguile/struct.h"
+#include "libguile/memoize.h"
 
 \f
 
@@ -45,23 +46,6 @@
 
 \f
 
-/* {Promises}
- */
-
-#define SCM_F_PROMISE_COMPUTED (1L << 0)
-#define SCM_PROMISE_COMPUTED_P(promise) \
-  (SCM_F_PROMISE_COMPUTED & SCM_SMOB_FLAGS (promise))
-#define SCM_SET_PROMISE_COMPUTED(promise) \
-  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
-
 /* {Evaluator}
  */
 
@@ -79,91 +63,40 @@ typedef SCM (*scm_t_trampoline_2) (SCM proc, SCM arg1, SCM arg2);
 
 \f
 
-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;
-
-\f
-
-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);
 SCM_API SCM scm_call_2 (SCM proc, SCM arg1, SCM arg2);
 SCM_API SCM scm_call_3 (SCM proc, SCM arg1, SCM arg2, SCM arg3);
 SCM_API SCM scm_call_4 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4);
+SCM_API SCM scm_call_5 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
+                        SCM arg5);
+SCM_API SCM scm_call_6 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
+                        SCM arg5, SCM arg6);
+SCM_API SCM scm_call_7 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
+                        SCM arg5, SCM arg6, SCM arg7);
+SCM_API SCM scm_call_8 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
+                        SCM arg5, SCM arg6, SCM arg7, SCM arg8);
+SCM_API SCM scm_call_9 (SCM proc, SCM arg1, SCM arg2, SCM arg3, SCM arg4,
+                        SCM arg5, SCM arg6, SCM arg7, SCM arg8, SCM arg9);
+SCM_API SCM scm_call_n (SCM proc, SCM *argv, size_t nargs);
+SCM_API SCM scm_call   (SCM proc, ...);
 SCM_API SCM scm_apply_0 (SCM proc, SCM args);
 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_cons_source (SCM xorig, SCM x, SCM y);
-SCM_API SCM scm_copy_tree (SCM obj);
-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_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
-
-
 #endif  /* SCM_EVAL_H */
 
 /*