X-Git-Url: https://git.hcoop.net/bpt/guile.git/blobdiff_plain/c04bf4337b88ea45641065b7fe70dd0973b8ce94..eb3d623da57e6d31a58d95f932345fb761f9b701:/libguile/procs.c

diff --git a/libguile/procs.c b/libguile/procs.c
index 8d9ef15b4..08c5c355e 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -33,7 +33,7 @@
 #include "libguile/validate.h"
 #include "libguile/procs.h"
 #include "libguile/procprop.h"
-#include "libguile/objcodes.h"
+#include "libguile/loader.h"
 #include "libguile/programs.h"
 
 
@@ -48,7 +48,6 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0,
 #define FUNC_NAME s_scm_procedure_p
 {
   return scm_from_bool (SCM_PROGRAM_P (obj)
-                        || SCM_RTL_PROGRAM_P (obj)
                         || (SCM_STRUCTP (obj) && SCM_STRUCT_APPLICABLE_P (obj))
                         || (SCM_HAS_TYP7 (obj, scm_tc7_smob)
                             && SCM_SMOB_APPLICABLE_P (obj)));
@@ -89,18 +88,10 @@ SCM_DEFINE (scm_make_procedure_with_setter, "make-procedure-with-setter", 2, 0,
 	    "with the associated setter @var{setter}.")
 #define FUNC_NAME s_scm_make_procedure_with_setter
 {
-  SCM name, ret;
   SCM_VALIDATE_PROC (1, procedure);
   SCM_VALIDATE_PROC (2, setter);
-  ret = scm_make_struct (pws_vtable, SCM_INUM0,
-                         scm_list_2 (procedure, setter));
-
-  /* don't use procedure_name, because don't care enough to do a reverse
-     lookup */
-  name = scm_procedure_property (procedure, scm_sym_name);
-  if (scm_is_true (name))
-    scm_set_procedure_property_x (ret, scm_sym_name, name);
-  return ret;
+  return scm_make_struct (pws_vtable, SCM_INUM0,
+                          scm_list_2 (procedure, setter));
 }
 #undef FUNC_NAME
 
@@ -126,12 +117,7 @@ SCM_PRIMITIVE_GENERIC (scm_setter, "setter", 1, 0, 0,
     return scm_wta_dispatch_1 (g_scm_setter, proc, SCM_ARG1, FUNC_NAME);
   if (SCM_STRUCT_SETTER_P (proc))
     return SCM_STRUCT_SETTER (proc);
-  if (SCM_PUREGENERICP (proc)
-      && SCM_IS_A_P (proc, scm_class_generic_with_setter))
-    /* FIXME: might not be an accessor */
-    return SCM_GENERIC_SETTER (proc);
   return scm_wta_dispatch_1 (g_scm_setter, proc, SCM_ARG1, FUNC_NAME);
-  return SCM_BOOL_F; /* not reached */
 }
 #undef FUNC_NAME