diff options
author | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1999-08-26 04:24:42 +0000 |
---|---|---|
committer | Mikael Djurfeldt <djurfeldt@nada.kth.se> | 1999-08-26 04:24:42 +0000 |
commit | 9de33deb2ea07bf6c93651bbd693e7484dd29b33 (patch) | |
tree | ce3f42882590ee80cfb30221518a120920104a31 /libguile/objects.h | |
parent | 52235e71737b47b648b5511396073f023d08a78e (diff) | |
download | guile-9de33deb2ea07bf6c93651bbd693e7484dd29b33.tar.gz |
* procs.c, procs.h (scm_subr_entry): New type: Stores data
associated with subrs.
(SCM_SUBRNUM, SCM_SUBR_ENTRY, SCM_SUBR_GENERIC, SCM_SUBR_PROPS,
SCM_SUBR_DOC): New macros.
(scm_subr_table): New variable.
(scm_mark_subr_table): New function.
* init.c (scm_boot_guile_1): Call scm_init_subr_table.
* gc.c (scm_gc_mark): Don't mark subr names here.
(scm_igc): Call scm_mark_subr_table.
* snarf.h (SCM_GPROC, SCM_GPROC1): New macros.
* procs.c, procs.h (scm_subr_p): New function (used internally).
* gsubr.c, gsubr.h (scm_make_gsubr_with_generic): New function.
* objects.c, objects.h (scm_primitive_generic): New class.
* objects.h (SCM_CMETHOD_CODE, SCM_CMETHOD_ENV): New macros.
* print.c (scm_iprin1): Print primitive-generics.
* __scm.h (SCM_WTA_DISPATCH_1, SCM_GASSERT1,
SCM_WTA_DISPATCH_2, SCM_GASSERT2): New macros.
* eval.c (SCM_CEVAL, SCM_APPLY): Replace scm_wta -->
SCM_WTA_DISPATCH_1 for scm_cxr's (unary floating point
primitives). NOTE: This means that it is now *required* to use
SCM_GPROC1 when creating float scm_cxr's (float scm_cxr's is an
obscured representation that will be removed in the future anyway,
so backward compatibility is no problem here).
* numbers.c: Converted most numeric primitives (all but bit
comparison operations and bit operations) to dispatch on generic
if args don't match.
* eval.c, eval.h (scm_eval_body): New function.
* objects.c (scm_call_generic_0, scm_call_generic_1,
scm_call_generic_2, scm_call_generic_3, scm_apply_generic): New
functions.
* eval.c (SCM_CEVAL): Apply the cmethod directly after having
called scm_memoize_method instead of doing a second lookup.
* objects.h (scm_memoize_method): Now returns the memoized cmethod.
* procs.c (scm_make_subr_opt): Use scm_sysintern0 instead of
scm_sysintern so that the binding connected with the subr name
isn't cleared when we give set = 0.
Diffstat (limited to 'libguile/objects.h')
-rw-r--r-- | libguile/objects.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libguile/objects.h b/libguile/objects.h index 6ca410581..01092ef31 100644 --- a/libguile/objects.h +++ b/libguile/objects.h @@ -193,6 +193,9 @@ typedef struct scm_effective_slot_definition { #define SCM_ESLOTDEF(x) ((scm_effective_slot_definition *) SCM_CDR (x)) +#define SCM_CMETHOD_CODE(cmethod) SCM_CDR (cmethod) +#define SCM_CMETHOD_ENV(cmethod) SCM_CAR (cmethod) + /* Port classes */ #define SCM_IN_PCLASS_INDEX 0x000 #define SCM_OUT_PCLASS_INDEX 0x100 @@ -203,7 +206,7 @@ extern SCM scm_metaclass_standard; extern SCM scm_metaclass_operator; extern SCM scm_class_boolean, scm_class_char, scm_class_pair; extern SCM scm_class_procedure, scm_class_string, scm_class_symbol; -extern SCM scm_class_procedure_with_setter; +extern SCM scm_class_procedure_with_setter, scm_class_primitive_generic; extern SCM scm_class_vector, scm_class_null; extern SCM scm_class_real, scm_class_complex, scm_class_integer; extern SCM scm_class_unknown; @@ -212,15 +215,26 @@ extern SCM *scm_smob_class; extern SCM scm_apply_generic_env; +extern SCM scm_no_applicable_method; + /* Plugin Goops functions. */ extern SCM (*scm_make_extended_class) (char *type_name); extern void (*scm_make_port_classes) (int ptobnum, char *type_name); extern void (*scm_change_object_class) (SCM, SCM, SCM); -extern void (*scm_memoize_method) (SCM x, SCM args); +extern SCM (*scm_memoize_method) (SCM x, SCM args); extern SCM scm_sym_atdispatch; extern SCM scm_class_of (SCM obj); +extern SCM scm_mcache_lookup_cmethod (SCM cache, SCM args); +extern SCM scm_mcache_create_cmethod (SCM cache, SCM args); +extern SCM scm_call_generic_0 (SCM gf); +/* The following are declared in __scm.h +extern SCM scm_call_generic_1 (SCM gf, SCM a1); +extern SCM scm_call_generic_2 (SCM gf, SCM a1, SCM a2); +*/ +extern SCM scm_call_generic_3 (SCM gf, SCM a1, SCM a2, SCM a3); +extern SCM scm_apply_generic (SCM gf, SCM args); extern SCM scm_entity_p (SCM obj); extern SCM scm_operator_p (SCM obj); extern SCM scm_set_object_procedure_x (SCM obj, SCM procs); |