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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-04 15:20:32 -0700 (Tue, 04 Oct 2005)
New Revision: 1809

Modified:
   branches/r5rs/sigscheme/datas.c
   branches/r5rs/sigscheme/debug.c
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigschemetype.h
Log:
* Renamings only

* sigscheme/sigschemetype.h
  - (struct ScmObjInternal_): Rename to struct ScmCell_
  - (struct ScmCell_): Renamed from struct ScmObjInternal_
  - (ScmObjInternal): Rename to ScmCell
  - (ScmCell): Renamed from ScmObjInternal

* sigscheme/debug.c
* sigscheme/datas.c
* sigscheme/sigscheme.c
  - s/ScmObjInternal/ScmCell/g


Modified: branches/r5rs/sigscheme/datas.c
===================================================================
--- branches/r5rs/sigscheme/datas.c	2005-10-04 22:15:55 UTC (rev 1808)
+++ branches/r5rs/sigscheme/datas.c	2005-10-04 22:20:32 UTC (rev 1809)
@@ -181,8 +181,8 @@
 ScmObj SigScm_null, SigScm_true, SigScm_false, SigScm_eof;
 ScmObj SigScm_unbound, SigScm_undef;
 
-static ScmObjInternal SigScm_null_cell, SigScm_true_cell, SigScm_false_cell, SigScm_eof_cell;
-static ScmObjInternal SigScm_unbound_cell, SigScm_undef_cell;
+static ScmCell SigScm_null_cell, SigScm_true_cell, SigScm_false_cell, SigScm_eof_cell;
+static ScmCell SigScm_unbound_cell, SigScm_undef_cell;
 
 /*=======================================
   File Local Function Declarations
@@ -301,7 +301,7 @@
     /* fill with zero and construct free_list */
     for (i = 0; i < num_heap; i++) {
         /* Initialize Heap */
-        heap = (ScmObj)malloc_aligned(sizeof(ScmObjInternal) * HEAP_SIZE);
+        heap = (ScmObj)malloc_aligned(sizeof(ScmCell) * HEAP_SIZE);
         (*heaps)[i] = heap;
 
         /* link in order */
@@ -332,7 +332,7 @@
     (*heaps) = (ScmObj*)realloc((*heaps), sizeof(ScmObj) * num_heap);
 
     /* allocate heap */
-    heap = (ScmObj)malloc_aligned(sizeof(ScmObjInternal) * HEAP_SIZE);
+    heap = (ScmObj)malloc_aligned(sizeof(ScmCell) * HEAP_SIZE);
     (*heaps)[num_heap - 1] = heap;
 
     /* link in order */
@@ -483,7 +483,7 @@
         if ((head = scm_heaps[i])
             && (head <= obj)
             && (obj  <  head + SCM_HEAP_SIZE)
-            && ((((char*)obj - (char*)head) % sizeof(ScmObjInternal)) == 0))
+            && ((((char*)obj - (char*)head) % sizeof(ScmCell)) == 0))
             return 1;
     }
 

Modified: branches/r5rs/sigscheme/debug.c
===================================================================
--- branches/r5rs/sigscheme/debug.c	2005-10-04 22:15:55 UTC (rev 1808)
+++ branches/r5rs/sigscheme/debug.c	2005-10-04 22:20:32 UTC (rev 1809)
@@ -510,7 +510,7 @@
      * uniform.  I haven't confirmed either's validity, though. */
     hashval = (unsigned)key;
     if (sizeof(hashval) > 4) {
-        hashval /= sizeof(ScmObjInternal);
+        hashval /= sizeof(ScmCell);
         hashval &= 0xffffffff;
     }
 

Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-10-04 22:15:55 UTC (rev 1808)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-10-04 22:20:32 UTC (rev 1809)
@@ -169,7 +169,7 @@
 #if SCM_USE_VALUECONS
     /*
      * To keep storage model abstract, the cell is allocated from a heap
-     * instead of directly construct ScmObjInternal
+     * instead of directly construct ScmCell
      */
     SigScm_null_values = CONS(SCM_NULL, SCM_NULL);
     SCM_ENTYPE_VALUEPACKET(SigScm_null_values);

Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h	2005-10-04 22:15:55 UTC (rev 1808)
+++ branches/r5rs/sigscheme/sigschemetype.h	2005-10-04 22:20:32 UTC (rev 1809)
@@ -46,8 +46,8 @@
 /*=======================================
    Type Declarations
 =======================================*/
-typedef struct ScmObjInternal_ ScmObjInternal;
-typedef ScmObjInternal *ScmObj;
+typedef struct ScmCell_ ScmCell;
+typedef ScmCell *ScmObj;
 typedef ScmObj *ScmRef;
 typedef struct _ScmPortInfo ScmPortInfo;
 typedef struct ScmEvalState_ ScmEvalState;
@@ -186,7 +186,7 @@
 };
 
 /* Scheme Object */
-struct ScmObjInternal_ {
+struct ScmCell_ {
     enum ScmObjType type;
     int gcmark;