summaryrefslogtreecommitdiff
path: root/libguile/gsubr.c
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>1999-08-26 04:24:42 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>1999-08-26 04:24:42 +0000
commit9de33deb2ea07bf6c93651bbd693e7484dd29b33 (patch)
treece3f42882590ee80cfb30221518a120920104a31 /libguile/gsubr.c
parent52235e71737b47b648b5511396073f023d08a78e (diff)
downloadguile-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/gsubr.c')
-rw-r--r--libguile/gsubr.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index 40fdb5b0e..45bfe3db9 100644
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -101,6 +101,40 @@ scm_make_gsubr(name, req, opt, rst, fcn)
}
}
+SCM
+scm_make_gsubr_with_generic (const char *name,
+ int req,
+ int opt,
+ int rst,
+ SCM (*fcn)(),
+ SCM *gf)
+{
+ switch SCM_GSUBR_MAKTYPE(req, opt, rst) {
+ case SCM_GSUBR_MAKTYPE(0, 0, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_0, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(1, 0, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_1, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(0, 1, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_1o, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(1, 1, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_2o, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(2, 0, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_2, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(3, 0, 0):
+ return scm_make_subr_with_generic(name, scm_tc7_subr_3, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(0, 0, 1):
+ return scm_make_subr_with_generic(name, scm_tc7_lsubr, fcn, gf);
+ case SCM_GSUBR_MAKTYPE(2, 0, 1):
+ return scm_make_subr_with_generic(name, scm_tc7_lsubr_2, fcn, gf);
+ default:
+ ;
+ }
+ scm_misc_error ("scm_make_gsubr_with_generic",
+ "can't make primitive-generic with this arity",
+ SCM_EOL);
+ return 0; /* never reached */
+}
+
SCM_PROC(s_gsubr_apply, "gsubr-apply", 0, 0, 1, scm_gsubr_apply);