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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-08-29 00:30:05 -0700 (Mon, 29 Aug 2005)
New Revision: 1349

Modified:
   branches/r5rs/sigscheme/datas.c
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigschemeinternal.h
  - (SCM_FREECELL): Rename to SCM_AS_FREECELL
  - (SCM_AS_FREECELL): Renamed from SCM_FREECELL
  - (SCM_SETFREECELL_CAR): Rename to SCM_FREECELL_SET_CAR
  - (SCM_FREECELL_SET_CAR): Renamed from SCM_SETFREECELL_CAR
  - (SCM_SETFREECELL_CDR): Rename to SCM_FREECELL_SET_CDR
  - (SCM_FREECELL_SET_CDR): Renamed from SCM_SETFREECELL_CDR
* sigscheme/datas.c
  - (allocate_heap, add_heap, gc_sweep): Follow the renamings


Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c	2005-08-29 07:22:20 UTC (rev 1348)
+++ branches/r5rs/sigscheme/datas.c	2005-08-29 07:30:05 UTC (rev 1349)
@@ -225,10 +225,10 @@
         for (cell=heap; cell-heap < HEAP_SIZE; cell++) {
             SCM_ENTYPE_FREECELL(cell);
             SCM_DO_UNMARK(cell);
-            SCM_SETFREECELL_CDR(cell, cell+1);
+            SCM_FREECELL_SET_CDR(cell, cell+1);
         }
 
-        SCM_SETFREECELL_CDR(cell-1, (*freelist));
+        SCM_FREECELL_SET_CDR(cell-1, (*freelist));
         /* and freelist is head of the heap */
         (*freelist) = (*heaps)[i];
     }
@@ -258,10 +258,10 @@
     for (cell=heap; cell-heap < HEAP_SIZE; cell++) {
         SCM_ENTYPE_FREECELL(cell);
         SCM_DO_UNMARK(cell);
-        SCM_SETFREECELL_CDR(cell, cell+1);
+        SCM_FREECELL_SET_CDR(cell, cell+1);
     }
 
-    SCM_SETFREECELL_CDR(cell-1, *freelist);
+    SCM_FREECELL_SET_CDR(cell-1, *freelist);
     (*freelist) = (*heaps)[num_heap - 1];
 }
 
@@ -553,8 +553,8 @@
                 sweep_obj(obj);
 
                 SCM_ENTYPE_FREECELL(obj);
-                SCM_SETFREECELL_CAR(obj, SCM_NULL);
-                SCM_SETFREECELL_CDR(obj, scm_new_freelist);
+                SCM_FREECELL_SET_CAR(obj, SCM_NULL);
+                SCM_FREECELL_SET_CDR(obj, scm_new_freelist);
                 scm_new_freelist = obj;
                 corrected_obj_num++;
             }

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-08-29 07:22:20 UTC (rev 1348)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-08-29 07:30:05 UTC (rev 1349)
@@ -81,12 +81,12 @@
 
 /* FreeCell Handling Macros */
 #define SCM_FREECELLP(a)     (SCM_TYPE(a) == ScmFreeCell)
-#define SCM_FREECELL(a)      (sigassert(SCM_FREECELLP(a)), (a))
-#define SCM_FREECELL_CAR(a)  (SCM_FREECELL(a)->obj.cons.car)
-#define SCM_FREECELL_CDR(a)  (SCM_FREECELL(a)->obj.cons.cdr)
+#define SCM_AS_FREECELL(a)   (sigassert(SCM_FREECELLP(a)), (a))
+#define SCM_FREECELL_CAR(a)  (SCM_AS_FREECELL(a)->obj.cons.car)
+#define SCM_FREECELL_CDR(a)  (SCM_AS_FREECELL(a)->obj.cons.cdr)
 #define SCM_ENTYPE_FREECELL(a)     (SCM_ENTYPE((a), ScmFreeCell))
-#define SCM_SETFREECELL_CAR(a,car) (SCM_FREECELL_CAR(a) = car)
-#define SCM_SETFREECELL_CDR(a,cdr) (SCM_FREECELL_CDR(a) = cdr)
+#define SCM_FREECELL_SET_CAR(a,car) (SCM_FREECELL_CAR(a) = car)
+#define SCM_FREECELL_SET_CDR(a,cdr) (SCM_FREECELL_CDR(a) = cdr)
 
 /* Prefix-less Abbreviation Names For Convenient Internal Use */
 #define EQ             SCM_EQ