mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-12 06:41:13 +02:00
Code Activity

(scm_init_goops_builtins): Renamed from

Browse source 
`scm_init_goops'.  Do not explicitly create/switch modules.
Return SCM_UNSPECIFIED.
(scm_init_goops): Only register `%init-goops-builtins' procedure.
(scm_load_goops): Use scm_c_resolve_module instead of
scm_resolve_module.
This commit is contained in:
Marius Vollmer 2001-05-19 00:33:25 +00:00
parent e2d085f3a2
commit abd28220e7
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libguile/goops.c
View file

@ -2437,7 +2437,7 @@ void
scm_load_goops () scm_load_goops ()
{ {
if (!goops_loaded_p) if (!goops_loaded_p)
scm_resolve_module (scm_read_0str ("(oop goops)")); scm_c_resolve_module ("oop goops");
} }
@ -2645,13 +2645,10 @@ SCM_DEFINE (scm_sys_goops_loaded, "%goops-loaded", 0, 0, 0,
SCM scm_module_goops; SCM scm_module_goops;
void SCM
scm_init_goops (void) scm_init_goops_builtins (void)
{ {
SCM old_module; scm_module_goops = scm_current_module ();
scm_module_goops = scm_make_module (scm_read_0str ("(oop goops)"));
old_module = scm_set_current_module (scm_module_goops);
scm_goops_lookup_closure = scm_module_lookup_closure (scm_module_goops); scm_goops_lookup_closure = scm_module_lookup_closure (scm_module_goops);
/* Not really necessary right now, but who knows... /* Not really necessary right now, but who knows...
@ -2689,14 +2686,14 @@ scm_init_goops (void)
name))); name)));
DEFVAR (name, scm_no_applicable_method); DEFVAR (name, scm_no_applicable_method);
} }
scm_set_current_module (old_module); return SCM_UNSPECIFIED;
} }
void void
scm_init_oop_goops_goopscore_module () scm_init_goops ()
{ {
scm_register_module_xxx ("oop goops goopscore", (void *) scm_init_goops); scm_make_gsubr ("%init-goops-builtins", 0, 0, 0, scm_init_goops_builtins);
} }
/* /*

3
libguile/goops.h
View file

@ -237,7 +237,6 @@ SCM scm_m_atdispatch (SCM xorig, SCM env);
#ifdef GUILE_DEBUG #ifdef GUILE_DEBUG
SCM scm_pure_generic_p (SCM obj); SCM scm_pure_generic_p (SCM obj);
#endif #endif
extern void scm_init_oop_goops_goopscore_module (void);
SCM scm_sys_compute_slots (SCM c); SCM scm_sys_compute_slots (SCM c);
SCM scm_i_get_keyword (SCM key, SCM l, int len, SCM default_value, const char *subr); SCM scm_i_get_keyword (SCM key, SCM l, int len, SCM default_value, const char *subr);
@ -281,6 +280,8 @@ SCM stklos_version (void);
SCM scm_make (SCM args); SCM scm_make (SCM args);
SCM scm_find_method (SCM args); SCM scm_find_method (SCM args);
SCM scm_sys_method_more_specific_p (SCM m1, SCM m2, SCM targs); SCM scm_sys_method_more_specific_p (SCM m1, SCM m2, SCM targs);
SCM scm_init_goops_builtins (void);
void scm_init_goops (void); void scm_init_goops (void);
#endif /* GOOPSH */ #endif /* GOOPSH */