[uim-commit] r3046 - branches/r5rs/sigscheme/src
yamaken at freedesktop.org
yamaken at freedesktop.org
Tue Jan 31 11:23:57 PST 2006
Author: yamaken
Date: 2006-01-31 11:23:52 -0800 (Tue, 31 Jan 2006)
New Revision: 3046
Modified:
branches/r5rs/sigscheme/src/eval.c
branches/r5rs/sigscheme/src/module.c
branches/r5rs/sigscheme/src/sigscheme.h
branches/r5rs/sigscheme/src/storage-compact.h
branches/r5rs/sigscheme/src/storage.c
branches/r5rs/sigscheme/src/test-compact.c
branches/r5rs/sigscheme/src/write.c
Log:
* sigscheme/src/storage-compact.h
- (SCM_SAL_SYMBOL_NAME, SCM_SAL_STRING_STR, SCM_SAL_VECTOR_VEC,
SCM_SAL_PORT_IMPL, SCM_SAL_CONTINUATION_OPAQUE,
SCM_SAL_C_POINTER_VALUE): Cosmetic change
* sigscheme/src/test-compact.c
- (ASSERT_TYPE, typecode2typestr, aligned_strdup, scm_check_vector,
scm_check_port, scm_check_freecell, main): Ditto
* sigscheme/src/storage.c
- (SCM_CONSTANT_BIND_SUBSTANCE, scm_type): Ditto
* sigscheme/src/eval.c
- (reduce): Ditto
* sigscheme/src/write.c
- (write_errobj, hash_grow, hash_lookup, write_ss_scan): Ditto
* sigscheme/src/sigscheme.h
- (register_reduction_operator, scm_register_syntax_fixed_tailrec_0,
scm_register_syntax_fixed_tailrec_1,
scm_register_syntax_fixed_tailrec_2,
scm_register_syntax_fixed_tailrec_3,
scm_register_syntax_fixed_tailrec_4,
scm_register_syntax_fixed_tailrec_5,
scm_register_syntax_variadic_tailrec_0,
scm_register_syntax_variadic_tailrec_1,
scm_register_syntax_variadic_tailrec_2,
scm_register_syntax_variadic_tailrec_3,
scm_register_syntax_variadic_tailrec_4,
scm_register_syntax_variadic_tailrec_5,
scm_register_procedure_fixed_tailrec_0,
scm_register_procedure_fixed_tailrec_1,
scm_register_procedure_fixed_tailrec_2,
scm_register_procedure_fixed_tailrec_3,
scm_register_procedure_fixed_tailrec_4,
scm_register_procedure_fixed_tailrec_5,
scm_register_procedure_variadic_tailrec_0,
scm_register_procedure_variadic_tailrec_1,
scm_register_procedure_variadic_tailrec_2,
scm_register_procedure_variadic_tailrec_3,
scm_register_procedure_variadic_tailrec_4,
scm_register_procedure_variadic_tailrec_5): Ditto
* sigscheme/src/module.c
- (register_reduction_operator, scm_register_syntax_fixed_tailrec_0,
scm_register_syntax_fixed_tailrec_1,
scm_register_syntax_fixed_tailrec_2,
scm_register_syntax_fixed_tailrec_3,
scm_register_syntax_fixed_tailrec_4,
scm_register_syntax_fixed_tailrec_5,
scm_register_syntax_variadic_tailrec_0,
scm_register_syntax_variadic_tailrec_1,
scm_register_syntax_variadic_tailrec_2,
scm_register_syntax_variadic_tailrec_3,
scm_register_syntax_variadic_tailrec_4,
scm_register_syntax_variadic_tailrec_5,
scm_register_procedure_fixed_tailrec_0,
scm_register_procedure_fixed_tailrec_1,
scm_register_procedure_fixed_tailrec_2,
scm_register_procedure_fixed_tailrec_3,
scm_register_procedure_fixed_tailrec_4,
scm_register_procedure_fixed_tailrec_5,
scm_register_procedure_variadic_tailrec_0,
scm_register_procedure_variadic_tailrec_1,
scm_register_procedure_variadic_tailrec_2,
scm_register_procedure_variadic_tailrec_3,
scm_register_procedure_variadic_tailrec_4,
scm_register_procedure_variadic_tailrec_5): Ditto
Modified: branches/r5rs/sigscheme/src/eval.c
===================================================================
--- branches/r5rs/sigscheme/src/eval.c 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/eval.c 2006-01-31 19:23:52 UTC (rev 3046)
@@ -156,7 +156,7 @@
/* Reduce upto the penult. */
state = SCM_REDUCE_PARTWAY;
- FOR_EACH_BUTLAST(right, args) {
+ FOR_EACH_BUTLAST (right, args) {
if (need_eval)
right = EVAL(right, env);
left = (*func)(left, right, &state);
Modified: branches/r5rs/sigscheme/src/module.c
===================================================================
--- branches/r5rs/sigscheme/src/module.c 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/module.c 2006-01-31 19:23:52 UTC (rev 3046)
@@ -217,7 +217,7 @@
}
/* Not implemented yet. */
-void scm_register_reduction_operator(const char *name, ScmObj (*func)(ScmObj, ScmObj, enum ScmReductionState*))
+void scm_register_reduction_operator(const char *name, ScmObj (*func)(ScmObj, ScmObj, enum ScmReductionState *))
{
scm_register_func(name, func, SCM_REDUCTION_OPERATOR);
}
@@ -264,41 +264,41 @@
}
#endif
-void scm_register_syntax_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 0);
}
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_syntax_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 1);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_syntax_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 2);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_syntax_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 3);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_syntax_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 4);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_syntax_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_FIXED_TAIL_REC | 5);
}
@@ -344,41 +344,41 @@
}
#endif
-void scm_register_syntax_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 0);
}
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_syntax_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 1);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_syntax_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 2);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_syntax_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 3);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_syntax_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 4);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_syntax_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_syntax_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_SYNTAX_VARIADIC_TAIL_REC | 5);
}
@@ -424,41 +424,41 @@
}
#endif
-void scm_register_procedure_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 0);
}
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_procedure_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 1);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_procedure_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 2);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_procedure_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 3);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_procedure_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 4);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_procedure_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_FIXED_TAIL_REC | 5);
}
@@ -504,41 +504,41 @@
}
#endif
-void scm_register_procedure_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 0);
}
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_procedure_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 1);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_procedure_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 2);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_procedure_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 3);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_procedure_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 4);
}
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_procedure_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*))
+void scm_register_procedure_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *))
{
scm_register_func(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 5);
}
Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/sigscheme.h 2006-01-31 19:23:52 UTC (rev 3046)
@@ -964,7 +964,7 @@
void scm_define_alias(const char *newsym, const char *sym);
/* Procedure/Syntax Registration */
-void scm_register_reduction_operator(const char *name, ScmObj (*func)(ScmObj, ScmObj, enum ScmReductionState*));
+void scm_register_reduction_operator(const char *name, ScmObj (*func)(ScmObj, ScmObj, enum ScmReductionState *));
void scm_register_syntax_fixed_0(const char *name, ScmObj (*func)(ScmObj));
#if SCM_FUNCTYPE_MAND_MAX >= 1
void scm_register_syntax_fixed_1(const char *name, ScmObj (*func)(ScmObj, ScmObj));
@@ -981,21 +981,21 @@
#if SCM_FUNCTYPE_MAND_MAX >= 5
void scm_register_syntax_fixed_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj));
#endif
-void scm_register_syntax_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState *));
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_syntax_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_syntax_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_syntax_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_syntax_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_syntax_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
void scm_register_syntax_variadic_0(const char *name, ScmObj (*func)(ScmObj, ScmObj));
#if SCM_FUNCTYPE_MAND_MAX >= 1
@@ -1013,21 +1013,21 @@
#if SCM_FUNCTYPE_MAND_MAX >= 5
void scm_register_syntax_variadic_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj));
#endif
-void scm_register_syntax_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *));
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_syntax_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_syntax_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_syntax_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_syntax_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_syntax_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_syntax_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
void scm_register_procedure_fixed_0(const char *name, ScmObj (*func)());
#if SCM_FUNCTYPE_MAND_MAX >= 1
@@ -1045,21 +1045,21 @@
#if SCM_FUNCTYPE_MAND_MAX >= 5
void scm_register_procedure_fixed_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj));
#endif
-void scm_register_procedure_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_0(const char *name, ScmObj (*func)(ScmEvalState *));
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_procedure_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_procedure_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_procedure_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_procedure_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_procedure_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_fixed_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
void scm_register_procedure_variadic_0(const char *name, ScmObj (*func)(ScmObj));
#if SCM_FUNCTYPE_MAND_MAX >= 1
@@ -1077,21 +1077,21 @@
#if SCM_FUNCTYPE_MAND_MAX >= 5
void scm_register_procedure_variadic_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj));
#endif
-void scm_register_procedure_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_0(const char *name, ScmObj (*func)(ScmObj, ScmEvalState *));
#if SCM_FUNCTYPE_MAND_MAX >= 1
-void scm_register_procedure_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_1(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 2
-void scm_register_procedure_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_2(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 3
-void scm_register_procedure_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_3(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 4
-void scm_register_procedure_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_4(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
#if SCM_FUNCTYPE_MAND_MAX >= 5
-void scm_register_procedure_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
+void scm_register_procedure_variadic_tailrec_5(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *));
#endif
/* alloc.c */
Modified: branches/r5rs/sigscheme/src/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/src/storage-compact.h 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/storage-compact.h 2006-01-31 19:23:52 UTC (rev 3046)
@@ -140,15 +140,15 @@
* Required Data Aligment:
*
* Symbol
- * name (char*) : 8 byte
+ * name (char *) : 8 byte
* String
- * str (char*) : 4 byte
+ * str (char *) : 4 byte
* Vector
- * vec (ScmObj*) : 2 byte
+ * vec (ScmObj *) : 2 byte
* Port
- * impl (ScmCharPort*) : 2 byte
+ * impl (ScmCharPort *) : 2 byte
* Continuation
- * opaque (void*) : 2 byte
+ * opaque (void *) : 2 byte
*/
/*=======================================
@@ -848,7 +848,7 @@
* Symbol
*/
#define SCM_SAL_SYMBOL_VCELL(a) ((ScmObj)SCM_OTHERS_CAR_VAL((a), SYMBOL))
-#define SCM_SAL_SYMBOL_NAME(a) ((char*) SCM_OTHERS_CDR_VAL((a), SYMBOL))
+#define SCM_SAL_SYMBOL_NAME(a) ((char *) SCM_OTHERS_CDR_VAL((a), SYMBOL))
#define SCM_SAL_SYMBOL_SET_VCELL(a, val) \
SCM_OTHERS_SET_CAR_VAL((a), SYMBOL, (val))
#define SCM_SAL_SYMBOL_SET_NAME(a, val) \
@@ -885,7 +885,7 @@
#define SCM_SAL_STRING_SET_IMMUTABLE(a) \
SCM_STRING_SET_MUTATION_TYPE((a), SCM_STR_IMMUTABLE)
#define SCM_SAL_STRING_STR(a) \
- ((char*)SCM_OTHERS_STRING_STRIP_MUTATIONBIT(SCM_OTHERS_CAR_VAL((a), STRING)))
+ ((char *)SCM_OTHERS_STRING_STRIP_MUTATIONBIT(SCM_OTHERS_CAR_VAL((a), STRING)))
#define SCM_SAL_STRING_SET_STR(a, val) \
SCM_OTHERS_SET_CAR_VAL((a), \
STRING, \
@@ -942,7 +942,7 @@
/*
* Vector
*/
-#define SCM_SAL_VECTOR_VEC(a) ((ScmObj*)SCM_OTHERS_CAR_VAL((a), VECTOR))
+#define SCM_SAL_VECTOR_VEC(a) ((ScmObj *)SCM_OTHERS_CAR_VAL((a), VECTOR))
#define SCM_SAL_VECTOR_LEN(a) ((int)SCM_OTHERS_CDR_VAL((a), VECTOR))
#define SCM_SAL_VECTOR_SET_VEC(a, val) \
SCM_OTHERS_SET_CAR_VAL((a), VECTOR, (val))
@@ -978,7 +978,7 @@
/*
* Port
*/
-#define SCM_SAL_PORT_IMPL(a) ((ScmCharPort*) SCM_OTHERS_CAR_VAL((a), PORT))
+#define SCM_SAL_PORT_IMPL(a) ((ScmCharPort *) SCM_OTHERS_CAR_VAL((a), PORT))
#define SCM_SAL_PORT_FLAG(a) ((enum ScmPortFlag)SCM_OTHERS_CDR_VAL((a), PORT))
#define SCM_SAL_PORT_SET_IMPL(a, val) SCM_OTHERS_SET_CAR_VAL((a), PORT, (val))
#define SCM_SAL_PORT_SET_FLAG(a, val) SCM_OTHERS_SET_CDR_VAL((a), PORT, (val))
@@ -987,7 +987,7 @@
* Continuation
*/
#define SCM_SAL_CONTINUATION_OPAQUE(a) \
- ((void*)SCM_OTHERS_CAR_VAL((a), CONTINUATION))
+ ((void *)SCM_OTHERS_CAR_VAL((a), CONTINUATION))
#define SCM_SAL_CONTINUATION_TAG(a) \
((int) SCM_OTHERS_CDR_VAL((a), CONTINUATION))
#define SCM_SAL_CONTINUATION_SET_OPAQUE(a, val) \
@@ -999,7 +999,7 @@
* CPointer
*/
#define SCM_SAL_C_POINTER_VALUE(a) \
- ((void*)SCM_OTHERS_CAR_VAL((a), C_POINTER))
+ ((void *)SCM_OTHERS_CAR_VAL((a), C_POINTER))
#define SCM_SAL_C_POINTER_SET_VALUE(a, val) \
SCM_OTHERS_SET_CAR_VAL((a), C_POINTER, (val))
Modified: branches/r5rs/sigscheme/src/storage.c
===================================================================
--- branches/r5rs/sigscheme/src/storage.c 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/storage.c 2006-01-31 19:23:52 UTC (rev 3046)
@@ -54,11 +54,11 @@
=======================================*/
#if !SCM_OBJ_COMPACT
/* special constant initialization */
-#define SCM_CONSTANT_BIND_SUBSTANCE(obj, cell) \
- do { \
- (obj) = &(cell); \
- SCM_ENTYPE((obj), ScmConstant); \
- } while(/* CONSTCOND */ 0)
+#define SCM_CONSTANT_BIND_SUBSTANCE(obj, cell) \
+ do { \
+ (obj) = &(cell); \
+ SCM_ENTYPE((obj), ScmConstant); \
+ } while (/* CONSTCOND */ 0)
#endif /* SCM_OBJ_COMPACT */
/*=======================================
@@ -431,7 +431,7 @@
return ScmCFuncPointer;
else if (FREECELLP(obj))
return ScmFreeCell;
- ERR("invalid others object: ptr = %p", (void*)obj);
+ ERR("invalid others object: ptr = %p", (void *)obj);
case SCM_TAG_IMM:
if (INTP(obj))
@@ -440,10 +440,10 @@
return ScmChar;
else if (SCM_CONSTANTP(obj))
return ScmConstant;
- ERR("invalid imm object: ptr = %p", (void*)obj);
+ ERR("invalid imm object: ptr = %p", (void *)obj);
default:
- ERR("invalid object: ptr = %p", (void*)obj);
+ ERR("invalid object: ptr = %p", (void *)obj);
}
/* NOTREACHED */
Modified: branches/r5rs/sigscheme/src/test-compact.c
===================================================================
--- branches/r5rs/sigscheme/src/test-compact.c 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/test-compact.c 2006-01-31 19:23:52 UTC (rev 3046)
@@ -70,7 +70,7 @@
typecode2typestr(expected), \
typecode2typestr(actual)); \
} \
- } while(0)
+ } while (/* CONSTCOND */ 0)
static int
die(const char *filename, int line)
@@ -79,7 +79,7 @@
return -1;
}
-static const char*
+static const char *
typecode2typestr(enum ScmObjType type)
{
switch (type) {
@@ -192,12 +192,12 @@
return p;
}
-static void*
+static void *
aligned_strdup(const char *str)
{
char *ret = NULL;
if (str) {
- ret = (char*)malloc_aligned(sizeof(char) * strlen(str) + 1);
+ ret = (char *)malloc_aligned(sizeof(char) * strlen(str) + 1);
strcpy(ret, str);
}
@@ -427,7 +427,7 @@
scm_check_vector(unsigned int len)
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
- ScmObj *vec = (ScmObj*)malloc(sizeof(ScmObj) * len);
+ ScmObj *vec = (ScmObj *)malloc(sizeof(ScmObj) * len);
PRINT_SECTION("Vector");
@@ -529,7 +529,7 @@
scm_check_port()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
- ScmCharPort *port = (ScmCharPort*)0x20;
+ ScmCharPort *port = (ScmCharPort *)0x20;
PRINT_SECTION("Port");
@@ -639,7 +639,7 @@
}
ScmObj
- scm_check_freecell()
+scm_check_freecell()
{
ScmObj obj = (ScmObj)malloc(sizeof(ScmCell));
ScmObj next = scm_check_cons();
@@ -806,7 +806,8 @@
SCM_ASSERT(SCM_EQ(SCM_CDR(cons), SCM_DEREF(ref_cdr)));
}
-int main(void)
+int
+main(void)
{
scm_check_int(0);
scm_check_int(1);
@@ -821,18 +822,18 @@
scm_check_string_copying(NULL);
*/
scm_check_closure();
- scm_check_func((void*)0x00000000);
- scm_check_func((void*)0xfffffffe);
- scm_check_func((void*)0xffffffff);
+ scm_check_func((void *)0x00000000);
+ scm_check_func((void *)0xfffffffe);
+ scm_check_func((void *)0xffffffff);
scm_check_vector(0);
scm_check_vector(5);
- scm_check_continuation((void*)NULL);
- scm_check_continuation((void*)0x20);
+ scm_check_continuation((void *)NULL);
+ scm_check_continuation((void *)0x20);
scm_check_value_packet();
scm_check_port();
- scm_check_cpointer((void*)0x00000000);
- scm_check_cpointer((void*)0xfffffffe);
- scm_check_cpointer((void*)0xffffffff);
+ scm_check_cpointer((void *)0x00000000);
+ scm_check_cpointer((void *)0xfffffffe);
+ scm_check_cpointer((void *)0xffffffff);
scm_check_cfunc_pointer((ScmCFunc)0x00000000);
scm_check_cfunc_pointer((ScmCFunc)0xfffffffe);
scm_check_cfunc_pointer((ScmCFunc)0xffffffff);
Modified: branches/r5rs/sigscheme/src/write.c
===================================================================
--- branches/r5rs/sigscheme/src/write.c 2006-01-31 17:53:38 UTC (rev 3045)
+++ branches/r5rs/sigscheme/src/write.c 2006-01-31 19:23:52 UTC (rev 3046)
@@ -498,7 +498,7 @@
SCM_ASSERT(scm_false);
}
- FOR_EACH(elm, objs) {
+ FOR_EACH (elm, objs) {
scm_port_put_char(port, ' ');
scm_write_to_port(port, elm);
}
@@ -522,10 +522,10 @@
tab->size = new_size;
tab->used = 0;
- for (i=0; i < old_size; i++)
+ for (i = 0; i < old_size; i++)
hash_lookup(tab, old_ents[i].key, old_ents[i].datum, HASH_INSERT);
- free (old_ents);
+ free(old_ents);
}
/**
@@ -555,7 +555,7 @@
/* We probe linearly, since a) speed isn't a primary concern for
* SigScheme, and b) having a table of primes only for this
* purpose is probably just a waste. */
- for (i=0; i < tab->size; i++) {
+ for (i = 0; i < tab->size; i++) {
ent = &(tab->ents)[(hashval + i) & (tab->size - 1)];
if (!OCCUPIED(ent)) {
if (flag & HASH_INSERT) {
@@ -624,7 +624,7 @@
break;
case ScmVector:
- for (i=0; i < SCM_VECTOR_LEN(obj); i++)
+ for (i = 0; i < SCM_VECTOR_LEN(obj); i++)
write_ss_scan(SCM_VECTOR_VEC(obj)[i], ctx);
break;
More information about the uim-commit
mailing list