1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-24 12:20:20 +02:00

revert the ill-considered part of the 2001-05-24 changes

This commit is contained in:
Michael Livshin 2001-05-26 20:51:22 +00:00
parent f3f70257a3
commit c014a02eec
63 changed files with 723 additions and 813 deletions

View file

@ -67,18 +67,18 @@ scm_subr_entry_t *scm_subr_table;
/* Increased to 800 on 2001-05-07 -- Guile now has 779 primitives on
startup, 786 with guile-readline. 'martin */
scm_bits_t scm_subr_table_size = 0;
scm_bits_t scm_subr_table_room = 800;
long scm_subr_table_size = 0;
long scm_subr_table_room = 800;
SCM
scm_c_make_subr (const char *name, scm_bits_t type, SCM (*fcn) ())
scm_c_make_subr (const char *name, long type, SCM (*fcn) ())
{
register SCM z;
scm_bits_t entry;
long entry;
if (scm_subr_table_size == scm_subr_table_room)
{
scm_bits_t new_size = scm_subr_table_room * 3 / 2;
long new_size = scm_subr_table_room * 3 / 2;
void *new_table
= scm_must_realloc ((char *) scm_subr_table,
sizeof (scm_subr_entry_t) * scm_subr_table_room,
@ -104,7 +104,7 @@ scm_c_make_subr (const char *name, scm_bits_t type, SCM (*fcn) ())
}
SCM
scm_c_define_subr (const char *name, scm_bits_t type, SCM (*fcn) ())
scm_c_define_subr (const char *name, long type, SCM (*fcn) ())
{
SCM subr = scm_c_make_subr (name, type, fcn);
scm_define (SCM_SUBR_ENTRY(subr).name, subr);
@ -116,7 +116,7 @@ scm_c_define_subr (const char *name, scm_bits_t type, SCM (*fcn) ())
void
scm_free_subr_entry (SCM subr)
{
scm_bits_t entry = SCM_SUBRNUM (subr);
long entry = SCM_SUBRNUM (subr);
/* Move last entry in table to the free position */
scm_subr_table[entry] = scm_subr_table[scm_subr_table_size - 1];
SCM_SET_SUBRNUM (scm_subr_table[entry].handle, entry);
@ -125,7 +125,7 @@ scm_free_subr_entry (SCM subr)
SCM
scm_c_make_subr_with_generic (const char *name,
scm_bits_t type, SCM (*fcn) (), SCM *gf)
long type, SCM (*fcn) (), SCM *gf)
{
SCM subr = scm_c_make_subr (name, type, fcn);
SCM_SUBR_ENTRY(subr).generic = gf;
@ -134,7 +134,7 @@ scm_c_make_subr_with_generic (const char *name,
SCM
scm_c_define_subr_with_generic (const char *name,
scm_bits_t type, SCM (*fcn) (), SCM *gf)
long type, SCM (*fcn) (), SCM *gf)
{
SCM subr = scm_c_make_subr_with_generic (name, type, fcn, gf);
scm_define (SCM_SUBR_ENTRY(subr).name, subr);
@ -144,7 +144,7 @@ scm_c_define_subr_with_generic (const char *name,
void
scm_mark_subr_table ()
{
scm_bits_t i;
long i;
for (i = 0; i < scm_subr_table_size; ++i)
{
SCM_SETGCMARK (scm_subr_table[i].name);