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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-20 04:07:15 -0800 (Tue, 20 Dec 2005)
New Revision: 2662

Modified:
   branches/r5rs/sigscheme/storage-fatty.h
Log:
* sigscheme/storage-fatty.h
  - (SCM_MARK, SCM_UNMARKER, SCM_MARKER): Removed
  - (SCM_SAL_IS_MARKED, SCM_SAL_DO_MARK, SCM_SAL_DO_UNMARK): Simplify


Modified: branches/r5rs/sigscheme/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/storage-fatty.h	2005-12-20 11:59:00 UTC (rev 2661)
+++ branches/r5rs/sigscheme/storage-fatty.h	2005-12-20 12:07:15 UTC (rev 2662)
@@ -168,7 +168,6 @@
 /* ScmObj Global Attribute */
 #define SCM_SAL_TYPE(o) ((o)->type)
 #define SCM_ENTYPE(a, objtype) ((a)->type = (objtype))
-#define SCM_MARK(a) ((a)->gcmark)
 
 /* Real Accessors */
 #define SCM_SAL_INTP(a)  (SCM_TYPE(a) == ScmInt)
@@ -314,12 +313,10 @@
         SCM_FREECELL_CLEAR_FREESLOT(cell);                                   \
     } while (/* CONSTCOND */ 0)
 
-#define SCM_UNMARKER          0
-#define SCM_MARKER            (SCM_UNMARKER + 1)
-#define SCM_SAL_IS_MARKED(o)   (SCM_MARK(o) == SCM_MARKER)
+#define SCM_SAL_IS_MARKED(o)   ((o)->gcmark)
 #define SCM_SAL_IS_UNMARKED(o) (!SCM_IS_MARKED(o))
-#define SCM_SAL_DO_MARK(o)     (SCM_MARK(o) = SCM_MARKER)
-#define SCM_SAL_DO_UNMARK(o)   (SCM_MARK(o) = SCM_UNMARKER)
+#define SCM_SAL_DO_MARK(o)     ((o)->gcmark = 1)
+#define SCM_SAL_DO_UNMARK(o)   ((o)->gcmark = 0)
 
 /*============================================================================
   Environment Specifiers