-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
*/
\f
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <alloca.h>
#include <stdio.h>
+#include <stdarg.h>
+
#include "libguile/_scm.h"
#include "libguile/procprop.h"
#include "libguile/root.h"
SCM_GLOBAL_SYMBOL (scm_sym_name, "name");
-SCM scm_f_gsubr_apply;
-
static SCM
create_gsubr (int define, const char *name,
- int req, int opt, int rst, SCM (*fcn)())
+ unsigned int req, unsigned int opt, unsigned int rst,
+ SCM (*fcn) ())
{
SCM subr;
{
case SCM_GSUBR_MAKTYPE(0, 0, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_0, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(1, 0, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_1, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(0, 1, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_1o, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(1, 1, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_2o, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(2, 0, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_2, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(3, 0, 0):
subr = scm_c_make_subr (name, scm_tc7_subr_3, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(0, 0, 1):
subr = scm_c_make_subr (name, scm_tc7_lsubr, fcn);
- goto create_subr;
+ break;
case SCM_GSUBR_MAKTYPE(2, 0, 1):
subr = scm_c_make_subr (name, scm_tc7_lsubr_2, fcn);
- create_subr:
- if (define)
- scm_define (SCM_SUBR_ENTRY(subr).name, subr);
- return subr;
+ break;
default:
{
- SCM cclo = scm_makcclo (scm_f_gsubr_apply, 3L);
- SCM subr = scm_c_make_subr (name, scm_tc7_subr_0, fcn);
- SCM sym = SCM_SUBR_ENTRY(subr).name;
- if (SCM_GSUBR_MAX < req + opt + rst)
- {
- 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);
- SCM_SET_GSUBR_TYPE (cclo,
- scm_from_int (SCM_GSUBR_MAKTYPE (req, opt, rst)));
- if (SCM_REC_PROCNAMES_P)
- scm_set_procedure_property_x (cclo, scm_sym_name, sym);
- if (define)
- scm_define (sym, cclo);
- return cclo;
+ unsigned type;
+
+ type = SCM_GSUBR_MAKTYPE (req, opt, rst);
+ if (SCM_GSUBR_REQ (type) != req
+ || SCM_GSUBR_OPT (type) != opt
+ || SCM_GSUBR_REST (type) != rst)
+ scm_out_of_range ("create_gsubr", scm_from_uint (req + opt + rst));
+
+ subr = scm_c_make_subr (name, scm_tc7_gsubr | (type << 8U),
+ fcn);
}
}
+
+ if (define)
+ scm_define (SCM_SNAME (subr), subr);
+
+ return subr;
}
SCM
subr = scm_c_make_subr_with_generic (name, scm_tc7_lsubr_2, fcn, gf);
create_subr:
if (define)
- scm_define (SCM_SUBR_ENTRY(subr).name, subr);
+ scm_define (SCM_SNAME (subr), subr);
return subr;
default:
;
return create_gsubr_with_generic (1, name, req, opt, rst, fcn, gf);
}
+/* Apply PROC, a gsubr, to the ARGC arguments in ARGV. ARGC is expected to
+ match the number of arguments of the underlying C function. */
+static SCM
+gsubr_apply_raw (SCM proc, unsigned int argc, const SCM *argv)
+{
+ SCM (*fcn) ();
+ unsigned int type, argc_max;
+
+ type = SCM_GSUBR_TYPE (proc);
+ argc_max = SCM_GSUBR_REQ (type) + SCM_GSUBR_OPT (type)
+ + SCM_GSUBR_REST (type);
+
+ if (SCM_UNLIKELY (argc != argc_max))
+ /* We expect the exact argument count. */
+ scm_wrong_num_args (SCM_SNAME (proc));
+
+ fcn = SCM_SUBRF (proc);
+
+ switch (argc)
+ {
+ case 0:
+ return (*fcn) ();
+ case 1:
+ return (*fcn) (argv[0]);
+ case 2:
+ return (*fcn) (argv[0], argv[1]);
+ case 3:
+ return (*fcn) (argv[0], argv[1], argv[2]);
+ case 4:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3]);
+ case 5:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4]);
+ case 6:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5]);
+ case 7:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+ argv[6]);
+ case 8:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+ argv[6], argv[7]);
+ case 9:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+ argv[6], argv[7], argv[8]);
+ case 10:
+ return (*fcn) (argv[0], argv[1], argv[2], argv[3], argv[4], argv[5],
+ argv[6], argv[7], argv[8], argv[9]);
+ default:
+ scm_misc_error ((char *) SCM_SNAME (proc),
+ "gsubr invocation with more than 10 arguments not implemented",
+ SCM_EOL);
+ }
+
+ return SCM_BOOL_F; /* Never reached. */
+}
+
+/* Apply PROC, a gsubr, to the given arguments. Missing optional arguments
+ are added, and rest arguments are turned into a list. */
+SCM
+scm_i_gsubr_apply (SCM proc, SCM arg, ...)
+{
+ unsigned int type, argc, argc_max;
+ SCM *argv;
+ va_list arg_list;
+
+ type = SCM_GSUBR_TYPE (proc);
+ argc_max = SCM_GSUBR_REQ (type) + SCM_GSUBR_OPT (type);
+ argv = alloca ((argc_max + SCM_GSUBR_REST (type)) * sizeof (*argv));
+
+ va_start (arg_list, arg);
+
+ for (argc = 0;
+ !SCM_UNBNDP (arg) && argc < argc_max;
+ argc++, arg = va_arg (arg_list, SCM))
+ argv[argc] = arg;
+
+ if (SCM_UNLIKELY (argc < SCM_GSUBR_REQ (type)))
+ scm_wrong_num_args (SCM_SNAME (proc));
+
+ /* Fill in optional arguments that were not passed. */
+ while (argc < argc_max)
+ argv[argc++] = SCM_UNDEFINED;
+
+ if (SCM_GSUBR_REST (type))
+ {
+ /* Accumulate rest arguments in a list. */
+ SCM *rest_loc;
+
+ argv[argc_max] = SCM_EOL;
+ for (rest_loc = &argv[argc_max];
+ !SCM_UNBNDP (arg);
+ rest_loc = SCM_CDRLOC (*rest_loc), arg = va_arg (arg_list, SCM))
+ *rest_loc = scm_cons (arg, SCM_EOL);
+
+ argc = argc_max + 1;
+ }
+
+ va_end (arg_list);
+
+ return gsubr_apply_raw (proc, argc, argv);
+}
+
+/* Apply SELF, a gsubr, to the arguments listed in ARGS. Missing optional
+ arguments are added, and rest arguments are kept into a list. */
SCM
-scm_gsubr_apply (SCM args)
-#define FUNC_NAME "scm_gsubr_apply"
+scm_i_gsubr_apply_list (SCM self, SCM args)
+#define FUNC_NAME "scm_i_gsubr_apply"
{
- SCM self = SCM_CAR (args);
- SCM (*fcn)() = SCM_SUBRF (SCM_GSUBR_PROC (self));
SCM v[SCM_GSUBR_MAX];
- int typ = scm_to_int (SCM_GSUBR_TYPE (self));
+ unsigned int typ = SCM_GSUBR_TYPE (self);
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_list_2 (self, scm_from_int (n)));
-#endif
- args = SCM_CDR (args);
+
for (i = 0; i < SCM_GSUBR_REQ (typ); i++) {
if (scm_is_null (args))
- scm_wrong_num_args (SCM_SNAME (SCM_GSUBR_PROC (self)));
+ scm_wrong_num_args (SCM_SNAME (self));
v[i] = SCM_CAR(args);
args = SCM_CDR(args);
}
if (SCM_GSUBR_REST(typ))
v[i] = args;
else if (!scm_is_null (args))
- scm_wrong_num_args (SCM_SNAME (SCM_GSUBR_PROC (self)));
- switch (n) {
- case 2: return (*fcn)(v[0], v[1]);
- case 3: return (*fcn)(v[0], v[1], v[2]);
- case 4: return (*fcn)(v[0], v[1], v[2], v[3]);
- case 5: return (*fcn)(v[0], v[1], v[2], v[3], v[4]);
- case 6: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5]);
- case 7: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6]);
- case 8: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7]);
- case 9: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8]);
- case 10: return (*fcn)(v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9]);
- }
- return SCM_BOOL_F; /* Never reached. */
+ scm_wrong_num_args (SCM_SNAME (self));
+
+ return gsubr_apply_raw (self, n, v);
}
#undef FUNC_NAME
void
scm_init_gsubr()
{
- scm_f_gsubr_apply = scm_c_make_subr ("gsubr-apply", scm_tc7_lsubr,
- scm_gsubr_apply);
#ifdef GSUBR_TEST
scm_c_define_gsubr ("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
#endif
HCoop / bpt / guile.git / blobdiff