mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-16 00:30:21 +02:00
some scm_i_init_guile cleanups
* libguile/init.c (scm_i_init_guile): Since hash tables are tc7 objects, things that depend on hash tables no longer depend on smobs, so move smob_prehistory up a bit. No more struct_prehistory. * libguile/struct.h: * libguile/struct.c (scm_struct_prehistory): Remove empty function.
This commit is contained in:
parent
dd3a26f3da
commit
1be8532fdb
3 changed files with 3 additions and 13 deletions
|
@ -436,19 +436,16 @@ scm_i_init_guile (SCM_STACKITEM *base)
|
||||||
|
|
||||||
scm_storage_prehistory ();
|
scm_storage_prehistory ();
|
||||||
scm_threads_prehistory (base);
|
scm_threads_prehistory (base);
|
||||||
scm_smob_prehistory ();
|
|
||||||
scm_weaks_prehistory ();
|
scm_weaks_prehistory ();
|
||||||
#ifdef GUILE_DEBUG_MALLOC
|
#ifdef GUILE_DEBUG_MALLOC
|
||||||
scm_debug_malloc_prehistory ();
|
scm_debug_malloc_prehistory ();
|
||||||
#endif
|
#endif
|
||||||
if (scm_init_storage ()) /* requires threads_prehistory,
|
if (scm_init_storage ()) /* requires threads_prehistory */
|
||||||
smob_prehistory and
|
|
||||||
hashtab_prehistory */
|
|
||||||
abort ();
|
abort ();
|
||||||
|
|
||||||
scm_struct_prehistory (); /* requires storage */
|
scm_smob_prehistory ();
|
||||||
scm_symbols_prehistory (); /* requires storage */
|
scm_symbols_prehistory (); /* requires storage */
|
||||||
scm_modules_prehistory (); /* requires storage and hash tables */
|
scm_modules_prehistory (); /* requires storage */
|
||||||
scm_init_variable (); /* all bindings need variables */
|
scm_init_variable (); /* all bindings need variables */
|
||||||
scm_init_continuations ();
|
scm_init_continuations ();
|
||||||
scm_init_root (); /* requires continuations */
|
scm_init_root (); /* requires continuations */
|
||||||
|
|
|
@ -853,12 +853,6 @@ scm_print_struct (SCM exp, SCM port, scm_print_state *pstate)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
scm_struct_prehistory ()
|
|
||||||
{
|
|
||||||
/* Empty. */
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
scm_init_struct ()
|
scm_init_struct ()
|
||||||
{
|
{
|
||||||
|
|
|
@ -157,7 +157,6 @@ SCM_API SCM scm_struct_create_handle (SCM obj);
|
||||||
SCM_API SCM scm_struct_vtable_name (SCM vtable);
|
SCM_API SCM scm_struct_vtable_name (SCM vtable);
|
||||||
SCM_API SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name);
|
SCM_API SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name);
|
||||||
SCM_API void scm_print_struct (SCM exp, SCM port, scm_print_state *);
|
SCM_API void scm_print_struct (SCM exp, SCM port, scm_print_state *);
|
||||||
SCM_API void scm_struct_prehistory (void);
|
|
||||||
|
|
||||||
SCM_INTERNAL SCM scm_i_struct_equalp (SCM s1, SCM s2);
|
SCM_INTERNAL SCM scm_i_struct_equalp (SCM s1, SCM s2);
|
||||||
SCM_INTERNAL unsigned long scm_struct_ihashq (SCM, unsigned long, void *);
|
SCM_INTERNAL unsigned long scm_struct_ihashq (SCM, unsigned long, void *);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue