[uim-commit] r3042 - branches/r5rs/sigscheme/src
yamaken at freedesktop.org
yamaken at freedesktop.org
Mon Jan 30 01:42:48 PST 2006
Author: yamaken
Date: 2006-01-30 01:42:42 -0800 (Mon, 30 Jan 2006)
New Revision: 3042
Modified:
branches/r5rs/sigscheme/src/module-srfi1.c
branches/r5rs/sigscheme/src/number.c
branches/r5rs/sigscheme/src/sigscheme.h
branches/r5rs/sigscheme/src/vector.c
Log:
* sigscheme/src/sigscheme.h
- (scm_p_list_ref, scm_p_abs, scm_p_quotient, scm_p_modulo,
scm_p_remainder, scm_p_vector_ref, scm_p_vector_setd,
scm_p_srfi1_list_tabulate): Rename argument
* sigscheme/src/module-srfi1.c
- (scm_p_srfi1_list_tabulate): Ditto
* sigscheme/src/number.c
- (scm_p_abs, scm_p_quotient, scm_p_modulo, scm_p_remainder): Ditto
* sigscheme/src/vector.c
- (scm_p_vector_ref, scm_p_vector_setd): Ditto
Modified: branches/r5rs/sigscheme/src/module-srfi1.c
===================================================================
--- branches/r5rs/sigscheme/src/module-srfi1.c 2006-01-30 09:23:19 UTC (rev 3041)
+++ branches/r5rs/sigscheme/src/module-srfi1.c 2006-01-30 09:42:42 UTC (rev 3042)
@@ -133,7 +133,7 @@
}
ScmObj
-scm_p_srfi1_list_tabulate(ScmObj scm_n, ScmObj args)
+scm_p_srfi1_list_tabulate(ScmObj _n, ScmObj args)
{
ScmObj proc = SCM_FALSE;
ScmObj head = SCM_NULL;
@@ -142,10 +142,10 @@
scm_int_t i = 0;
DECLARE_FUNCTION("list-tabulate", procedure_variadic_1);
- ENSURE_INT(scm_n);
+ ENSURE_INT(_n);
/* get n */
- n = SCM_INT_VALUE(scm_n);
+ n = SCM_INT_VALUE(_n);
/* get init_proc if available */
if (!NULLP(args))
Modified: branches/r5rs/sigscheme/src/number.c
===================================================================
--- branches/r5rs/sigscheme/src/number.c 2006-01-30 09:23:19 UTC (rev 3041)
+++ branches/r5rs/sigscheme/src/number.c 2006-01-30 09:42:42 UTC (rev 3042)
@@ -333,29 +333,29 @@
ScmObj
-scm_p_abs(ScmObj scm_n)
+scm_p_abs(ScmObj _n)
{
scm_int_t n;
DECLARE_FUNCTION("abs", procedure_fixed_1);
- ENSURE_INT(scm_n);
+ ENSURE_INT(_n);
- n = SCM_INT_VALUE(scm_n);
+ n = SCM_INT_VALUE(_n);
- return (n < 0) ? MAKE_INT(-n) : scm_n;
+ return (n < 0) ? MAKE_INT(-n) : _n;
}
ScmObj
-scm_p_quotient(ScmObj scm_n1, ScmObj scm_n2)
+scm_p_quotient(ScmObj _n1, ScmObj _n2)
{
scm_int_t n1, n2;
DECLARE_FUNCTION("quotient", procedure_fixed_2);
- ENSURE_INT(scm_n1);
- ENSURE_INT(scm_n2);
+ ENSURE_INT(_n1);
+ ENSURE_INT(_n2);
- n1 = SCM_INT_VALUE(scm_n1);
- n2 = SCM_INT_VALUE(scm_n2);
+ n1 = SCM_INT_VALUE(_n1);
+ n2 = SCM_INT_VALUE(_n2);
if (n2 == 0)
ERR("division by zero");
@@ -364,16 +364,16 @@
}
ScmObj
-scm_p_modulo(ScmObj scm_n1, ScmObj scm_n2)
+scm_p_modulo(ScmObj _n1, ScmObj _n2)
{
scm_int_t n1, n2, rem;
DECLARE_FUNCTION("modulo", procedure_fixed_2);
- ENSURE_INT(scm_n1);
- ENSURE_INT(scm_n2);
+ ENSURE_INT(_n1);
+ ENSURE_INT(_n2);
- n1 = SCM_INT_VALUE(scm_n1);
- n2 = SCM_INT_VALUE(scm_n2);
+ n1 = SCM_INT_VALUE(_n1);
+ n2 = SCM_INT_VALUE(_n2);
if (n2 == 0)
ERR("division by zero");
@@ -389,16 +389,16 @@
}
ScmObj
-scm_p_remainder(ScmObj scm_n1, ScmObj scm_n2)
+scm_p_remainder(ScmObj _n1, ScmObj _n2)
{
scm_int_t n1, n2;
DECLARE_FUNCTION("remainder", procedure_fixed_2);
- ENSURE_INT(scm_n1);
- ENSURE_INT(scm_n2);
+ ENSURE_INT(_n1);
+ ENSURE_INT(_n2);
- n1 = SCM_INT_VALUE(scm_n1);
- n2 = SCM_INT_VALUE(scm_n2);
+ n1 = SCM_INT_VALUE(_n1);
+ n2 = SCM_INT_VALUE(_n2);
if (n2 == 0)
ERR("division by zero");
Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h 2006-01-30 09:23:19 UTC (rev 3041)
+++ branches/r5rs/sigscheme/src/sigscheme.h 2006-01-30 09:42:42 UTC (rev 3042)
@@ -1197,7 +1197,7 @@
ScmObj scm_p_append(ScmObj args);
ScmObj scm_p_reverse(ScmObj lst);
ScmObj scm_p_list_tail(ScmObj lst, ScmObj k);
-ScmObj scm_p_list_ref(ScmObj lst, ScmObj scm_k);
+ScmObj scm_p_list_ref(ScmObj lst, ScmObj k);
ScmObj scm_p_memq(ScmObj obj, ScmObj lst);
ScmObj scm_p_memv(ScmObj obj, ScmObj lst);
ScmObj scm_p_member(ScmObj obj, ScmObj lst);
@@ -1228,10 +1228,10 @@
ScmObj scm_p_evenp(ScmObj n);
ScmObj scm_p_max(ScmObj left, ScmObj right, enum ScmReductionState *state);
ScmObj scm_p_min(ScmObj left, ScmObj right, enum ScmReductionState *state);
-ScmObj scm_p_abs(ScmObj scm_n);
-ScmObj scm_p_quotient(ScmObj scm_n1, ScmObj scm_n2);
-ScmObj scm_p_modulo(ScmObj scm_n1, ScmObj scm_n2);
-ScmObj scm_p_remainder(ScmObj scm_n1, ScmObj scm_n2);
+ScmObj scm_p_abs(ScmObj _n);
+ScmObj scm_p_quotient(ScmObj _n1, ScmObj _n2);
+ScmObj scm_p_modulo(ScmObj _n1, ScmObj _n2);
+ScmObj scm_p_remainder(ScmObj _n1, ScmObj _n2);
ScmObj scm_p_number2string (ScmObj num, ScmObj args);
ScmObj scm_p_string2number(ScmObj str, ScmObj args);
@@ -1286,8 +1286,8 @@
ScmObj scm_p_make_vector(ScmObj scm_len, ScmObj args);
ScmObj scm_p_vector(ScmObj args);
ScmObj scm_p_vector_length(ScmObj vec);
-ScmObj scm_p_vector_ref(ScmObj vec, ScmObj scm_k);
-ScmObj scm_p_vector_setd(ScmObj vec, ScmObj scm_k, ScmObj obj);
+ScmObj scm_p_vector_ref(ScmObj vec, ScmObj _k);
+ScmObj scm_p_vector_setd(ScmObj vec, ScmObj _k, ScmObj obj);
ScmObj scm_p_vector2list(ScmObj vec);
ScmObj scm_p_list2vector(ScmObj lst);
ScmObj scm_p_vector_filld(ScmObj vec, ScmObj fill);
@@ -1419,7 +1419,7 @@
ScmObj scm_p_srfi1_xcons(ScmObj a, ScmObj b);
ScmObj scm_p_srfi1_consstar(ScmObj args);
ScmObj scm_p_srfi1_make_list(ScmObj length, ScmObj args);
-ScmObj scm_p_srfi1_list_tabulate(ScmObj scm_n, ScmObj args);
+ScmObj scm_p_srfi1_list_tabulate(ScmObj _n, ScmObj args);
ScmObj scm_p_srfi1_list_copy(ScmObj lst);
ScmObj scm_p_srfi1_circular_list(ScmObj args);
ScmObj scm_p_srfi1_iota(ScmObj scm_count, ScmObj args);
Modified: branches/r5rs/sigscheme/src/vector.c
===================================================================
--- branches/r5rs/sigscheme/src/vector.c 2006-01-30 09:23:19 UTC (rev 3041)
+++ branches/r5rs/sigscheme/src/vector.c 2006-01-30 09:42:42 UTC (rev 3042)
@@ -119,24 +119,24 @@
}
ScmObj
-scm_p_vector_ref(ScmObj vec, ScmObj scm_k)
+scm_p_vector_ref(ScmObj vec, ScmObj _k)
{
scm_int_t k;
DECLARE_FUNCTION("vector-ref", procedure_fixed_2);
ENSURE_VECTOR(vec);
- ENSURE_INT(scm_k);
+ ENSURE_INT(_k);
- k = SCM_INT_VALUE(scm_k);
+ k = SCM_INT_VALUE(_k);
if (!SCM_VECTOR_VALID_INDEXP(vec, k))
- ERR_OBJ("index out of range", scm_k);
+ ERR_OBJ("index out of range", _k);
return SCM_VECTOR_VEC(vec)[k];
}
ScmObj
-scm_p_vector_setd(ScmObj vec, ScmObj scm_k, ScmObj obj)
+scm_p_vector_setd(ScmObj vec, ScmObj _k, ScmObj obj)
{
scm_int_t k;
DECLARE_FUNCTION("vector-set!", procedure_fixed_3);
@@ -145,12 +145,12 @@
#if SCM_CONST_VECTOR_LITERAL
ENSURE_MUTABLE_VECTOR(vec);
#endif
- ENSURE_INT(scm_k);
+ ENSURE_INT(_k);
- k = SCM_INT_VALUE(scm_k);
+ k = SCM_INT_VALUE(_k);
if (!SCM_VECTOR_VALID_INDEXP(vec, k))
- ERR_OBJ("index out of range", scm_k);
+ ERR_OBJ("index out of range", _k);
SCM_VECTOR_VEC(vec)[k] = obj;
More information about the uim-commit
mailing list