mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 15:00:21 +02:00
Code Activity

* vectors.c, vectors.h (scm_make_vector): Removed third argument.

Browse source 
This change makes scm_make_vector R5RS compatible.  We cannot keep
the third argument since people want to be able to deduce the form
of the C function call only by looking at R5RS.  (At the same time
we have removed some unnecessary complexity!)

* eval.c, filesys.c, fluids.c, gc.c, gh_data.c, init.c, kw.c,
net_db.c, posix.c, print.c, regex-posix.c, scmsigs.c, socket.c,
stime.c, symbols.c, unif.c, vectors.c, weaks.c: Removed third
argument in call to scm_make_vector.
This commit is contained in:
Mikael Djurfeldt 1998-07-12 00:07:53 +00:00
parent 9d0b279fee
commit a61ef59b0b
2 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libguile/vectors.c
View file

@ -79,7 +79,7 @@ scm_vector(l)
register SCM *data;
long i = scm_ilength(l);
SCM_ASSERT(i >= 0, l, SCM_ARG1, s_vector);
res = scm_make_vector(SCM_MAKINUM(i), SCM_UNSPECIFIED, SCM_UNDEFINED);
res = scm_make_vector (SCM_MAKINUM(i), SCM_UNSPECIFIED);
data = SCM_VELTS(res);
for(;i && SCM_NIMP(l);--i, l = SCM_CDR(l))
*data++ = SCM_CAR(l);
@ -116,16 +116,14 @@ scm_vector_set_x(v, k, obj)
}
SCM_PROC(s_make_vector, "make-vector", 1, 2, 0, scm_make_vector);
SCM_PROC (s_make_vector, "make-vector", 1, 1, 0, scm_make_vector);
SCM
scm_make_vector(k, fill, multip)
scm_make_vector (k, fill)
SCM k;
SCM fill;
SCM multip;
{
SCM v;
int multi;
register long i;
register long j;
register SCM *velts;
@ -133,7 +131,6 @@ scm_make_vector(k, fill, multip)
SCM_ASSERT(SCM_INUMP(k) && (0 <= SCM_INUM (k)), k, SCM_ARG1, s_make_vector);
if (SCM_UNBNDP(fill))
fill = SCM_UNSPECIFIED;
multi = !(SCM_UNBNDP(multip) || SCM_FALSEP(multip));
i = SCM_INUM(k);
SCM_NEWCELL(v);
SCM_DEFER_INTS;
@ -141,14 +138,6 @@ scm_make_vector(k, fill, multip)
SCM_SETLENGTH(v, i, scm_tc7_vector);
velts = SCM_VELTS(v);
j = 0;
if (multi)
{
while ((fill != SCM_EOL) && (j < i))
{
(velts)[j++] = SCM_CAR (fill);
fill = SCM_CDR (fill);
}
}
while(--i >= j) (velts)[i] = fill;
SCM_ALLOW_INTS;
return v;
@ -171,10 +160,10 @@ scm_vector_to_list(v)
}
SCM_PROC(s_vector_fill_x, "vector-fill!", 2, 0, 0, scm_vector_fill_x);
SCM_PROC (s_vector_fill_x, "vector-fill!", 2, 0, 0, scm_vector_fill_x);
SCM
scm_vector_fill_x(v, fill_x)
scm_vector_fill_x (v, fill_x)
SCM v;
SCM fill_x;
{
@ -182,7 +171,8 @@ scm_vector_fill_x(v, fill_x)
register SCM *data;
SCM_ASSERT(SCM_NIMP(v) && SCM_VECTORP(v), v, SCM_ARG1, s_vector_fill_x);
data = SCM_VELTS(v);
for(i = SCM_LENGTH(v)-1;i >= 0;i--) data[i] = fill_x;
for(i = SCM_LENGTH(v) - 1; i >= 0; i--)
data[i] = fill_x;
return SCM_UNSPECIFIED;
}

2
libguile/vectors.h
View file

@ -60,7 +60,7 @@ extern SCM scm_vector_length SCM_P ((SCM v));
extern SCM scm_vector SCM_P ((SCM l));
extern SCM scm_vector_ref SCM_P ((SCM v, SCM k));
extern SCM scm_vector_set_x SCM_P ((SCM v, SCM k, SCM obj));
extern SCM scm_make_vector SCM_P ((SCM k, SCM fill, SCM multi));
extern SCM scm_make_vector SCM_P ((SCM k, SCM fill));
extern SCM scm_vector_to_list SCM_P ((SCM v));
extern SCM scm_vector_fill_x SCM_P ((SCM v, SCM fill_x));
extern SCM scm_vector_equal_p SCM_P ((SCM x, SCM y));