diff options
author | Andy Wingo <wingo@pobox.com> | 2015-01-10 23:02:02 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2015-01-23 16:16:01 +0100 |
commit | 2b7692bcc4f13b0778280df9420dde7d14c95a4a (patch) | |
tree | 1c99b1012113cb0735c00352dbb6e5d44d3bcd4d /libguile/goops.c | |
parent | 623a259935be05b65fbc97fec1a1c925a5d91c11 (diff) | |
download | guile-2b7692bcc4f13b0778280df9420dde7d14c95a4a.tar.gz |
No more concept of "pure generics"
* libguile/goops.h (SCM_PUREGENERICP, SCM_VALIDATE_PUREGENERIC)
(SCM_VTABLE_FLAG_GOOPS_PURE_GENERIC, SCM_CLASSF_PURE_GENERIC):
Remove.
* libguile/goops.c (scm_set_primitive_generic_x): Use SCM_GENERICP, not
SCM_PUREGENERICP.
(scm_sys_bless_pure_generic_vtable_x): Remove; this flag isn't
checked.
* module/oop/goops.scm: Don't call %bless-pure-generic-vtable!; there's
no need.
Diffstat (limited to 'libguile/goops.c')
-rw-r--r-- | libguile/goops.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libguile/goops.c b/libguile/goops.c index 8a8f8acc0..34d12cde4 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -157,7 +157,6 @@ static SCM scm_unbound_p (SCM obj); static SCM scm_class_p (SCM obj); static SCM scm_sys_bless_applicable_struct_vtables_x (SCM applicable, SCM setter); -static SCM scm_sys_bless_pure_generic_vtable_x (SCM vtable); static SCM scm_sys_make_root_class (SCM name, SCM dslots, SCM getters_n_setters); static SCM scm_sys_init_layout_x (SCM class, SCM layout); @@ -904,7 +903,7 @@ SCM_DEFINE (scm_set_primitive_generic_x, "set-primitive-generic!", 2, 0, 0, #define FUNC_NAME s_scm_set_primitive_generic_x { SCM_ASSERT (SCM_PRIMITIVE_GENERIC_P (subr), subr, SCM_ARG1, FUNC_NAME); - SCM_ASSERT (SCM_PUREGENERICP (generic), generic, SCM_ARG2, FUNC_NAME); + SCM_ASSERT (SCM_GENERICP (generic), generic, SCM_ARG2, FUNC_NAME); SCM_SET_SUBR_GENERIC (subr, generic); return SCM_UNSPECIFIED; } @@ -1301,17 +1300,6 @@ SCM_DEFINE (scm_sys_bless_applicable_struct_vtables_x, "%bless-applicable-struct } #undef FUNC_NAME -SCM_DEFINE (scm_sys_bless_pure_generic_vtable_x, "%bless-pure-generic-vtable!", 1, 0, 0, - (SCM vtable), - "") -#define FUNC_NAME s_scm_sys_bless_pure_generic_vtable_x -{ - SCM_VALIDATE_CLASS (1, vtable); - SCM_SET_CLASS_FLAGS (vtable, SCM_CLASSF_PURE_GENERIC); - return SCM_UNSPECIFIED; -} -#undef FUNC_NAME - SCM_DEFINE (scm_sys_goops_early_init, "%goops-early-init", 0, 0, 0, (), "") |