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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-09-30 21:55:57 -0700 (Fri, 30 Sep 2005)
New Revision: 1722

Modified:
   branches/r5rs/sigscheme/eval.c
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - remove Scm_LookupFrame
* sigscheme/eval.c
  - (lookup_frame): renamed from Scm_LookupFrame and now this
    function is static
  - (Scm_AddEnvironment): forgot to rename add_environment to
    Scm_AddEnvironment 



Modified: branches/r5rs/sigscheme/eval.c
===================================================================
--- branches/r5rs/sigscheme/eval.c	2005-10-01 04:42:45 UTC (rev 1721)
+++ branches/r5rs/sigscheme/eval.c	2005-10-01 04:55:57 UTC (rev 1722)
@@ -80,6 +80,7 @@
 /*=======================================
   File Local Function Declarations
 =======================================*/
+static ScmObj lookup_frame(ScmObj var, ScmObj frame);
 static ScmObj reduce(ScmObj (*func)(), ScmObj args, ScmObj env,
                      int suppress_eval);
 static ScmObj call_closure(ScmObj proc, ScmObj args, ScmEvalState *eval_state);
@@ -133,7 +134,7 @@
 }
 
 /** Add a binding to newest frame of an env */
-ScmObj add_environment(ScmObj var, ScmObj val, ScmObj env)
+ScmObj Scm_AddEnvironment(ScmObj var, ScmObj val, ScmObj env)
 {
     ScmObj newest_frame;
     ScmObj new_vars, new_vals;
@@ -182,7 +183,7 @@
     /* lookup in frames */
     for (; !NULLP(env); env = CDR(env)) {
         frame = CAR(env);
-        val   = Scm_LookupFrame(var, frame);
+        val   = lookup_frame(var, frame);
         if (!NULLP(val))
             return val;
     }
@@ -191,7 +192,7 @@
 }
 
 /** Lookup a variable of a frame */
-ScmObj Scm_LookupFrame(ScmObj var, ScmObj frame)
+static ScmObj lookup_frame(ScmObj var, ScmObj frame)
 {
     ScmObj vals = SCM_NULL;
     ScmObj vars = SCM_NULL;
@@ -1391,7 +1392,7 @@
         SCM_SYMBOL_SET_VCELL(var, EVAL(exp, env));
     } else {
         /* add val to the environment */
-        env = add_environment(var, EVAL(exp, env), env);
+        env = Scm_AddEnvironment(var, EVAL(exp, env), env);
     }
 }
 

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-01 04:42:45 UTC (rev 1721)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-01 04:55:57 UTC (rev 1722)
@@ -352,7 +352,6 @@
 ScmObj Scm_ExtendEnvironment(ScmObj vars, ScmObj vals, ScmObj env);
 ScmObj Scm_AddEnvironment(ScmObj var, ScmObj val, ScmObj env);
 ScmObj Scm_LookupEnvironment(ScmObj var, ScmObj env);
-ScmObj Scm_LookupFrame(ScmObj var, ScmObj frame);
 ScmObj Scm_SymbolValue(ScmObj var, ScmObj env);
 
 /* error.c */