* goops.c (TEST_CHANGE_CLASS): Use scm_change_object_class instead

[bpt/guile.git] / libguile / gsubr.c

diff --git a/libguile/gsubr.c b/libguile/gsubr.c
index e7513ba..42af8ad 100644 (file)
--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@@ -1,15 +1,15 @@
-/*     Copyright (C) 1995,1996,1997,1998, 1999, 2000 Free Software Foundation, Inc.
- * 
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2, or (at your option)
  * any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
@@ -39,9 +39,6 @@
  * whether to permit this exception to apply to your modifications.
  * If you do not wish that, delete this exception notice.  */
 
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
 \f
 
 #include <stdio.h>
@@ -65,7 +62,7 @@ SCM_GLOBAL_SYMBOL (scm_sym_name, "name");
 SCM scm_f_gsubr_apply;
 
 static SCM
-create_gsubr (int define, const char *name, 
+create_gsubr (int define, const char *name,
              int req, int opt, int rst, SCM (*fcn)())
 {
   SCM subr;
@@ -106,7 +103,9 @@ create_gsubr (int define, const char *name,
        SCM sym = SCM_SUBR_ENTRY(subr).name;
        if (SCM_GSUBR_MAX < req + opt + rst)
          {
-           fputs ("ERROR in scm_c_make_gsubr: too many args\n", stderr);
+            fprintf (stderr,
+                     "ERROR in scm_c_make_gsubr: too many args (%d) to %s\n",
+                     req + opt + rst, name);
            exit (1);
          }
        SCM_SET_GSUBR_PROC (cclo, subr);
@@ -218,16 +217,14 @@ scm_gsubr_apply (SCM args)
   long i, n = SCM_GSUBR_REQ (typ) + SCM_GSUBR_OPT (typ) + SCM_GSUBR_REST (typ);
 #if 0
   if (n > SCM_GSUBR_MAX)
-    scm_misc_error (FUNC_NAME, 
-                   "Function ~S has illegal arity ~S.", 
+    scm_misc_error (FUNC_NAME,
+                   "Function ~S has illegal arity ~S.",
                    scm_list_2 (self, SCM_MAKINUM (n)));
 #endif
   args = SCM_CDR (args);
   for (i = 0; i < SCM_GSUBR_REQ (typ); i++) {
-#ifndef SCM_RECKLESS
     if (SCM_NULLP (args))
       scm_wrong_num_args (SCM_SNAME (SCM_GSUBR_PROC (self)));
-#endif
     v[i] = SCM_CAR(args);
     args = SCM_CDR(args);
   }
@@ -261,7 +258,7 @@ scm_gsubr_apply (SCM args)
 
 #ifdef GSUBR_TEST
 /* A silly example, taking 2 required args, 1 optional, and
-   a scm_list of rest args 
+   a scm_list of rest args
    */
 SCM
 gsubr_21l(SCM req1, SCM req2, SCM opt, SCM rst)
@@ -280,7 +277,6 @@ gsubr_21l(SCM req1, SCM req2, SCM opt, SCM rst)
 #endif
 
 
-
 void
 scm_init_gsubr()
 {
@@ -290,37 +286,9 @@ scm_init_gsubr()
   scm_c_define_gsubr ("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
 #endif
 
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/gsubr.x"
-#endif
-}
-
-#if SCM_DEBUG_DEPRECATED == 0
-
-SCM
-scm_make_gsubr (const char *name, int req, int opt, int rst, SCM (*fcn)())
-{
-  scm_c_issue_deprecation_warning 
-    ("`scm_make_gsubr' is deprecated.  Use `scm_c_define_gsubr' instead.");
-
-  return scm_c_define_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)
-{
-  scm_c_issue_deprecation_warning 
-    ("`scm_make_gsubr_with_generic' is deprecated.  "
-     "Use `scm_c_define_gsubr_with_generic' instead.");
-
-  return scm_c_define_gsubr_with_generic (name, req, opt, rst, fcn, gf);
 }
 
-#endif /* !SCM_DEBUG_DEPRECATED */
-
-
 /*
   Local Variables:
   c-file-style: "gnu"