diff options
author | Andy Wingo <wingo@pobox.com> | 2010-01-05 16:15:14 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-01-05 16:15:14 +0100 |
commit | 9fdf9fd3ea7130fd85eaf0a333a965ac4d2b07c3 (patch) | |
tree | 31ac376b1ce4cfb2757e222d39794577378f8c2f /libguile/goops.c | |
parent | e809758a7e0f3f63162a0a9064b95bd1c1d10628 (diff) | |
download | guile-9fdf9fd3ea7130fd85eaf0a333a965ac4d2b07c3.tar.gz |
move subr implementation details to gsubr.[ch]
* libguile/procs.h: Move subr macros to gsubr.h.
* libguile/procs.c (scm_c_make_subr, scm_c_make_subr_with_generic)
(scm_c_define_subr, scm_c_define_subr_with_generic): Remove these,
because they deal in subr types, and now there is only one subr type.
The body of this code is now in gsubr.c.
* libguile/deprecated.h (scm_subr_p): Remove from procs.[ch] and define
as a deprecated macro. Only used internally, but who knows who's out
there.
* libguile/goops.c (scm_generic_capability_p)
(scm_enable_primitive_generic_x, scm_set_primitive_generic_x)
(scm_primitive_generic_generic): Use the new SCM_PRIMITIVE_GENERIC_P
macro instead of calling scm_subr_p.
* libguile/gsubr.h (SCM_PRIMITIVE_P, SCM_PRIMITIVE_GENERIC_P): New
macros, to replace scm_subr_p and hacky checking for generic
capability.
(SCM_SUBR_META_INFO, SCM_SUBR_NAME, SCM_SUBRF, SCM_SUBR_PROPS)
(SCM_SUBR_GENERIC, SCM_SET_SUBR_GENERIC, SCM_SET_SUBR_GENERIC_LOC)
(SCM_SUBR_ARITY_TO_TYPE): Moved here from procs.h.
* libguile/gsubr.c (create_gsubr): Inline the
scm_c_make_subr definition here, and work for generics too. Removed a
scm_remember_upto_here_1 that was added earlier in the year when
meta_info was not being traced by the GC. Adapt callers.
Diffstat (limited to 'libguile/goops.c')
-rw-r--r-- | libguile/goops.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libguile/goops.c b/libguile/goops.c index 983fa5924..a703e7a7e 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -39,6 +39,7 @@ #include "libguile/dynl.h" #include "libguile/dynwind.h" #include "libguile/eval.h" +#include "libguile/gsubr.h" #include "libguile/hashtab.h" #include "libguile/keywords.h" #include "libguile/macros.h" @@ -1693,9 +1694,7 @@ SCM_DEFINE (scm_generic_capability_p, "generic-capability?", 1, 0, 0, { SCM_ASSERT (scm_is_true (scm_procedure_p (proc)), proc, SCM_ARG1, FUNC_NAME); - return (scm_subr_p (proc) && SCM_SUBR_GENERIC (proc) - ? SCM_BOOL_T - : SCM_BOOL_F); + return (SCM_PRIMITIVE_GENERIC_P (proc) ? SCM_BOOL_T : SCM_BOOL_F); } #undef FUNC_NAME @@ -1708,8 +1707,7 @@ SCM_DEFINE (scm_enable_primitive_generic_x, "enable-primitive-generic!", 0, 0, 1 while (!scm_is_null (subrs)) { SCM subr = SCM_CAR (subrs); - SCM_ASSERT (scm_subr_p (subr) && SCM_SUBR_GENERIC (subr), - subr, SCM_ARGn, FUNC_NAME); + SCM_ASSERT (SCM_PRIMITIVE_GENERIC_P (subr), subr, SCM_ARGn, FUNC_NAME); *SCM_SUBR_GENERIC (subr) = scm_make (scm_list_3 (scm_class_generic, k_name, @@ -1725,8 +1723,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_subr_p (subr) && SCM_SUBR_GENERIC (subr), - subr, SCM_ARG1, FUNC_NAME); + SCM_ASSERT (SCM_PRIMITIVE_GENERIC_P (subr), subr, SCM_ARG1, FUNC_NAME); SCM_ASSERT (SCM_PUREGENERICP (generic), generic, SCM_ARG2, FUNC_NAME); *SCM_SUBR_GENERIC (subr) = generic; return SCM_UNSPECIFIED; @@ -1738,7 +1735,7 @@ SCM_DEFINE (scm_primitive_generic_generic, "primitive-generic-generic", 1, 0, 0, "") #define FUNC_NAME s_scm_primitive_generic_generic { - if (scm_subr_p (subr) && SCM_SUBR_GENERIC (subr)) + if (SCM_PRIMITIVE_GENERIC_P (subr)) { if (!*SCM_SUBR_GENERIC (subr)) scm_enable_primitive_generic_x (scm_list_1 (subr)); |