diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-01-11 21:31:51 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-01-23 16:16:02 +0100 |
| commit | 2025a02793282b5548372939e43c72d13933853d (patch) | |
| tree | c513c7e079fcc881184f75743fe76d0083dc6dd9 /libguile/goops.c | |
| parent | f37bece4e4e71d430b0742d83327e63b72b97644 (diff) | |
| download | guile-2025a02793282b5548372939e43c72d13933853d.tar.gz | |
goops.c no longer knows about <class> slot allocation
* libguile/goops.c (scm_class_of): Access "redefined" slot by name in
the case where we need to change the class of an instance.
(scm_sys_goops_early_init): Move up capture of class-precedence-list
so SCM_SUBCLASSP can use it.
* libguile/goops.h (SCM_CLASS_CLASS_LAYOUT, scm_si_redefined)
(scm_si_direct_supers, scm_si_direct_slots, scm_si_direct_subclasses)
(scm_si_direct_methods, scm_si_cpl scm_si_slots)
(scm_si_getters_n_setters, SCM_N_CLASS_SLOTS, SCM_OBJ_CLASS_REDEF):
Remove. Now C code has no special knowledge about the layout of
GOOPS classes.
(SCM_SUBCLASSP): Use scm_class_precedence_list to get CPL.
(SCM_INST, SCM_ACCESSORS_OF): Remove unused macros that were
undocumented and nonsensical.
Diffstat (limited to 'libguile/goops.c')
| -rw-r--r-- | libguile/goops.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libguile/goops.c b/libguile/goops.c index 070b6bcc3..aabd6ad8a 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -69,6 +69,7 @@ SCM_KEYWORD (k_name, "name"); SCM_KEYWORD (k_setter, "setter"); +SCM_SYMBOL (sym_redefined, "redefined"); SCM_GLOBAL_SYMBOL (scm_sym_args, "args"); static int goops_loaded_p = 0; @@ -254,14 +255,16 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0, : SCM_IN_PCLASS_INDEX | SCM_PTOBNUM (x))]; case scm_tcs_struct: if (SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_GOOPS_VALID) + /* A GOOPS object with a valid class. */ return SCM_CLASS_OF (x); else if (SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_GOOPS) + /* A GOOPS object whose class might have been redefined. */ { - /* Goops object */ - if (! scm_is_false (SCM_OBJ_CLASS_REDEF (x))) - scm_change_object_class (x, - SCM_CLASS_OF (x), /* old */ - SCM_OBJ_CLASS_REDEF (x)); /* new */ + SCM class = SCM_CLASS_OF (x); + SCM new_class = scm_slot_ref (class, sym_redefined); + if (!scm_is_false (new_class)) + scm_change_object_class (x, class, new_class); + /* Re-load class from instance. */ return SCM_CLASS_OF (x); } else @@ -1060,6 +1063,9 @@ SCM_DEFINE (scm_sys_goops_early_init, "%goops-early-init", 0, 0, 0, var_make = scm_c_lookup ("make"); var_inherit_applicable = scm_c_lookup ("inherit-applicable!"); + /* For SCM_SUBCLASSP. */ + var_class_precedence_list = scm_c_lookup ("class-precedence-list"); + var_slot_ref_using_class = scm_c_lookup ("slot-ref-using-class"); var_slot_set_using_class_x = scm_c_lookup ("slot-set-using-class!"); var_slot_bound_using_class_p = scm_c_lookup ("slot-bound-using-class?"); @@ -1159,7 +1165,6 @@ SCM_DEFINE (scm_sys_goops_loaded, "%goops-loaded", 0, 0, 0, var_class_direct_slots = scm_c_lookup ("class-direct-slots"); var_class_direct_subclasses = scm_c_lookup ("class-direct-subclasses"); var_class_direct_methods = scm_c_lookup ("class-direct-methods"); - var_class_precedence_list = scm_c_lookup ("class-precedence-list"); var_class_slots = scm_c_lookup ("class-slots"); var_generic_function_methods = scm_c_lookup ("generic-function-methods"); |