summaryrefslogtreecommitdiff
path: root/libguile/procprop.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-09-03 11:57:29 +0200
committerAndy Wingo <wingo@pobox.com>2009-12-03 15:22:07 +0100
commitdf338a22646fa6a783d72d67f3e6c4d4aee65c72 (patch)
treedf8dc86dade6e55d70d33fb8fdd624d4c5006d47 /libguile/procprop.c
parentdf9ca8d8b2f48e7042298a9a788b749b46fc5efc (diff)
downloadguile-df338a22646fa6a783d72d67f3e6c4d4aee65c72.tar.gz
remove tc7_subr_* and tc7_lsubr_*
* libguile/tags.h: Remove tc7 #defines for subrs, replacing them with placeholders. These were public, but hopfully unused. I don't see how to usefully deprecate them. * libguile/array-map.c (scm_array_map_x): Remove special cases for certain subr types. This might make things slower for the moment, otoh, native compilation should moot that question. * libguile/eval.i.c: * libguile/eval.c: Remove subr-handling cases. To regain this speed and more won't have to wait for native compilation, though -- this change smooths the way for subr dispatch in the VM. * libguile/gsubr.c (scm_i_gsubr_apply): Fix a bug in which we didn't detect too-many-arguments. This would only show up when using ceval, as only ceval called this function. * test-suite/tests/ramap.test ("array-map!"): Change the expected exception if passed a procedure of the wrong arity. It now gives wrong-num-args. more won't have to wait for native compilation, though -- this change smooths the way for subr dispatch in the VM. * libguile/goops.c (scm_class_of): Remove subr cases. No speed implication. * libguile/objects.c (scm_valid_object_procedure_p): Remove this public but undocumented, and useless, function. I do not think this will affect anyone at all. (scm_set_object_procedure_x): Replace a call to scm_valid_object_procedure_p with scm_procedure_p, and actually wrap with a scm_is_true. * module/oop/goops.scm (initialize-object-procedure): Don't call valid-object-procedure?.
Diffstat (limited to 'libguile/procprop.c')
-rw-r--r--libguile/procprop.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/libguile/procprop.c b/libguile/procprop.c
index cce800f2b..052e5a0c7 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -53,26 +53,12 @@ scm_i_procedure_arity (SCM proc)
loop:
switch (SCM_TYP7 (proc))
{
- case scm_tc7_subr_1o:
- o = 1;
- case scm_tc7_subr_0:
- break;
- case scm_tc7_subr_2o:
- o = 1;
- case scm_tc7_subr_1:
case scm_tc7_dsubr:
case scm_tc7_cxr:
a += 1;
break;
- case scm_tc7_subr_2:
- a += 2;
- break;
- case scm_tc7_subr_3:
- a += 3;
- break;
case scm_tc7_asubr:
case scm_tc7_rpsubr:
- case scm_tc7_lsubr:
r = 1;
break;
case scm_tc7_program:
@@ -80,10 +66,6 @@ scm_i_procedure_arity (SCM proc)
break;
else
return SCM_BOOL_F;
- case scm_tc7_lsubr_2:
- a += 2;
- r = 1;
- break;
case scm_tc7_smob:
if (SCM_SMOB_APPLICABLE_P (proc))
{