diff options
author | Andy Wingo <wingo@pobox.com> | 2010-01-06 22:16:57 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-01-07 23:49:39 +0100 |
commit | cc7005bc371ee104c368dbb894eb4f8b7a86d64a (patch) | |
tree | 8d4e17497cf6b11b9f22e528efcf9b29b51cba2d /libguile/procprop.c | |
parent | 6c2961a01142c7ba9fc03a410004dd696e9208cd (diff) | |
download | guile-cc7005bc371ee104c368dbb894eb4f8b7a86d64a.tar.gz |
remove scm_tc7_gsubr
* libguile/tags.h (scm_tc7_gsubr): Return to the pool of unused tc7s, as
there are no more gsubrs. Yay :)
* libguile/programs.h (SCM_F_PROGRAM_IS_PRIMITIVE):
(SCM_PROGRAM_IS_PRIMITIVE): New flag and accessor.
* libguile/gsubr.c (create_gsubr):
* libguile/snarf.h (SCM_STATIC_PROGRAM): Give subrs a PRIMITIVE flag.
* libguile/smob.h:
* libguile/smob.c (scm_i_smob_arity): New internal procedure. Uses the
old GSUBR type macros, local to the file.
* libguile/procprop.c (scm_i_procedure_arity): Call out to
scm_i_smob_arity, and remove a gsubr case.
* libguile/gc.c (scm_i_tag_name):
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/goops.c (scm_class_of):
* libguile/vm.c (apply_foreign):
* libguile/hash.c (scm_hasher):
* libguile/debug.c (scm_procedure_name):
* libguile/print.c (iprin1): Remove gsubr cases.
* libguile/gsubr.h (SCM_PRIMITIVE_P): Fix to work with the new VM
program regimen.
(SCM_GSUBR_TYPE, SCM_GSUBR_MAKTYPE, SCM_GSUBR_MAX, SCM_GSUBR_REQ)
(SCM_GSUBR_OPT, SCM_GSUBR_REST): Remove these macros, that are no
longer useful.
* libguile/gsubr.c (scm_i_gsubr_apply, scm_i_gsubr_apply_list)
(scm_i_gsubr_apply_array): Remove internal gsubr application
functions.
Diffstat (limited to 'libguile/procprop.c')
-rw-r--r-- | libguile/procprop.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/libguile/procprop.c b/libguile/procprop.c index 24d65dce7..641defc49 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -56,24 +56,7 @@ scm_i_procedure_arity (SCM proc, int *req, int *opt, int *rest) case scm_tc7_program: return scm_i_program_arity (proc, req, opt, rest); case scm_tc7_smob: - if (SCM_SMOB_APPLICABLE_P (proc)) - { - int type = SCM_SMOB_DESCRIPTOR (proc).gsubr_type; - *req = SCM_GSUBR_REQ (type); - *opt = SCM_GSUBR_OPT (type); - *rest = SCM_GSUBR_REST (type); - return 1; - } - else - return 0; - case scm_tc7_gsubr: - { - unsigned int type = SCM_GSUBR_TYPE (proc); - *req = SCM_GSUBR_REQ (type); - *opt = SCM_GSUBR_OPT (type); - *rest = SCM_GSUBR_REST (type); - return 1; - } + return scm_i_smob_arity (proc, req, opt, rest); case scm_tcs_struct: if (!SCM_STRUCT_APPLICABLE_P (proc)) return 0; |