mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 05:50:26 +02:00
Code Activity

* eval.c, filesys.c, fluids.c, gc.c, gh_data.c, init.c, kw.c,

Browse source 
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:10:02 +00:00
parent a61ef59b0b
commit a8741caa54
17 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/eval.c
View file

@ -3395,7 +3395,7 @@ scm_copy_tree (obj)
if (SCM_VECTORP (obj)) if (SCM_VECTORP (obj))
{ {
scm_sizet i = SCM_LENGTH (obj); scm_sizet i = SCM_LENGTH (obj);
ans = scm_make_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED, SCM_UNDEFINED); ans = scm_make_vector (SCM_MAKINUM (i), SCM_UNSPECIFIED);
while (i--) while (i--)
SCM_VELTS (ans)[i] = scm_copy_tree (SCM_VELTS (obj)[i]); SCM_VELTS (ans)[i] = scm_copy_tree (SCM_VELTS (obj)[i]);
return ans; return ans;

2
libguile/filesys.c
View file

@ -331,7 +331,7 @@ static SCM
scm_stat2scm (stat_temp) scm_stat2scm (stat_temp)
struct stat *stat_temp; struct stat *stat_temp;
{ {
SCM ans = scm_make_vector (SCM_MAKINUM (15), SCM_UNSPECIFIED, SCM_BOOL_F); SCM ans = scm_make_vector (SCM_MAKINUM (15), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans); SCM *ve = SCM_VELTS (ans);
ve[0] = scm_ulong2num ((unsigned long) stat_temp->st_dev); ve[0] = scm_ulong2num ((unsigned long) stat_temp->st_dev);

5
libguile/fluids.c
View file

@ -56,7 +56,7 @@ SCM
scm_make_initial_fluids () scm_make_initial_fluids ()
{ {
return scm_make_vector (SCM_MAKINUM (INITIAL_FLUIDS), return scm_make_vector (SCM_MAKINUM (INITIAL_FLUIDS),
SCM_BOOL_F, SCM_BOOL_F); SCM_BOOL_F);
} }
static void grow_fluids SCM_P ((scm_root_state *, int new_length)); static void grow_fluids SCM_P ((scm_root_state *, int new_length));
@ -70,8 +70,7 @@ grow_fluids (root_state, new_length)
old_fluids = root_state->fluids; old_fluids = root_state->fluids;
old_length = SCM_LENGTH (old_fluids); old_length = SCM_LENGTH (old_fluids);
new_fluids = scm_make_vector (SCM_MAKINUM (new_length), new_fluids = scm_make_vector (SCM_MAKINUM (new_length), SCM_BOOL_F);
SCM_BOOL_F, SCM_BOOL_F);
i = 0; i = 0;
while (i < old_length) while (i < old_length)
{ {

6
libguile/gc.c
View file

@ -1869,10 +1869,10 @@ scm_init_storage (init_heap_size)
scm_listofnull = scm_cons (SCM_EOL, SCM_EOL); scm_listofnull = scm_cons (SCM_EOL, SCM_EOL);
scm_nullstr = scm_makstr (0L, 0); scm_nullstr = scm_makstr (0L, 0);
scm_nullvect = scm_make_vector (SCM_INUM0, SCM_UNDEFINED, SCM_UNDEFINED); scm_nullvect = scm_make_vector (SCM_INUM0, SCM_UNDEFINED);
scm_symhash = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL, SCM_UNDEFINED); scm_symhash = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL);
scm_weak_symhash = scm_make_weak_key_hash_table ((SCM) SCM_MAKINUM (scm_symhash_dim)); scm_weak_symhash = scm_make_weak_key_hash_table ((SCM) SCM_MAKINUM (scm_symhash_dim));
scm_symhash_vars = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL, SCM_UNDEFINED); scm_symhash_vars = scm_make_vector ((SCM) SCM_MAKINUM (scm_symhash_dim), SCM_EOL);
scm_stand_in_procs = SCM_EOL; scm_stand_in_procs = SCM_EOL;
scm_permobjs = SCM_EOL; scm_permobjs = SCM_EOL;
scm_protects = SCM_EOL; scm_protects = SCM_EOL;

5
libguile/gh_data.c
View file

@ -352,10 +352,7 @@ gh_symbol2newstr (SCM sym, int *lenp)
SCM SCM
gh_make_vector (SCM len, SCM fill) gh_make_vector (SCM len, SCM fill)
{ {
/* scm_make_vector() takes a third boolean argument which should be return scm_make_vector (len, fill);
set to SCM_BOOL_T when you are dealing with multi-dimensional
arrays; gh_make_vector() does not do multi-dimensional arrays */
return scm_make_vector(len, fill, SCM_BOOL_F);
} }
/* set the given element of the given vector to the given value */ /* set the given element of the given vector to the given value */

3
libguile/init.c
View file

@ -159,8 +159,7 @@ start_stack (base)
/* Create the look-aside stack for variables that are shared between /* Create the look-aside stack for variables that are shared between
* captured continuations. * captured continuations.
*/ */
scm_continuation_stack = scm_make_vector (SCM_MAKINUM (512), scm_continuation_stack = scm_make_vector (SCM_MAKINUM (512), SCM_UNDEFINED);
SCM_UNDEFINED, SCM_UNDEFINED);
/* The continuation stack is further initialized by restart_stack. */ /* The continuation stack is further initialized by restart_stack. */
/* The remainder of stack initialization is factored out to another /* The remainder of stack initialization is factored out to another

2
libguile/kw.c
View file

@ -137,7 +137,7 @@ void
scm_init_kw () scm_init_kw ()
{ {
scm_tc16_kw = scm_newsmob (&kw_smob); scm_tc16_kw = scm_newsmob (&kw_smob);
scm_kw_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL, SCM_UNDEFINED); scm_kw_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL);
#include "kw.x" #include "kw.x"
} }

8
libguile/net_db.c
View file

@ -165,7 +165,7 @@ SCM
scm_gethost (name) scm_gethost (name)
SCM name; SCM name;
{ {
SCM ans = scm_make_vector (SCM_MAKINUM (5), SCM_UNSPECIFIED, SCM_BOOL_F); SCM ans = scm_make_vector (SCM_MAKINUM (5), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans); SCM *ve = SCM_VELTS (ans);
SCM lst = SCM_EOL; SCM lst = SCM_EOL;
struct hostent *entry; struct hostent *entry;
@ -260,7 +260,7 @@ scm_getnet (name)
SCM *ve; SCM *ve;
struct netent *entry; struct netent *entry;
ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F); ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans); ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name)) if (SCM_UNBNDP (name))
{ {
@ -312,7 +312,7 @@ scm_getproto (name)
SCM *ve; SCM *ve;
struct protoent *entry; struct protoent *entry;
ans = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F); ans = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans); ve = SCM_VELTS (ans);
if (SCM_UNBNDP (name)) if (SCM_UNBNDP (name))
{ {
@ -361,7 +361,7 @@ scm_return_entry (entry)
SCM ans; SCM ans;
SCM *ve; SCM *ve;
ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F); ans = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (ans); ve = SCM_VELTS (ans);
ve[0] = scm_makfromstr (entry->s_name, (scm_sizet) strlen (entry->s_name), 0); ve[0] = scm_makfromstr (entry->s_name, (scm_sizet) strlen (entry->s_name), 0);
ve[1] = scm_makfromstrs (-1, entry->s_aliases); ve[1] = scm_makfromstrs (-1, entry->s_aliases);

8
libguile/posix.c
View file

@ -234,7 +234,7 @@ scm_getgroups()
SCM_SETCHARS(grps, groups); /* set up grps as a GC protect */ SCM_SETCHARS(grps, groups); /* set up grps as a GC protect */
SCM_SETLENGTH(grps, 0L + ngroups * sizeof(GETGROUPS_T), scm_tc7_string); SCM_SETLENGTH(grps, 0L + ngroups * sizeof(GETGROUPS_T), scm_tc7_string);
SCM_ALLOW_INTS; SCM_ALLOW_INTS;
ans = scm_make_vector(SCM_MAKINUM(ngroups), SCM_UNDEFINED, SCM_BOOL_F); ans = scm_make_vector (SCM_MAKINUM(ngroups), SCM_UNDEFINED);
while (--ngroups >= 0) SCM_VELTS(ans)[ngroups] = SCM_MAKINUM(groups[ngroups]); while (--ngroups >= 0) SCM_VELTS(ans)[ngroups] = SCM_MAKINUM(groups[ngroups]);
SCM_SETCHARS(grps, groups); /* to make sure grps stays around. */ SCM_SETCHARS(grps, groups); /* to make sure grps stays around. */
return ans; return ans;
@ -253,7 +253,7 @@ scm_getpwuid (user)
struct passwd *entry; struct passwd *entry;
SCM *ve; SCM *ve;
result = scm_make_vector (SCM_MAKINUM (7), SCM_UNSPECIFIED, SCM_BOOL_F); result = scm_make_vector (SCM_MAKINUM (7), SCM_UNSPECIFIED);
ve = SCM_VELTS (result); ve = SCM_VELTS (result);
if (SCM_UNBNDP (user) || SCM_FALSEP (user)) if (SCM_UNBNDP (user) || SCM_FALSEP (user))
{ {
@ -326,7 +326,7 @@ scm_getgrgid (name)
SCM result; SCM result;
struct group *entry; struct group *entry;
SCM *ve; SCM *ve;
result = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED, SCM_BOOL_F); result = scm_make_vector (SCM_MAKINUM (4), SCM_UNSPECIFIED);
ve = SCM_VELTS (result); ve = SCM_VELTS (result);
SCM_DEFER_INTS; SCM_DEFER_INTS;
if (SCM_UNBNDP (name) || (name == SCM_BOOL_F)) if (SCM_UNBNDP (name) || (name == SCM_BOOL_F))
@ -873,7 +873,7 @@ scm_uname ()
{ {
#ifdef HAVE_UNAME #ifdef HAVE_UNAME
struct utsname buf; struct utsname buf;
SCM ans = scm_make_vector(SCM_MAKINUM(5), SCM_UNSPECIFIED, SCM_BOOL_F); SCM ans = scm_make_vector (SCM_MAKINUM(5), SCM_UNSPECIFIED);
SCM *ve = SCM_VELTS (ans); SCM *ve = SCM_VELTS (ans);
SCM_DEFER_INTS; SCM_DEFER_INTS;
if (uname (&buf) < 0) if (uname (&buf) < 0)

1
libguile/print.c
View file

@ -180,7 +180,6 @@ make_print_state ()
SCM_EOL); SCM_EOL);
scm_print_state *pstate = SCM_PRINT_STATE (print_state); scm_print_state *pstate = SCM_PRINT_STATE (print_state);
pstate->ref_vect = scm_make_vector (SCM_MAKINUM (PSTATE_SIZE), pstate->ref_vect = scm_make_vector (SCM_MAKINUM (PSTATE_SIZE),
SCM_UNDEFINED,
SCM_UNDEFINED); SCM_UNDEFINED);
pstate->ref_stack = SCM_VELTS (pstate->ref_vect); pstate->ref_stack = SCM_VELTS (pstate->ref_vect);
pstate->ceiling = SCM_LENGTH (pstate->ref_vect); pstate->ceiling = SCM_LENGTH (pstate->ref_vect);

3
libguile/regex-posix.c
View file

@ -249,8 +249,7 @@ scm_regexp_exec (SCM rx, SCM str, SCM start, SCM flags)
int i; int i;
/* The match vector must include a cell for the string that was matched, /* The match vector must include a cell for the string that was matched,
so add 1. */ so add 1. */
mvec = scm_make_vector (SCM_MAKINUM (nmatches + 1), SCM_UNSPECIFIED, mvec = scm_make_vector (SCM_MAKINUM (nmatches + 1), SCM_UNSPECIFIED);
SCM_UNDEFINED);
SCM_VELTS(mvec)[0] = str; SCM_VELTS(mvec)[0] = str;
for (i = 0; i < nmatches; ++i) for (i = 0; i < nmatches; ++i)
SCM_VELTS(mvec)[i+1] = scm_cons(SCM_MAKINUM(matches[i].rm_so + offset), SCM_VELTS(mvec)[i+1] = scm_cons(SCM_MAKINUM(matches[i].rm_so + offset),

1
libguile/scmsigs.c
View file

@ -405,7 +405,6 @@ scm_init_scmsigs ()
signal_handlers = signal_handlers =
SCM_CDRLOC (scm_sysintern ("signal-handlers", SCM_CDRLOC (scm_sysintern ("signal-handlers",
scm_make_vector (SCM_MAKINUM (NSIG), scm_make_vector (SCM_MAKINUM (NSIG),
SCM_BOOL_F,
SCM_BOOL_F))); SCM_BOOL_F)));
thunk = scm_make_gsubr ("%deliver-signals", 0, 0, 0, thunk = scm_make_gsubr ("%deliver-signals", 0, 0, 0,
sys_deliver_signals); sys_deliver_signals);

4
libguile/socket.c
View file

@ -462,7 +462,7 @@ scm_addr_vector (address, proc)
if (fam == AF_UNIX) if (fam == AF_UNIX)
{ {
struct sockaddr_un *nad = (struct sockaddr_un *) address; struct sockaddr_un *nad = (struct sockaddr_un *) address;
result = scm_make_vector (SCM_MAKINUM (2), SCM_UNSPECIFIED, SCM_BOOL_F); result = scm_make_vector (SCM_MAKINUM (2), SCM_UNSPECIFIED);
ve = SCM_VELTS (result); ve = SCM_VELTS (result);
ve[0] = scm_ulong2num ((unsigned long) fam); ve[0] = scm_ulong2num ((unsigned long) fam);
ve[1] = scm_makfromstr (nad->sun_path, ve[1] = scm_makfromstr (nad->sun_path,
@ -473,7 +473,7 @@ scm_addr_vector (address, proc)
if (fam == AF_INET) if (fam == AF_INET)
{ {
struct sockaddr_in *nad = (struct sockaddr_in *) address; struct sockaddr_in *nad = (struct sockaddr_in *) address;
result = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED, SCM_BOOL_F); result = scm_make_vector (SCM_MAKINUM (3), SCM_UNSPECIFIED);
ve = SCM_VELTS (result); ve = SCM_VELTS (result);
ve[0] = scm_ulong2num ((unsigned long) fam); ve[0] = scm_ulong2num ((unsigned long) fam);
ve[1] = scm_ulong2num (ntohl (nad->sin_addr.s_addr)); ve[1] = scm_ulong2num (ntohl (nad->sin_addr.s_addr));

4
libguile/stime.c
View file

@ -167,7 +167,7 @@ scm_times (void)
struct tms t; struct tms t;
clock_t rv; clock_t rv;
SCM result = scm_make_vector (SCM_MAKINUM(5), SCM_UNDEFINED, SCM_UNDEFINED); SCM result = scm_make_vector (SCM_MAKINUM(5), SCM_UNDEFINED);
rv = times (&t); rv = times (&t);
if (rv == -1) if (rv == -1)
scm_syserror (s_times); scm_syserror (s_times);
@ -245,7 +245,7 @@ scm_gettimeofday (void)
static SCM static SCM
filltime (struct tm *bd_time, int zoff, char *zname) filltime (struct tm *bd_time, int zoff, char *zname)
{ {
SCM result = scm_make_vector(SCM_MAKINUM(11), SCM_UNDEFINED, SCM_UNDEFINED); SCM result = scm_make_vector (SCM_MAKINUM(11), SCM_UNDEFINED);
SCM_VELTS (result)[0] = SCM_MAKINUM (bd_time->tm_sec); SCM_VELTS (result)[0] = SCM_MAKINUM (bd_time->tm_sec);
SCM_VELTS (result)[1] = SCM_MAKINUM (bd_time->tm_min); SCM_VELTS (result)[1] = SCM_MAKINUM (bd_time->tm_min);

2
libguile/symbols.c
View file

@ -795,7 +795,7 @@ SCM
scm_builtin_bindings () scm_builtin_bindings ()
{ {
int length = SCM_LENGTH (scm_symhash); int length = SCM_LENGTH (scm_symhash);
SCM obarray = scm_make_vector (SCM_MAKINUM (length), SCM_EOL, SCM_UNDEFINED); SCM obarray = scm_make_vector (SCM_MAKINUM (length), SCM_EOL);
copy_and_prune_obarray (scm_symhash, obarray); copy_and_prune_obarray (scm_symhash, obarray);
return obarray; return obarray;
} }

4
libguile/unif.c
View file

@ -242,7 +242,7 @@ scm_make_uve (k, prot)
#endif #endif
else else
{ {
return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED, SCM_UNDEFINED); return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED);
} }
} }
else else
@ -250,7 +250,7 @@ scm_make_uve (k, prot)
if (SCM_IMP (prot) || !SCM_INEXP (prot)) if (SCM_IMP (prot) || !SCM_INEXP (prot))
#endif #endif
/* Huge non-unif vectors are NOT supported. */ /* Huge non-unif vectors are NOT supported. */
return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED, SCM_UNDEFINED); /* no special scm_vector */ return scm_make_vector (SCM_MAKINUM (k), SCM_UNDEFINED); /* no special scm_vector */
#ifdef SCM_FLOATS #ifdef SCM_FLOATS
#ifdef SCM_SINGLES #ifdef SCM_SINGLES
else if (SCM_SINGP (prot)) else if (SCM_SINGP (prot))

2
libguile/weaks.c
View file

@ -58,7 +58,7 @@ scm_make_weak_vector (k, fill)
SCM fill; SCM fill;
{ {
SCM v; SCM v;
v = scm_make_vector (scm_sum (k, SCM_MAKINUM (1)), fill, SCM_UNDEFINED); v = scm_make_vector (scm_sum (k, SCM_MAKINUM (1)), fill);
SCM_DEFER_INTS; SCM_DEFER_INTS;
SCM_SETLENGTH(v, SCM_INUM (k), scm_tc7_wvect); SCM_SETLENGTH(v, SCM_INUM (k), scm_tc7_wvect);
SCM_VELTS(v)[0] = (SCM)0; SCM_VELTS(v)[0] = (SCM)0;