[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core/libguile goops.h goops.c
From: |
Marius Vollmer |
Subject: |
guile/guile-core/libguile goops.h goops.c |
Date: |
Fri, 18 May 2001 17:33:25 -0700 |
CVSROOT: /cvs
Module name: guile
Changes by: Marius Vollmer <address@hidden> 01/05/18 17:33:25
Modified files:
guile-core/libguile: goops.h goops.c
Log message:
(scm_init_goops_builtins): Renamed from
`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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/goops.h.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/libguile/goops.c.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text
Patches:
Index: guile/guile-core/libguile/goops.c
diff -u guile/guile-core/libguile/goops.c:1.29
guile/guile-core/libguile/goops.c:1.30
--- guile/guile-core/libguile/goops.c:1.29 Tue May 15 07:57:21 2001
+++ guile/guile-core/libguile/goops.c Fri May 18 17:33:25 2001
@@ -2437,7 +2437,7 @@
scm_load_goops ()
{
if (!goops_loaded_p)
- scm_resolve_module (scm_read_0str ("(oop goops)"));
+ scm_c_resolve_module ("oop goops");
}
@@ -2645,13 +2645,10 @@
SCM scm_module_goops;
-void
-scm_init_goops (void)
+SCM
+scm_init_goops_builtins (void)
{
- SCM old_module;
- scm_module_goops = scm_make_module (scm_read_0str ("(oop goops)"));
- old_module = scm_set_current_module (scm_module_goops);
-
+ scm_module_goops = scm_current_module ();
scm_goops_lookup_closure = scm_module_lookup_closure (scm_module_goops);
/* Not really necessary right now, but who knows...
@@ -2689,14 +2686,14 @@
name)));
DEFVAR (name, scm_no_applicable_method);
}
-
- scm_set_current_module (old_module);
+
+ return SCM_UNSPECIFIED;
}
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);
}
/*
Index: guile/guile-core/libguile/goops.h
diff -u guile/guile-core/libguile/goops.h:1.12
guile/guile-core/libguile/goops.h:1.13
--- guile/guile-core/libguile/goops.h:1.12 Tue Apr 10 19:12:35 2001
+++ guile/guile-core/libguile/goops.h Fri May 18 17:33:25 2001
@@ -237,7 +237,6 @@
#ifdef GUILE_DEBUG
SCM scm_pure_generic_p (SCM obj);
#endif
-extern void scm_init_oop_goops_goopscore_module (void);
SCM scm_sys_compute_slots (SCM c);
SCM scm_i_get_keyword (SCM key, SCM l, int len, SCM default_value, const char
*subr);
@@ -281,6 +280,8 @@
SCM scm_make (SCM args);
SCM scm_find_method (SCM args);
SCM scm_sys_method_more_specific_p (SCM m1, SCM m2, SCM targs);
+
+SCM scm_init_goops_builtins (void);
void scm_init_goops (void);
#endif /* GOOPSH */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- guile/guile-core/libguile goops.h goops.c,
Marius Vollmer <=