This is my first patch to unif.c, only cosmetic change.
Thanks,
Masao
--- unif.c.orig Mon May 21 16:03:59 2001
+++ unif.c.2 Mon May 21 16:11:28 2001
@@ -307,7 +307,7 @@
v = SCM_ARRAY_V (v);
}
if (nprot)
- return SCM_BOOL(nprot);
+ return SCM_BOOL (nprot);
else
{
int protp = 0;
@@ -317,13 +317,13 @@
case scm_tc7_bvect:
protp = (SCM_EQ_P (prot, SCM_BOOL_T));
case scm_tc7_string:
- protp = SCM_CHARP(prot) && (SCM_CHAR (prot) != '\0');
+ protp = SCM_CHARP (prot) && (SCM_CHAR (prot) != '\0');
case scm_tc7_byvect:
protp = SCM_EQ_P (prot, SCM_MAKE_CHAR ('\0'));
case scm_tc7_uvect:
- protp = SCM_INUMP(prot) && SCM_INUM(prot)>0;
+ protp = SCM_INUMP (prot) && SCM_INUM(prot)>0;
case scm_tc7_ivect:
- protp = SCM_INUMP(prot) && SCM_INUM(prot)<=0;
+ protp = SCM_INUMP (prot) && SCM_INUM(prot)<=0;
case scm_tc7_svect:
protp = SCM_SYMBOLP (prot)
@@ -338,17 +338,17 @@
case scm_tc7_fvect:
protp = singp (prot);
case scm_tc7_dvect:
- protp = SCM_REALP(prot);
+ protp = SCM_REALP (prot);
case scm_tc7_cvect:
- protp = SCM_COMPLEXP(prot);
+ protp = SCM_COMPLEXP (prot);
case scm_tc7_vector:
case scm_tc7_wvect:
- protp = SCM_NULLP(prot);
+ protp = SCM_NULLP (prot);
default:
/* no default */
;
}
- return SCM_BOOL(protp);
+ return SCM_BOOL (protp);
}
}
#undef FUNC_NAME
@@ -525,7 +525,7 @@
SCM ra;
SCM_NEWCELL (ra);
SCM_DEFER_INTS;
- SCM_NEWSMOB(ra, ((long) ndim << 17) + scm_tc16_array,
+ SCM_NEWSMOB (ra, ((long) ndim << 17) + scm_tc16_array,
scm_must_malloc ((long) (sizeof (scm_array) + ndim * sizeof
(scm_array_dim)),
"array"));
SCM_ARRAY_V (ra) = scm_nullvect;
@@ -1066,14 +1066,14 @@
{
unsigned long int length = SCM_INUM (scm_uniform_vector_length (v));
SCM_ASRTGO (SCM_NULLP (args) && SCM_INUMP (ind), wna);
- return SCM_BOOL(pos >= 0 && pos < length);
+ return SCM_BOOL (pos >= 0 && pos < length);
}
}
}
#undef FUNC_NAME
-SCM_REGISTER_PROC(s_array_ref, "array-ref", 1, 0, 1, scm_uniform_vector_ref);
+SCM_REGISTER_PROC (s_array_ref, "array-ref", 1, 0, 1, scm_uniform_vector_ref);
SCM_DEFINE (scm_uniform_vector_ref, "uniform-vector-ref", 2, 0, 0,
@@ -1186,7 +1186,7 @@
default:
SCM_WRONG_TYPE_ARG (SCM_ARG1, v);
case scm_tc7_bvect:
- if (SCM_BITVEC_REF(v,pos))
+ if (SCM_BITVEC_REF (v,pos))
return SCM_BOOL_T;
else
return SCM_BOOL_F;
@@ -1249,7 +1249,7 @@
#undef FUNC_NAME
-SCM_REGISTER_PROC(s_uniform_array_set1_x, "uniform-array-set1!", 3, 0, 0,
scm_array_set_x);
+SCM_REGISTER_PROC (s_uniform_array_set1_x, "uniform-array-set1!", 3, 0, 0,
+scm_array_set_x);
/* Note that args may be a list or an immediate object, depending which
@@ -1275,7 +1275,7 @@
unsigned long int length;
if (SCM_NIMP (args))
{
- SCM_ASSERT (SCM_CONSP(args) && SCM_INUMP (SCM_CAR (args)), args,
+ SCM_ASSERT (SCM_CONSP (args) && SCM_INUMP (SCM_CAR (args)), args,
SCM_ARG3, FUNC_NAME);
SCM_ASRTGO (SCM_NULLP (SCM_CDR (args)), wna);
pos = SCM_INUM (SCM_CAR (args));
@@ -1300,9 +1300,9 @@
goto badarg1;
case scm_tc7_bvect:
if (SCM_FALSEP (obj))
- SCM_BITVEC_CLR(v,pos);
+ SCM_BITVEC_CLR (v,pos);
else if (SCM_EQ_P (obj, SCM_BOOL_T))
- SCM_BITVEC_SET(v,pos);
+ SCM_BITVEC_SET (v,pos);
else
badobj:SCM_WRONG_TYPE_ARG (2, obj);
break;
@@ -1317,10 +1317,10 @@
((char *) SCM_UVECTOR_BASE (v))[pos] = SCM_INUM (obj);
break;
case scm_tc7_uvect:
- SCM_VELTS(v)[pos] = SCM_PACK (scm_num2ulong(obj, SCM_ARG2, FUNC_NAME));
+ SCM_VELTS (v)[pos] = SCM_PACK (scm_num2ulong(obj, SCM_ARG2, FUNC_NAME));
break;
case scm_tc7_ivect:
- SCM_VELTS(v)[pos] = SCM_PACK (scm_num2long (obj, SCM_ARG2, FUNC_NAME));
+ SCM_VELTS (v)[pos] = SCM_PACK (scm_num2long (obj, SCM_ARG2, FUNC_NAME));
break;
case scm_tc7_svect:
SCM_ASRTGO (SCM_INUMP (obj), badobj);
@@ -1900,7 +1900,7 @@
k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
if (k >= vlen)
scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
- SCM_BITVEC_CLR(v,k);
+ SCM_BITVEC_CLR (v,k);
}
else if (SCM_EQ_P (obj, SCM_BOOL_T))
for (i = SCM_UVECTOR_LENGTH (kv); i;)
@@ -1908,7 +1908,7 @@
k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
if (k >= vlen)
scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
- SCM_BITVEC_SET(v,k);
+ SCM_BITVEC_SET (v,k);
}
else
badarg3:SCM_WRONG_TYPE_ARG (3, obj);
@@ -1917,7 +1917,7 @@
SCM_ASSERT (SCM_BITVECTOR_LENGTH (v) == SCM_BITVECTOR_LENGTH (kv), v, SCM_ARG1,
FUNC_NAME);
if (SCM_FALSEP (obj))
for (k = (SCM_BITVECTOR_LENGTH (v) + SCM_LONG_BIT - 1) / SCM_LONG_BIT; k--;)
- SCM_UNPACK (SCM_VELTS (v)[k]) &= ~ SCM_UNPACK(SCM_VELTS (kv)[k]);
+ SCM_UNPACK (SCM_VELTS (v)[k]) &= ~ SCM_UNPACK (SCM_VELTS (kv)[k]);
else if (SCM_EQ_P (obj, SCM_BOOL_T))
for (k = (SCM_BITVECTOR_LENGTH (v) + SCM_LONG_BIT - 1) / SCM_LONG_BIT; k--;)
SCM_UNPACK (SCM_VELTS (v)[k]) |= SCM_UNPACK (SCM_VELTS (kv)[k]);
@@ -1958,7 +1958,7 @@
k = SCM_UNPACK (SCM_VELTS (kv)[--i]);
if (k >= vlen)
scm_out_of_range (FUNC_NAME, SCM_MAKINUM (k));
- if (!SCM_BITVEC_REF(v,k))
+ if (!SCM_BITVEC_REF (v,k))
count++;
}
else if (SCM_EQ_P (obj, SCM_BOOL_T))
@@ -1990,7 +1990,7 @@
return SCM_MAKINUM (count);
/* urg. repetitive (see above.) */
- k = SCM_UNPACK (SCM_VELTS (kv)[i]) & (fObj ? SCM_UNPACK(SCM_VELTS (v)[i]) :
~SCM_UNPACK (SCM_VELTS (v)[i]));
+ k = SCM_UNPACK (SCM_VELTS (kv)[i]) & (fObj ? SCM_UNPACK (SCM_VELTS (v)[i]) :
+~SCM_UNPACK (SCM_VELTS (v)[i]));
}
}
return SCM_MAKINUM (count);
@@ -2103,9 +2103,9 @@
register unsigned long mask;
for (k = (SCM_BITVECTOR_LENGTH (v) - 1) / SCM_LONG_BIT; k > 0; k--)
for (mask = 1UL << (SCM_LONG_BIT - 1); mask; mask >>= 1)
- res = scm_cons (SCM_BOOL(((long *) data)[k] & mask), res);
+ res = scm_cons (SCM_BOOL (((long *) data)[k] & mask), res);
for (mask = 1L << ((SCM_BITVECTOR_LENGTH (v) % SCM_LONG_BIT) - 1); mask; mask
>>= 1)
- res = scm_cons (SCM_BOOL(((long *) data)[k] & mask), res);
+ res = scm_cons (SCM_BOOL (((long *) data)[k] & mask), res);
return res;
}
case scm_tc7_byvect:
@@ -2118,31 +2118,31 @@
}
case scm_tc7_uvect:
{
- long *data = (long *)SCM_VELTS(v);
- for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(scm_ulong2num(data[k]), res);
+ long *data = (long *)SCM_VELTS (v);
+ for (k = SCM_UVECTOR_LENGTH (v) - 1; k >= 0; k--)
+ res = scm_cons (scm_ulong2num(data[k]), res);
return res;
}
case scm_tc7_ivect:
{
- long *data = (long *)SCM_VELTS(v);
- for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(scm_long2num(data[k]), res);
+ long *data = (long *)SCM_VELTS (v);
+ for (k = SCM_UVECTOR_LENGTH (v) - 1; k >= 0; k--)
+ res = scm_cons (scm_long2num(data[k]), res);
return res;
}
case scm_tc7_svect:
{
- short *data = (short *)SCM_VELTS(v);
- for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(SCM_MAKINUM (data[k]), res);
+ short *data = (short *)SCM_VELTS (v);
+ for (k = SCM_UVECTOR_LENGTH (v) - 1; k >= 0; k--)
+ res = scm_cons (SCM_MAKINUM (data[k]), res);
return res;
}
#ifdef HAVE_LONG_LONGS
case scm_tc7_llvect:
{
- long_long *data = (long_long *)SCM_VELTS(v);
- for (k = SCM_UVECTOR_LENGTH(v) - 1; k >= 0; k--)
- res = scm_cons(scm_long_long2num(data[k]), res);
+ long_long *data = (long_long *)SCM_VELTS (v);
+ for (k = SCM_UVECTOR_LENGTH (v) - 1; k >= 0; k--)
+ res = scm_cons (scm_long_long2num(data[k]), res);
return res;
}
#endif
_______________________________________________
Bug-guile mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-guile