-/* Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998, 1999, 2000 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
* If you write modifications of your own for GUILE, it is your choice
* 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>
-#include "_scm.h"
-#include "genio.h"
-#include "procprop.h"
+#include "libguile/_scm.h"
+#include "libguile/procprop.h"
+#include "libguile/root.h"
-#include "gsubr.h"
+#include "libguile/gsubr.h"
+#include "libguile/deprecation.h"
\f
/*
* gsubr.c
* and rest arguments.
*/
-#include "gsubr.h"
-
/* #define GSUBR_TEST */
-SCM scm_i_name;
-SCM scm_i_inner_name;
+SCM_GLOBAL_SYMBOL (scm_sym_name, "name");
+
SCM scm_f_gsubr_apply;
-SCM
-scm_make_gsubr(name, req, opt, rst, fcn)
- char *name;
- int req;
- int opt;
- int rst;
- SCM (*fcn)();
+static SCM
+create_gsubr (int define, const char *name,
+ int req, int opt, int rst, SCM (*fcn)())
{
- switch SCM_GSUBR_MAKTYPE(req, opt, rst) {
- case SCM_GSUBR_MAKTYPE(0, 0, 0): return scm_make_subr(name, scm_tc7_subr_0, fcn);
- case SCM_GSUBR_MAKTYPE(1, 0, 0): return scm_make_subr(name, scm_tc7_subr_1, fcn);
- case SCM_GSUBR_MAKTYPE(0, 1, 0): return scm_make_subr(name, scm_tc7_subr_1o, fcn);
- case SCM_GSUBR_MAKTYPE(1, 1, 0): return scm_make_subr(name, scm_tc7_subr_2o, fcn);
- case SCM_GSUBR_MAKTYPE(2, 0, 0): return scm_make_subr(name, scm_tc7_subr_2, fcn);
- case SCM_GSUBR_MAKTYPE(3, 0, 0): return scm_make_subr(name, scm_tc7_subr_3, fcn);
- case SCM_GSUBR_MAKTYPE(0, 0, 1): return scm_make_subr(name, scm_tc7_lsubr, fcn);
- case SCM_GSUBR_MAKTYPE(2, 0, 1): return scm_make_subr(name, scm_tc7_lsubr_2, fcn);
- default:
+ SCM subr;
+
+ switch (SCM_GSUBR_MAKTYPE (req, opt, rst))
{
- SCM symcell = scm_sysintern(name, SCM_UNDEFINED);
- SCM z, cclo = scm_makcclo(scm_f_gsubr_apply, 3L);
- long tmp = ((((SCM_CELLPTR)(SCM_CAR(symcell)))-scm_heap_org)<<8);
- if (SCM_GSUBR_MAX < req + opt + rst) {
- fputs("ERROR in scm_make_gsubr: too many args\n", stderr);
- exit (1);
- }
- if ((tmp>>8) != ((SCM_CELLPTR)(SCM_CAR(symcell))-scm_heap_org))
- tmp = 0;
- SCM_NEWCELL(z);
- SCM_SUBRF(z) = fcn;
- SCM_SETCAR (z, tmp + scm_tc7_subr_0);
- SCM_GSUBR_PROC(cclo) = z;
- SCM_GSUBR_TYPE(cclo) = SCM_MAKINUM(SCM_GSUBR_MAKTYPE(req, opt, rst));
- SCM_SETCDR (symcell, cclo);
+ case SCM_GSUBR_MAKTYPE(0, 0, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_0, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(1, 0, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_1, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(0, 1, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_1o, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(1, 1, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_2o, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(2, 0, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_2, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(3, 0, 0):
+ subr = scm_c_make_subr (name, scm_tc7_subr_3, fcn);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(0, 0, 1):
+ subr = scm_c_make_subr (name, scm_tc7_lsubr, fcn);
+ goto create_subr;
+ 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;
+ 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)
+ {
+ fputs ("ERROR in scm_c_make_gsubr: too many args\n", stderr);
+ exit (1);
+ }
+ SCM_SET_GSUBR_PROC (cclo, subr);
+ SCM_SET_GSUBR_TYPE (cclo,
+ SCM_MAKINUM (SCM_GSUBR_MAKTYPE (req, opt, rst)));
#ifdef DEBUG_EXTENSIONS
- if (SCM_REC_PROCNAMES_P)
- scm_set_procedure_property_x (cclo, scm_i_name, SCM_CAR (symcell));
+ if (SCM_REC_PROCNAMES_P)
+ scm_set_procedure_property_x (cclo, scm_sym_name, sym);
#endif
+ if (define)
+ scm_define (sym, cclo);
return cclo;
+ }
}
- }
}
+SCM
+scm_c_make_gsubr (const char *name, int req, int opt, int rst, SCM (*fcn)())
+{
+ return create_gsubr (0, name, req, opt, rst, fcn);
+}
+
+SCM
+scm_c_define_gsubr (const char *name, int req, int opt, int rst, SCM (*fcn)())
+{
+ return create_gsubr (1, name, req, opt, rst, fcn);
+}
+
+static SCM
+create_gsubr_with_generic (int define,
+ const char *name,
+ int req,
+ int opt,
+ int rst,
+ SCM (*fcn)(),
+ SCM *gf)
+{
+ SCM subr;
-SCM_PROC(s_gsubr_apply, "gsubr-apply", 0, 0, 1, scm_gsubr_apply);
+ switch (SCM_GSUBR_MAKTYPE(req, opt, rst))
+ {
+ case SCM_GSUBR_MAKTYPE(0, 0, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_0, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(1, 0, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_1, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(0, 1, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_1o, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(1, 1, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_2o, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(2, 0, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_2, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(3, 0, 0):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_subr_3, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(0, 0, 1):
+ subr = scm_c_make_subr_with_generic (name, scm_tc7_lsubr, fcn, gf);
+ goto create_subr;
+ case SCM_GSUBR_MAKTYPE(2, 0, 1):
+ 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);
+ return subr;
+ default:
+ ;
+ }
+ scm_misc_error ("scm_c_make_gsubr_with_generic",
+ "can't make primitive-generic with this arity",
+ SCM_EOL);
+ return SCM_BOOL_F; /* never reached */
+}
SCM
-scm_gsubr_apply(args)
- SCM args;
+scm_c_make_gsubr_with_generic (const char *name,
+ int req,
+ int opt,
+ int rst,
+ SCM (*fcn)(),
+ SCM *gf)
{
- SCM self = SCM_CAR(args);
- SCM (*fcn)() = SCM_SUBRF(SCM_GSUBR_PROC(self));
- SCM v[10]; /* must agree with greatest supported arity */
- int typ = SCM_INUM(SCM_GSUBR_TYPE(self));
- int i, n = SCM_GSUBR_REQ(typ) + SCM_GSUBR_OPT(typ) + SCM_GSUBR_REST(typ);
+ return create_gsubr_with_generic (0, name, req, opt, rst, fcn, gf);
+}
+
+SCM
+scm_c_define_gsubr_with_generic (const char *name,
+ int req,
+ int opt,
+ int rst,
+ SCM (*fcn)(),
+ SCM *gf)
+{
+ return create_gsubr_with_generic (1, name, req, opt, rst, fcn, gf);
+}
+
+
+SCM
+scm_gsubr_apply (SCM args)
+#define FUNC_NAME "scm_gsubr_apply"
+{
+ SCM self = SCM_CAR (args);
+ SCM (*fcn)() = SCM_SUBRF (SCM_GSUBR_PROC (self));
+ SCM v[SCM_GSUBR_MAX];
+ long typ = SCM_INUM (SCM_GSUBR_TYPE (self));
+ long i, n = SCM_GSUBR_REQ (typ) + SCM_GSUBR_OPT (typ) + SCM_GSUBR_REST (typ);
#if 0
- SCM_ASSERT(n <= sizeof(v)/sizeof(SCM),
- self, "internal programming error", s_gsubr_apply);
+ if (n > SCM_GSUBR_MAX)
+ 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++) {
+ args = SCM_CDR (args);
+ for (i = 0; i < SCM_GSUBR_REQ (typ); i++) {
#ifndef SCM_RECKLESS
- if (SCM_IMP(args))
- wnargs: scm_wrong_num_args (SCM_SNAME(SCM_GSUBR_PROC(self)));
+ if (SCM_NULLP (args))
+ scm_wrong_num_args (SCM_SNAME (SCM_GSUBR_PROC (self)));
#endif
v[i] = SCM_CAR(args);
args = SCM_CDR(args);
}
- for (; i < SCM_GSUBR_REQ(typ) + SCM_GSUBR_OPT(typ); i++) {
- if (SCM_NIMP(args)) {
- v[i] = SCM_CAR(args);
+ for (; i < SCM_GSUBR_REQ (typ) + SCM_GSUBR_OPT (typ); i++) {
+ if (SCM_NIMP (args)) {
+ v[i] = SCM_CAR (args);
args = SCM_CDR(args);
}
else
}
if (SCM_GSUBR_REST(typ))
v[i] = args;
- else
- SCM_ASRTGO(SCM_NULLP(args), wnargs);
+ else if (!SCM_NULLP (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 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 0; /* Never reached. */
+ return SCM_BOOL_F; /* Never reached. */
}
+#undef FUNC_NAME
#ifdef GSUBR_TEST
a scm_list of rest args
*/
SCM
-gsubr_21l(req1, req2, opt, rst)
- SCM req1, req2, opt, rst;
+gsubr_21l(SCM req1, SCM req2, SCM opt, SCM rst)
{
scm_puts ("gsubr-2-1-l:\n req1: ", scm_cur_outp);
scm_display(req1, scm_cur_outp);
void
scm_init_gsubr()
{
- scm_f_gsubr_apply = scm_make_subr(s_gsubr_apply, scm_tc7_lsubr, scm_gsubr_apply);
- scm_i_name = SCM_CAR (scm_sysintern ("name", SCM_UNDEFINED));
- scm_permanent_object (scm_i_name);
- scm_i_inner_name = SCM_CAR (scm_sysintern ("inner-name", SCM_UNDEFINED));
- scm_permanent_object (scm_i_inner_name);
+ scm_f_gsubr_apply = scm_c_make_subr ("gsubr-apply", scm_tc7_lsubr,
+ scm_gsubr_apply);
#ifdef GSUBR_TEST
- scm_make_gsubr("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
+ 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"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff