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

[kzk at freedesktop.org]

Author: kzk
Date: 2006-01-08 04:48:52 -0800 (Sun, 08 Jan 2006)
New Revision: 2858

Modified:
   branches/r5rs/sigscheme/storage-compact.h
   branches/r5rs/sigscheme/storage-gc.c
Log:
* sigscheme/storage-compact.h
  - (SCM_CONS_CAR_VAL,
     SCM_CONS_CDR_VAL): remove SCM_STRIP_GCBIT for optimizing
* sigscheme/storage-gc.c
  - (mark_obj): use SCM_CONS_CAR and SCM_CONS_CDR for consistency


Modified: branches/r5rs/sigscheme/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/storage-compact.h	2006-01-08 12:38:19 UTC (rev 2857)
+++ branches/r5rs/sigscheme/storage-compact.h	2006-01-08 12:48:52 UTC (rev 2858)
@@ -543,8 +543,8 @@
 /*
  * for Cons
  */
-#define SCM_CONS_CAR_VAL(a) ((ScmObj)(SCM_STRIP_GCBIT(SCM_CELL_CAR(a))))
-#define SCM_CONS_CDR_VAL(a) ((ScmObj)(SCM_STRIP_GCBIT(SCM_CELL_CDR(a))))
+#define SCM_CONS_CAR_VAL(a) ((ScmObj)(SCM_CELL_CAR(a)))
+#define SCM_CONS_CDR_VAL(a) ((ScmObj)(SCM_CELL_CDR(a)))
 #define SCM_CONS_SET_CAR_VAL(a, val)                            \
     SCM_CELL_SET_CAR((a), SCM_STRIP_GCBIT(val) | SCM_GCBIT(SCM_CELL_CAR(a)))
 #define SCM_CONS_SET_CDR_VAL(a, val)                            \

Modified: branches/r5rs/sigscheme/storage-gc.c
===================================================================
--- branches/r5rs/sigscheme/storage-gc.c	2006-01-08 12:38:19 UTC (rev 2857)
+++ branches/r5rs/sigscheme/storage-gc.c	2006-01-08 12:48:52 UTC (rev 2858)
@@ -366,8 +366,8 @@
     tag = SCM_TAG(obj);
     switch (tag) {
     case SCM_TAG_CONS:
-        mark_obj(SCM_CAR(obj));
-        obj = CDR(obj);
+        mark_obj(SCM_CONS_CAR(obj));
+        obj = SCM_CONS_CDR(obj);
         goto mark_loop;
 
     case SCM_TAG_CLOSURE: