From 11561496bad94481cc2b3d8acba1a154e3c052fc Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sun, 1 Nov 2009 19:46:27 +0100 Subject: remove support for "entities" -- a form of applicable struct Entities were meant to be a form of applicable struct. Unfortunately, the implementation is intertwingled with generics. Removing them, for now, will make it possible to cleanly re-add applicable struct support. * libguile/struct.h (SCM_STRUCTF_ENTITY): Remove. (SCM_STRUCTF_GOOPS_HACK): New flag; sigh. * libguile/struct.c (scm_make_struct): We make "entity" structs if the GOOPS_HACK flag is set. This will be fixed when we rework flags and remove hidden words. * libguile/goops.c (scm_class_of): Structs are not applicable, for now at least. (scm_sys_inherit_magic_x, scm_basic_basic_make_class) (scm_sys_allocate_instance, scm_sys_set_object_setter_x): (make_struct_class): Adapt for no more entities (and thus no entity flag). (create_standard_classes): For some reason, generic functions were getting the LIGHT flag set, after the ENTITY flag was removed; so for now explicitly clear that flag. * libguile/goops.h (SCM_GENERIC_SETTER, SCM_SET_GENERIC_SETTER): New macros. * libguile/objects.h: * libguile/objects.c: Remove code for entities. * libguile/debug.c: (scm_procedure_source): Only work with generics. * libguile/eval.c (scm_trampoline_0, scm_trampoline_1) (scm_trampoline_2): Only handle generics. * libguile/eval.i.c (CEVAL): #ifdef out the pieces about entities. * libguile/procprop.c (scm_i_procedure_arity): Remove support for entities. * libguile/procs.c (scm_procedure_p, scm_procedure, scm_setter): Remove entity support. --- libguile/procs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libguile/procs.c') diff --git a/libguile/procs.c b/libguile/procs.c index d0e7fbd26..14646d989 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -98,7 +98,7 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, switch (SCM_TYP7 (obj)) { case scm_tcs_struct: - if (!SCM_I_ENTITYP (obj)) + if (!(SCM_OBJ_CLASS_FLAGS (obj) & SCM_CLASSF_PURE_GENERIC)) break; case scm_tcs_closures: case scm_tcs_subrs: @@ -262,7 +262,8 @@ SCM_DEFINE (scm_procedure, "procedure", 1, 0, 0, return SCM_PROCEDURE (proc); else if (SCM_STRUCTP (proc)) { - SCM_ASSERT (SCM_I_ENTITYP (proc), proc, SCM_ARG1, FUNC_NAME); + SCM_ASSERT (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC, + proc, SCM_ARG1, FUNC_NAME); return proc; } SCM_WRONG_TYPE_ARG (1, proc); @@ -281,9 +282,9 @@ scm_setter (SCM proc) else if (SCM_STRUCTP (proc)) { SCM setter; - SCM_GASSERT1 (SCM_I_ENTITYP (proc), + SCM_GASSERT1 (SCM_OBJ_CLASS_FLAGS (proc) & SCM_CLASSF_PURE_GENERIC, g_setter, proc, SCM_ARG1, s_setter); - setter = SCM_ENTITY_SETTER (proc); + setter = SCM_GENERIC_SETTER (proc); if (SCM_NIMP (setter)) return setter; /* fall through */ -- cgit v1.2.3