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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-11-18 18:20:30 -0800 (Fri, 18 Nov 2005)
New Revision: 2160

Modified:
   branches/r5rs/sigscheme/storage-continuation.c
Log:
* sigscheme/storage-continuation.c
  - (current_dynamic_extent): renamed from scm_current_dynamic_extent
    and now this variable is static


Modified: branches/r5rs/sigscheme/storage-continuation.c
===================================================================
--- branches/r5rs/sigscheme/storage-continuation.c	2005-11-19 02:04:15 UTC (rev 2159)
+++ branches/r5rs/sigscheme/storage-continuation.c	2005-11-19 02:20:30 UTC (rev 2160)
@@ -75,8 +75,7 @@
   Variable Declarations
 =======================================*/
 /* dynamic extent */
-/* FIXME: make static */
-ScmObj scm_current_dynamic_extent = NULL;
+static ScmObj current_dynamic_extent = NULL;
 
 /* temporary store for a object returned from a continuation */
 static ScmObj continuation_thrown_obj = NULL;
@@ -129,8 +128,8 @@
 
 static void initialize_dynamic_extent(void)
 {
-    scm_current_dynamic_extent = SCM_NULL;
-    SigScm_GC_Protect(&scm_current_dynamic_extent);
+    current_dynamic_extent = SCM_NULL;
+    SigScm_GC_Protect(&current_dynamic_extent);
 }
 
 static void finalize_dynamic_extent(void)
@@ -139,16 +138,16 @@
 
 static void wind_onto_dynamic_extent(ScmObj before, ScmObj after)
 {
-    scm_current_dynamic_extent = CONS(MAKE_DYNEXT_FRAME(before, after),
-                                      scm_current_dynamic_extent);
+    current_dynamic_extent = CONS(MAKE_DYNEXT_FRAME(before, after),
+                                      current_dynamic_extent);
 }
 
 static void unwind_dynamic_extent(void)
 {
-    if (NULLP(scm_current_dynamic_extent))
+    if (NULLP(current_dynamic_extent))
         SigScm_Error("corrupted dynamic extent");
 
-    scm_current_dynamic_extent = CDR(scm_current_dynamic_extent);
+    current_dynamic_extent = CDR(current_dynamic_extent);
 }
 
 /* enter a dynamic extent of another continuation (dest) */
@@ -159,7 +158,7 @@
     ScmObj retpath = SCM_NULL;
 
     for (unwound = dest; !NULLP(unwound); unwound = CDR(unwound)) {
-        if (EQ(unwound, scm_current_dynamic_extent))
+        if (EQ(unwound, current_dynamic_extent))
             break;
         frame = CAR(unwound);
         retpath = CONS(frame, retpath);
@@ -177,12 +176,12 @@
     ScmObj frame = SCM_FALSE;
 
     for (;
-         !NULLP(scm_current_dynamic_extent);
-         scm_current_dynamic_extent = CDR(scm_current_dynamic_extent))
+         !NULLP(current_dynamic_extent);
+         current_dynamic_extent = CDR(current_dynamic_extent))
     {
-        if (EQ(scm_current_dynamic_extent, dest))
+        if (EQ(current_dynamic_extent, dest))
             return;
-        frame = CAR(scm_current_dynamic_extent);
+        frame = CAR(current_dynamic_extent);
         Scm_call(DYNEXT_FRAME_AFTER(frame), SCM_NULL);
     }
 }
@@ -265,7 +264,7 @@
     cont = Scm_NewContinuation();
     CONTINUATION_SET_FRAME(cont, &cont_frame);
     CONTINUATION_SET_JMPENV(cont, &env);
-    CONTINUATION_SET_DYNEXT(cont, scm_current_dynamic_extent);
+    CONTINUATION_SET_DYNEXT(cont, current_dynamic_extent);
 #if SCM_NESTED_CONTINUATION_ONLY
     continuation_stack_push(cont);
 #endif