[uim-commit] r1766 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-03 04:00:12 -0700 (Mon, 03 Oct 2005)
New Revision: 1766

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (Scm_eval): New function decl
* sigscheme/sigscheme.h
  - (SCM_EVAL): Replace ScmOp_eval with Scm_eval
* sigscheme/eval.c
  - (Scm_eval): Renamed from previous ScmOp_eval
  - (ScmOp_eval): Implement as a wrapper to Scm_eval that performs
    error check as Scheme procedure


Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-10-03 10:46:36 UTC (rev 1765)
+++ branches/r5rs/sigscheme/eval.c	2005-10-03 11:00:12 UTC (rev 1766)
@@ -99,7 +99,7 @@
  * @param vals Arbitrary Scheme object list as values of new frame. Side
  *             effect: destructively modifyies the vals when vars is a dot
  *             list.
- * @see ScmOp_eval()
+ * @see Scm_eval()
  */
 ScmObj Scm_ExtendEnvironment(ScmObj vars, ScmObj vals, ScmObj env)
 {
@@ -455,6 +455,15 @@
 ===========================================================================*/
 ScmObj ScmOp_eval(ScmObj obj, ScmObj env)
 {
+    DECLARE_FUNCTION("eval", ProcedureFixed2);
+
+    ASSERT_ENVP(env);
+
+    return Scm_eval(obj, env);
+}
+
+ScmObj Scm_eval(ScmObj obj, ScmObj env)
+{
     ScmObj ret  = SCM_NULL;
     ScmEvalState state = {0};
 

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-10-03 10:46:36 UTC (rev 1765)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-10-03 11:00:12 UTC (rev 1766)
@@ -87,7 +87,7 @@
 #define SCM_LIST_5(elm0, elm1, elm2, elm3, elm4) \
     (SCM_CONS((elm0), SCM_LIST_4(elm1, elm2, elm3, elm4)))
 
-#define SCM_EVAL(obj, env) (ScmOp_eval(obj, env))
+#define SCM_EVAL(obj, env) (Scm_eval(obj, env))
 
 /*
  * Function Invocation With Stack Protection

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 10:46:36 UTC (rev 1765)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 11:00:12 UTC (rev 1766)
@@ -357,6 +357,7 @@
 ScmObj Scm_LookupEnvironment(ScmObj var, ScmObj env);
 ScmObj Scm_SymbolValue(ScmObj var, ScmObj env);
 
+ScmObj Scm_eval(ScmObj obj, ScmObj env);
 ScmObj Scm_tailcall(ScmObj proc, ScmObj args, ScmEvalState *eval_state);
 
 /* error.c */