diff --git a/libguile/debug.c b/libguile/debug.c index 6e148ab32..71278c5e4 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -309,7 +309,7 @@ SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0, SCM_VALIDATE_PROC (1, proc); switch (SCM_TYP7 (proc)) { case scm_tcs_subrs: - return SCM_SNAME (proc); + return SCM_SUBR_NAME (proc); default: { SCM name = scm_procedure_property (proc, scm_sym_name); diff --git a/libguile/eval.c b/libguile/eval.c index a2e11eeaa..f7f3f27df 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -3397,7 +3397,7 @@ call_dsubr_1 (SCM proc, SCM arg1) return (scm_from_double (SCM_DSUBRF (proc) (scm_i_fraction2double (arg1)))); } SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1, - SCM_ARG1, scm_i_symbol_chars (SCM_SNAME (proc))); + SCM_ARG1, scm_i_symbol_chars (SCM_SUBR_NAME (proc))); } static SCM diff --git a/libguile/eval.i.c b/libguile/eval.i.c index 37fb7c787..99aa265de 100644 --- a/libguile/eval.i.c +++ b/libguile/eval.i.c @@ -1238,7 +1238,7 @@ dispatch: } SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1, SCM_ARG1, - scm_i_symbol_chars (SCM_SNAME (proc))); + scm_i_symbol_chars (SCM_SUBR_NAME (proc))); case scm_tc7_cxr: RETURN (scm_i_chase_pairs (arg1, (scm_t_bits) SCM_SUBRF (proc))); case scm_tc7_rpsubr: @@ -1765,7 +1765,7 @@ tail: RETURN (scm_from_double (SCM_DSUBRF (proc) (scm_i_fraction2double (arg1)))); } SCM_WTA_DISPATCH_1 (*SCM_SUBR_GENERIC (proc), arg1, - SCM_ARG1, scm_i_symbol_chars (SCM_SNAME (proc))); + SCM_ARG1, scm_i_symbol_chars (SCM_SUBR_NAME (proc))); case scm_tc7_cxr: if (SCM_UNLIKELY (SCM_UNBNDP (arg1) || !scm_is_null (args))) scm_wrong_num_args (proc); diff --git a/libguile/goops.c b/libguile/goops.c index f552b9e29..1548472cb 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -1862,7 +1862,7 @@ SCM_DEFINE (scm_enable_primitive_generic_x, "enable-primitive-generic!", 0, 0, 1 *SCM_SUBR_GENERIC (subr) = scm_make (scm_list_3 (scm_class_generic, k_name, - SCM_SNAME (subr))); + SCM_SUBR_NAME (subr))); subrs = SCM_CDR (subrs); } return SCM_UNSPECIFIED; @@ -1905,7 +1905,7 @@ scm_c_extend_primitive_generic (SCM extended, SCM extension) gf = *SCM_SUBR_GENERIC (extended); gext = scm_call_2 (SCM_VARIABLE_REF (scm_var_make_extended_generic), gf, - SCM_SNAME (extension)); + SCM_SUBR_NAME (extension)); SCM_SET_SUBR_GENERIC (extension, gext); } else diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 0fee71a2c..3b7315565 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -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); } diff --git a/libguile/print.c b/libguile/print.c index 3992bc45b..6c44d59db 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -655,7 +655,7 @@ iprin1 (SCM exp, SCM port, scm_print_state *pstate) ? "#', port); break; diff --git a/libguile/procs.c b/libguile/procs.c index 3eb9c247a..93e35ab6c 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -66,7 +66,7 @@ SCM scm_c_define_subr (const char *name, long type, SCM (*fcn) ()) { SCM subr = scm_c_make_subr (name, type, fcn); - scm_define (SCM_SNAME (subr), subr); + scm_define (SCM_SUBR_NAME (subr), subr); return subr; } @@ -93,7 +93,7 @@ scm_c_define_subr_with_generic (const char *name, long type, SCM (*fcn) (), SCM *gf) { SCM subr = scm_c_make_subr_with_generic (name, type, fcn, gf); - scm_define (SCM_SNAME (subr), subr); + scm_define (SCM_SUBR_NAME (subr), subr); return subr; } @@ -237,7 +237,7 @@ SCM_DEFINE (scm_make_procedure_with_setter, "make-procedure-with-setter", 2, 0, lookup */ switch (SCM_TYP7 (procedure)) { case scm_tcs_subrs: - name = SCM_SNAME (procedure); + name = SCM_SUBR_NAME (procedure); break; default: name = scm_procedure_property (procedure, scm_sym_name); diff --git a/libguile/procs.h b/libguile/procs.h index 84e0c6978..ed4ac200a 100644 --- a/libguile/procs.h +++ b/libguile/procs.h @@ -32,7 +32,7 @@ */ #define SCM_SUBR_META_INFO(x) ((SCM *) SCM_CELL_WORD_3 (x)) -#define SCM_SNAME(x) (SCM_SUBR_META_INFO (x) [0]) +#define SCM_SUBR_NAME(x) (SCM_SUBR_META_INFO (x) [0]) #define SCM_SUBRF(x) ((SCM (*)()) SCM_CELL_WORD_1 (x)) #define SCM_SET_SUBRF(x, v) (SCM_SET_CELL_WORD_1 ((x), (v))) #define SCM_DSUBRF(x) ((double (*)()) SCM_CELL_WORD_1 (x))