mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-24 12:20:20 +02:00
rename SCM_SNAME to SCM_SUBR_NAME
* libguile/procs.h: Rename SCM_SNAME to SCM_SUBR_NAME. * libguile/debug.c: * libguile/eval.c: * libguile/eval.i.c: * libguile/goops.c: * libguile/gsubr.c: * libguile/print.c: * libguile/procs.c: Update callers.
This commit is contained in:
parent
96b73e84bb
commit
ce471ab8b0
8 changed files with 18 additions and 18 deletions
|
@ -94,7 +94,7 @@ create_gsubr (int define, const char *name,
|
|||
}
|
||||
|
||||
if (define)
|
||||
scm_define (SCM_SNAME (subr), subr);
|
||||
scm_define (SCM_SUBR_NAME (subr), subr);
|
||||
|
||||
return subr;
|
||||
}
|
||||
|
@ -149,7 +149,7 @@ create_gsubr_with_generic (int define,
|
|||
subr = scm_c_make_subr_with_generic (name, scm_tc7_lsubr_2, fcn, gf);
|
||||
create_subr:
|
||||
if (define)
|
||||
scm_define (SCM_SNAME (subr), subr);
|
||||
scm_define (SCM_SUBR_NAME (subr), subr);
|
||||
return subr;
|
||||
default:
|
||||
;
|
||||
|
@ -196,7 +196,7 @@ gsubr_apply_raw (SCM proc, unsigned int argc, const SCM *argv)
|
|||
|
||||
if (SCM_UNLIKELY (argc != argc_max))
|
||||
/* We expect the exact argument count. */
|
||||
scm_wrong_num_args (SCM_SNAME (proc));
|
||||
scm_wrong_num_args (SCM_SUBR_NAME (proc));
|
||||
|
||||
fcn = SCM_SUBRF (proc);
|
||||
|
||||
|
@ -229,7 +229,7 @@ gsubr_apply_raw (SCM proc, unsigned int argc, const SCM *argv)
|
|||
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),
|
||||
scm_misc_error ((char *) SCM_SUBR_NAME (proc),
|
||||
"gsubr invocation with more than 10 arguments not implemented",
|
||||
SCM_EOL);
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ scm_i_gsubr_apply (SCM proc, SCM arg, ...)
|
|||
argv[argc] = arg;
|
||||
|
||||
if (SCM_UNLIKELY (argc < SCM_GSUBR_REQ (type)))
|
||||
scm_wrong_num_args (SCM_SNAME (proc));
|
||||
scm_wrong_num_args (SCM_SUBR_NAME (proc));
|
||||
|
||||
/* Fill in optional arguments that were not passed. */
|
||||
while (argc < argc_max)
|
||||
|
@ -296,7 +296,7 @@ scm_i_gsubr_apply_list (SCM self, SCM args)
|
|||
|
||||
for (i = 0; i < SCM_GSUBR_REQ (typ); i++) {
|
||||
if (scm_is_null (args))
|
||||
scm_wrong_num_args (SCM_SNAME (self));
|
||||
scm_wrong_num_args (SCM_SUBR_NAME (self));
|
||||
v[i] = SCM_CAR(args);
|
||||
args = SCM_CDR(args);
|
||||
}
|
||||
|
@ -311,7 +311,7 @@ scm_i_gsubr_apply_list (SCM self, SCM args)
|
|||
if (SCM_GSUBR_REST(typ))
|
||||
v[i] = args;
|
||||
else if (!scm_is_null (args))
|
||||
scm_wrong_num_args (SCM_SNAME (self));
|
||||
scm_wrong_num_args (SCM_SUBR_NAME (self));
|
||||
|
||||
return gsubr_apply_raw (self, n, v);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue