[uim-commit] r3041 - branches/r5rs/sigscheme/src
yamaken at freedesktop.org
yamaken at freedesktop.org
Mon Jan 30 01:23:23 PST 2006
Author: yamaken
Date: 2006-01-30 01:23:19 -0800 (Mon, 30 Jan 2006)
New Revision: 3041
Modified:
branches/r5rs/sigscheme/src/sigschemeinternal.h
branches/r5rs/sigscheme/src/storage-compact.h
branches/r5rs/sigscheme/src/storage-fatty.h
branches/r5rs/sigscheme/src/storage-gc.c
branches/r5rs/sigscheme/src/test-compact.c
Log:
* sigscheme/src/sigschemeinternal.h
- (SCM_IS_MARKED, SCM_MARKEDP): Rename SCM_IS_MARKED to SCM_MARKEDP
- (SCM_IS_UNMARKED, SCM_UNMARKEDP): Rename SCM_IS_UNMARKED to
SCM_UNMARKEDP
- (SCM_DO_MARK, SCM_MARK): Rename SCM_DO_MARK to SCM_MARK
- (SCM_DO_UNMARK, SCM_UNMARK): Rename SCM_DO_UNMARK to SCM_UNMARK
* sigscheme/src/storage-fatty.h
* sigscheme/src/storage-compact.h
* sigscheme/src/test-compact.c
* sigscheme/src/storage-gc.c
- Follow the renamings
Modified: branches/r5rs/sigscheme/src/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/src/sigschemeinternal.h 2006-01-30 08:26:55 UTC (rev 3040)
+++ branches/r5rs/sigscheme/src/sigschemeinternal.h 2006-01-30 09:23:19 UTC (rev 3041)
@@ -124,11 +124,10 @@
* and chain it into freelist. */
#define SCM_RECLAIM_CELL(cell, next) SCM_SAL_RECLAIM_CELL((cell), (next))
-/* FIXME: rename appropriately */
-#define SCM_IS_MARKED(o) SCM_SAL_IS_MARKED(o)
-#define SCM_IS_UNMARKED(o) SCM_SAL_IS_UNMARKED(o)
-#define SCM_DO_MARK(o) SCM_SAL_DO_MARK(o)
-#define SCM_DO_UNMARK(o) SCM_SAL_DO_UNMARK(o)
+#define SCM_MARKEDP(o) SCM_SAL_MARKEDP(o)
+#define SCM_UNMARKEDP(o) SCM_SAL_UNMARKEDP(o)
+#define SCM_MARK(o) SCM_SAL_MARK(o)
+#define SCM_UNMARK(o) SCM_SAL_UNMARK(o)
/* Prefix-less Abbreviation Names For Convenient Internal Use */
#define SYM_QUOTE SCM_SYM_QUOTE
Modified: branches/r5rs/sigscheme/src/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/src/storage-compact.h 2006-01-30 08:26:55 UTC (rev 3040)
+++ branches/r5rs/sigscheme/src/storage-compact.h 2006-01-30 09:23:19 UTC (rev 3041)
@@ -775,25 +775,25 @@
SCM_CELL_SET_CDR((a), (tag))
/* for each tag type */
-#define SCM_ENTYPE_TAG_CONS(a) \
- do { \
- SCM_ENTYPE_TAG((a), SCM_TAG_CONS); \
- SCM_DO_UNMARK(a); \
- SCM_GCBIT_OFF(SCM_CELL_CDR(a)); \
+#define SCM_ENTYPE_TAG_CONS(a) \
+ do { \
+ SCM_ENTYPE_TAG((a), SCM_TAG_CONS); \
+ SCM_UNMARK(a); \
+ SCM_GCBIT_OFF(SCM_CELL_CDR(a)); \
} while (/*CONSTCOND*/ 0)
-#define SCM_ENTYPE_TAG_CLOSURE(a) \
- do { \
- SCM_ENTYPE_TAG((a), SCM_TAG_CLOSURE); \
- SCM_DO_UNMARK(a); \
- SCM_GCBIT_OFF(SCM_CELL_CDR(a)); \
+#define SCM_ENTYPE_TAG_CLOSURE(a) \
+ do { \
+ SCM_ENTYPE_TAG((a), SCM_TAG_CLOSURE); \
+ SCM_UNMARK(a); \
+ SCM_GCBIT_OFF(SCM_CELL_CDR(a)); \
} while (/*CONSTCOND*/ 0)
-#define SCM_ENTYPE_TAG_OTHERS(a, type) \
- do { \
- SCM_ENTYPE_TAG((a), SCM_TAG_OTHERS); \
- SCM_DO_UNMARK(a); \
- SCM_ENTYPE_OTHERS_CDR_TAG((a), SCM_OTHERS_CDR_TAG_##type); \
+#define SCM_ENTYPE_TAG_OTHERS(a, type) \
+ do { \
+ SCM_ENTYPE_TAG((a), SCM_TAG_OTHERS); \
+ SCM_UNMARK(a); \
+ SCM_ENTYPE_OTHERS_CDR_TAG((a), SCM_OTHERS_CDR_TAG_##type); \
} while (/*CONSTCOND*/ 0)
#define SCM_ENTYPE_TAG_IMM(a, type) \
@@ -1036,7 +1036,7 @@
#define SCM_SAL_RECLAIM_CELL(cell, next) \
do { \
SCM_ENTYPE_FREECELL(cell); \
- SCM_DO_UNMARK(cell); \
+ SCM_UNMARK(cell); \
SCM_FREECELL_SET_NEXT((cell), (next)); \
} while (/* CONSTCOND */ 0)
@@ -1066,15 +1066,15 @@
#define SCM_SWEEP_PHASE_CONTINUATIONP(a) \
(SCM_TAG_SWEEP_PHASE_OTHERSP((a), CONTINUATION))
-#define SCM_SAL_IS_MARKED(a) \
+#define SCM_SAL_MARKEDP(a) \
(SCM_GCBIT(SCM_CELL_CAR(a)) == SCM_GCBIT_MARKED)
-#define SCM_SAL_IS_UNMARKED(a) \
- (!SCM_IS_MARKED(a))
-#define SCM_SAL_DO_MARK(a) \
- (SCM_CELL_SET_CAR((a), \
+#define SCM_SAL_UNMARKEDP(a) \
+ (!SCM_MARKEDP(a))
+#define SCM_SAL_MARK(a) \
+ (SCM_CELL_SET_CAR((a), \
SCM_STRIP_GCBIT(SCM_CELL_CAR(a)) | SCM_GCBIT_MARKED))
-#define SCM_SAL_DO_UNMARK(a) \
- (SCM_CELL_SET_CAR((a), \
+#define SCM_SAL_UNMARK(a) \
+ (SCM_CELL_SET_CAR((a), \
SCM_STRIP_GCBIT(SCM_CELL_CAR(a)) | SCM_GCBIT_UNMARKED))
/*===========================================================================
Modified: branches/r5rs/sigscheme/src/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/src/storage-fatty.h 2006-01-30 08:26:55 UTC (rev 3040)
+++ branches/r5rs/sigscheme/src/storage-fatty.h 2006-01-30 09:23:19 UTC (rev 3041)
@@ -414,15 +414,15 @@
#define SCM_SAL_RECLAIM_CELL(cell, next) \
do { \
SCM_ENTYPE_FREECELL(cell); \
- SCM_DO_UNMARK(cell); \
+ SCM_UNMARK(cell); \
SCM_FREECELL_SET_NEXT((cell), (next)); \
SCM_FREECELL_CLEAR_FREESLOT(cell); \
} while (/* CONSTCOND */ 0)
-#define SCM_SAL_IS_MARKED(o) ((o)->attr.v.gcmark)
-#define SCM_SAL_IS_UNMARKED(o) (!SCM_IS_MARKED(o))
-#define SCM_SAL_DO_MARK(o) ((o)->attr.v.gcmark = scm_true)
-#define SCM_SAL_DO_UNMARK(o) ((o)->attr.v.gcmark = scm_false)
+#define SCM_SAL_MARKEDP(o) ((o)->attr.v.gcmark)
+#define SCM_SAL_UNMARKEDP(o) (!SCM_MARKEDP(o))
+#define SCM_SAL_MARK(o) ((o)->attr.v.gcmark = scm_true)
+#define SCM_SAL_UNMARK(o) ((o)->attr.v.gcmark = scm_false)
/*===========================================================================
Environment Specifiers
Modified: branches/r5rs/sigscheme/src/storage-gc.c
===================================================================
--- branches/r5rs/sigscheme/src/storage-gc.c 2006-01-30 08:26:55 UTC (rev 3040)
+++ branches/r5rs/sigscheme/src/storage-gc.c 2006-01-30 09:23:19 UTC (rev 3041)
@@ -360,11 +360,11 @@
return;
/* avoid cyclic marking */
- if (SCM_IS_MARKED(obj))
+ if (SCM_MARKEDP(obj))
return;
/* mark this object */
- SCM_DO_MARK(obj);
+ SCM_MARK(obj);
/* mark recursively */
tag = SCM_TAG(obj);
@@ -409,11 +409,11 @@
return;
/* avoid cyclic marking */
- if (SCM_IS_MARKED(obj))
+ if (SCM_MARKEDP(obj))
return;
/* mark this object */
- SCM_DO_MARK(obj);
+ SCM_MARK(obj);
/* mark recursively */
switch (SCM_TYPE(obj)) {
@@ -678,8 +678,8 @@
/* FIXME: is this safe for SCM_OBJ_COMPACT? */
obj = (ScmObj)cell;
- if (SCM_IS_MARKED(obj)) {
- SCM_DO_UNMARK(obj);
+ if (SCM_MARKEDP(obj)) {
+ SCM_UNMARK(obj);
} else {
free_cell(cell);
SCM_RECLAIM_CELL(cell, new_freelist);
Modified: branches/r5rs/sigscheme/src/test-compact.c
===================================================================
--- branches/r5rs/sigscheme/src/test-compact.c 2006-01-30 08:26:55 UTC (rev 3040)
+++ branches/r5rs/sigscheme/src/test-compact.c 2006-01-30 09:23:19 UTC (rev 3041)
@@ -215,12 +215,12 @@
/* entyping */
SCM_ENTYPE_CONS(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCons, obj);
/* unmarked state */
SCM_CONS_SET_CAR(obj, car);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCons, obj);
SCM_CONS_SET_CAR(obj, car);
@@ -229,25 +229,25 @@
SCM_ASSERT(SCM_INT_VALUE(SCM_CAR(obj)) == 1);
SCM_CONS_SET_CDR(obj, cdr);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCons, obj);
SCM_ASSERT(SCM_EQ(SCM_CDR(obj), cdr));
SCM_ASSERT(SCM_INTP(SCM_CDR(obj)));
SCM_ASSERT(SCM_INT_VALUE(SCM_CDR(obj)) == 2);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_CONS_SET_CAR(obj, car);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmCons, obj);
SCM_ASSERT(SCM_EQ(SCM_CAR(obj), car));
SCM_ASSERT(SCM_INTP(SCM_CAR(obj)));
SCM_ASSERT(SCM_INT_VALUE(SCM_CAR(obj)) == 1);
SCM_CONS_SET_CDR(obj, cdr);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmCons, obj);
SCM_ASSERT(SCM_EQ(SCM_CDR(obj), cdr));
SCM_ASSERT(SCM_INTP(SCM_CDR(obj)));
@@ -267,12 +267,12 @@
/* entyping */
SCM_ENTYPE_CLOSURE(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmClosure, obj);
/* unmarked state */
SCM_CLOSURE_SET_EXP(obj, exp);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmClosure, obj);
check_type(ScmCons, SCM_CLOSURE_EXP(obj));
SCM_ASSERT(SCM_EQ(SCM_CLOSURE_EXP(obj), exp));
@@ -280,7 +280,7 @@
check_type(ScmInt, SCM_CDR(SCM_CLOSURE_EXP(obj)));
SCM_CLOSURE_SET_ENV(obj, env);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmClosure, obj);
check_type(ScmCons, SCM_CLOSURE_ENV(obj));
SCM_ASSERT(SCM_EQ(SCM_CLOSURE_ENV(obj), env));
@@ -288,11 +288,11 @@
check_type(ScmInt, SCM_CDR(SCM_CLOSURE_ENV(obj)));
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_CLOSURE_SET_EXP(obj, exp);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmClosure, obj);
check_type(ScmCons, SCM_CLOSURE_EXP(obj));
SCM_ASSERT(SCM_EQ(SCM_CLOSURE_EXP(obj), exp));
@@ -300,7 +300,7 @@
check_type(ScmInt, SCM_CDR(SCM_CLOSURE_EXP(obj)));
SCM_CLOSURE_SET_ENV(obj, env);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmClosure, obj);
check_type(ScmCons, SCM_CLOSURE_ENV(obj));
SCM_ASSERT(SCM_EQ(SCM_CLOSURE_ENV(obj), env));
@@ -320,35 +320,35 @@
/* entyping */
SCM_ENTYPE_SYMBOL(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmSymbol, obj);
/* unmarked state */
SCM_SYMBOL_SET_NAME(obj, aligned_strdup(name));
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmSymbol, obj);
if (name)
SCM_ASSERT(strcmp(SCM_SYMBOL_NAME(obj), name) == 0);
SCM_SYMBOL_SET_VCELL(obj, vcell);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmSymbol, obj);
SCM_ASSERT(SCM_EQ(SCM_SYMBOL_VCELL(obj), vcell));
SCM_ASSERT(SCM_INTP(SCM_SYMBOL_VCELL(obj)));
SCM_ASSERT(SCM_INT_VALUE(SCM_SYMBOL_VCELL(obj)) == 1);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_SYMBOL_SET_NAME(obj, aligned_strdup(name));
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmSymbol, obj);
if (name)
SCM_ASSERT(strcmp(SCM_SYMBOL_NAME(obj), name) == 0);
SCM_SYMBOL_SET_VCELL(obj, vcell);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmSymbol, obj);
SCM_ASSERT(SCM_EQ(SCM_SYMBOL_VCELL(obj), vcell));
SCM_ASSERT(SCM_INTP(SCM_SYMBOL_VCELL(obj)));
@@ -366,57 +366,57 @@
/* entyping */
SCM_ENTYPE_STRING(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmString, obj);
/* unmarked state */
SCM_STRING_SET_STR(obj, aligned_strdup(str));
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmString, obj);
if (str)
SCM_ASSERT(strcmp(SCM_STRING_STR(obj), str) == 0);
SCM_STRING_SET_LEN(obj, strlen(str));
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
SCM_STRING_SET_MUTABLE(obj);
SCM_ASSERT(SCM_STRING_MUTATION_TYPE(obj) == SCM_STR_MUTABLE);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
SCM_STRING_SET_IMMUTABLE(obj);
SCM_ASSERT(SCM_STRING_MUTATION_TYPE(obj) == SCM_STR_IMMUTABLE);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_STRING_SET_STR(obj, aligned_strdup(str));
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmString, obj);
if (str)
SCM_ASSERT(strcmp(SCM_STRING_STR(obj), str) == 0);
SCM_STRING_SET_LEN(obj, strlen(str));
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
SCM_STRING_SET_MUTABLE(obj);
SCM_ASSERT(SCM_STRING_MUTATION_TYPE(obj) == SCM_STR_MUTABLE);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
SCM_STRING_SET_IMMUTABLE(obj);
SCM_ASSERT(SCM_STRING_MUTATION_TYPE(obj) == SCM_STR_IMMUTABLE);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmString, obj);
SCM_ASSERT(strlen(str) == SCM_STRING_LEN(obj));
@@ -433,17 +433,17 @@
/* entyping */
SCM_ENTYPE_VECTOR(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmVector, obj);
/* unmarked state */
SCM_VECTOR_SET_VEC(obj, vec);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmVector, obj);
SCM_ASSERT(SCM_VECTOR_VEC(obj) == vec);
SCM_VECTOR_SET_LEN(obj, len);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmVector, obj);
SCM_ASSERT(SCM_VECTOR_LEN(obj) == len);
@@ -458,16 +458,16 @@
SCM_ASSERT(SCM_INT_VALUE(SCM_VECTOR_VEC(obj)[0]) == 3);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_VECTOR_SET_VEC(obj, vec);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmVector, obj);
SCM_ASSERT(SCM_VECTOR_VEC(obj) == vec);
SCM_VECTOR_SET_LEN(obj, len);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmVector, obj);
SCM_ASSERT(SCM_VECTOR_LEN(obj) == len);
@@ -492,32 +492,32 @@
/* entyping */
SCM_ENTYPE_FUNC(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmFunc, obj);
/* unmarked state */
SCM_FUNC_SET_CFUNC(obj, funcptr);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmFunc, obj);
SCM_ASSERT(SCM_FUNC_CFUNC(obj) == funcptr);
SCM_FUNC_SET_TYPECODE(obj, SCM_PROCEDURE_FIXED_TAIL_REC);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmFunc, obj);
SCM_ASSERT(SCM_FUNC_TYPECODE(obj) == SCM_PROCEDURE_FIXED_TAIL_REC);
SCM_ASSERT(SCM_FUNC_CFUNC(obj) == funcptr);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_FUNC_SET_CFUNC(obj, funcptr);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmFunc, obj);
SCM_ASSERT(SCM_FUNC_CFUNC(obj) == funcptr);
SCM_FUNC_SET_TYPECODE(obj, SCM_PROCEDURE_FIXED_TAIL_REC);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmFunc, obj);
SCM_ASSERT(SCM_FUNC_TYPECODE(obj) == SCM_PROCEDURE_FIXED_TAIL_REC);
SCM_ASSERT(SCM_FUNC_CFUNC(obj) == funcptr);
@@ -535,31 +535,31 @@
/* entyping */
SCM_ENTYPE_PORT(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmPort, obj);
/* unmarked state */
SCM_PORT_SET_FLAG(obj, SCM_PORTFLAG_INPUT);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmPort, obj);
SCM_ASSERT(SCM_PORT_FLAG(obj) == SCM_PORTFLAG_INPUT);
SCM_PORT_SET_IMPL(obj, port);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmPort, obj);
SCM_ASSERT(SCM_PORT_IMPL(obj) == port);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_PORT_SET_FLAG(obj, SCM_PORTFLAG_INPUT);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmPort, obj);
SCM_ASSERT(SCM_PORT_FLAG(obj) == SCM_PORTFLAG_INPUT);
SCM_PORT_SET_IMPL(obj, port);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmPort, obj);
SCM_ASSERT(SCM_PORT_IMPL(obj) == port);
@@ -574,31 +574,31 @@
/* entyping */
SCM_ENTYPE_CONTINUATION(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmContinuation, obj);
/* unmarked state */
SCM_CONTINUATION_SET_OPAQUE(obj, val);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmContinuation, obj);
SCM_ASSERT(SCM_CONTINUATION_OPAQUE(obj) == val);
SCM_CONTINUATION_SET_TAG(obj, 10);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmContinuation, obj);
SCM_ASSERT(SCM_CONTINUATION_TAG(obj) == 10);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_CONTINUATION_SET_OPAQUE(obj, val);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmContinuation, obj);
SCM_ASSERT(SCM_CONTINUATION_OPAQUE(obj) == val);
SCM_CONTINUATION_SET_TAG(obj, 10);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmContinuation, obj);
SCM_ASSERT(SCM_CONTINUATION_TAG(obj) == 10);
@@ -615,22 +615,22 @@
/* entyping */
SCM_ENTYPE_VALUEPACKET(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmValuePacket, obj);
/* unmarked state */
SCM_VALUEPACKET_SET_VALUES(obj, values);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmValuePacket, obj);
SCM_ASSERT(SCM_EQ(SCM_VALUEPACKET_VALUES(obj), values));
SCM_ASSERT(SCM_CONSP(SCM_VALUEPACKET_VALUES(obj)));
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_VALUEPACKET_SET_VALUES(obj, values);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmValuePacket, obj);
SCM_ASSERT(SCM_EQ(SCM_VALUEPACKET_VALUES(obj), values));
SCM_ASSERT(SCM_CONSP(SCM_VALUEPACKET_VALUES(obj)));
@@ -697,21 +697,21 @@
/* entyping state */
SCM_ENTYPE_C_POINTER(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCPointer, obj);
/* unmarked state */
SCM_C_POINTER_SET_VALUE(obj, data);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCPointer, obj);
SCM_ASSERT(SCM_C_POINTER_VALUE(obj) == data);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_C_POINTER_SET_VALUE(obj, data);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmCPointer, obj);
SCM_ASSERT(SCM_C_POINTER_VALUE(obj) == data);
@@ -727,21 +727,21 @@
/* entyping */
SCM_ENTYPE_C_FUNCPOINTER(obj);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCFuncPointer, obj);
/* unmarked state */
SCM_C_FUNCPOINTER_SET_VALUE(obj, funcptr);
- SCM_ASSERT(SCM_IS_UNMARKED(obj));
+ SCM_ASSERT(SCM_UNMARKEDP(obj));
check_type(ScmCFuncPointer, obj);
SCM_ASSERT(SCM_C_FUNCPOINTER_VALUE(obj) == (ScmCFunc)funcptr);
/* marked state */
- SCM_DO_MARK(obj);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_MARK(obj);
+ SCM_ASSERT(SCM_MARKEDP(obj));
SCM_C_FUNCPOINTER_SET_VALUE(obj, funcptr);
- SCM_ASSERT(SCM_IS_MARKED(obj));
+ SCM_ASSERT(SCM_MARKEDP(obj));
check_type(ScmCFuncPointer, obj);
SCM_ASSERT(SCM_C_FUNCPOINTER_VALUE(obj) == (ScmCFunc)funcptr);
More information about the uim-commit
mailing list