diff options
author | Andy Wingo <wingo@pobox.com> | 2013-11-19 18:57:31 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 18:57:31 +0100 |
commit | 8079714576442964f84d215f3edbad5f07ae3911 (patch) | |
tree | 5e395c4d3bdf3c58807b8411635418528562e77f | |
parent | e326baac0bc4b3049a97f429349f2c3c5a22b8a3 (diff) | |
download | guile-8079714576442964f84d215f3edbad5f07ae3911.tar.gz |
scm_i_rtl_program_* -> scm_i_program_*
* libguile/programs.h (scm_i_make_program):
* libguile/programs.c (scm_i_program_name):
(scm_i_program_documentation):
(scm_i_program_properties): Remove "rtl_" infix.
* libguile/objcodes.c:
* libguile/procprop.c:
* libguile/vm.c: Adapt callers.
-rw-r--r-- | libguile/objcodes.c | 2 | ||||
-rw-r--r-- | libguile/procprop.c | 6 | ||||
-rw-r--r-- | libguile/programs.c | 8 | ||||
-rw-r--r-- | libguile/programs.h | 8 | ||||
-rw-r--r-- | libguile/vm.c | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 0515a7cb5..14ed564df 100644 --- a/libguile/objcodes.c +++ b/libguile/objcodes.c @@ -92,7 +92,7 @@ pointer_to_procedure (enum bytecode_kind bytecode_kind, char *ptr) { case BYTECODE_KIND_GUILE_2_2: { - return scm_i_make_rtl_program ((scm_t_uint32 *) ptr); + return scm_i_make_program ((scm_t_uint32 *) ptr); } case BYTECODE_KIND_NONE: default: diff --git a/libguile/procprop.c b/libguile/procprop.c index 0c63a217c..d45536062 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -147,7 +147,7 @@ SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0, return scm_cdr (user_props); if (SCM_PROGRAM_P (proc)) - ret = scm_i_rtl_program_properties (proc); + ret = scm_i_program_properties (proc); else ret = SCM_EOL; @@ -259,7 +259,7 @@ SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0, } if (SCM_PROGRAM_P (proc)) - return scm_i_rtl_program_name (proc); + return scm_i_program_name (proc); else if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc)) return scm_procedure_name (SCM_STRUCT_PROCEDURE (proc)); else @@ -296,7 +296,7 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, } if (SCM_PROGRAM_P (proc)) - return scm_i_rtl_program_documentation (proc); + return scm_i_program_documentation (proc); else return SCM_BOOL_F; } diff --git a/libguile/programs.c b/libguile/programs.c index 56a32e1f8..fa77b0dd7 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -72,7 +72,7 @@ SCM_DEFINE (scm_rtl_program_code, "rtl-program-code", 1, 0, 0, #undef FUNC_NAME SCM -scm_i_rtl_program_name (SCM program) +scm_i_program_name (SCM program) { static SCM rtl_program_name = SCM_BOOL_F; @@ -87,7 +87,7 @@ scm_i_rtl_program_name (SCM program) } SCM -scm_i_rtl_program_documentation (SCM program) +scm_i_program_documentation (SCM program) { static SCM rtl_program_documentation = SCM_BOOL_F; @@ -103,13 +103,13 @@ scm_i_rtl_program_documentation (SCM program) } SCM -scm_i_rtl_program_properties (SCM program) +scm_i_program_properties (SCM program) { static SCM rtl_program_properties = SCM_BOOL_F; if (SCM_PRIMITIVE_P (program)) { - SCM name = scm_i_rtl_program_name (program); + SCM name = scm_i_program_name (program); if (scm_is_false (name)) return SCM_EOL; return scm_acons (scm_sym_name, name, SCM_EOL); diff --git a/libguile/programs.h b/libguile/programs.h index 19c4d5db0..51ff314c2 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -35,7 +35,7 @@ #ifdef BUILDING_LIBGUILE static inline SCM -scm_i_make_rtl_program (const scm_t_uint32 *code) +scm_i_make_program (const scm_t_uint32 *code) { return scm_cell (scm_tc7_program, (scm_t_bits)code); } @@ -48,9 +48,9 @@ SCM_INTERNAL SCM scm_rtl_program_code (SCM program); SCM_INTERNAL SCM scm_primitive_p (SCM obj); SCM_INTERNAL SCM scm_primitive_call_ip (SCM prim); -SCM_INTERNAL SCM scm_i_rtl_program_name (SCM program); -SCM_INTERNAL SCM scm_i_rtl_program_documentation (SCM program); -SCM_INTERNAL SCM scm_i_rtl_program_properties (SCM program); +SCM_INTERNAL SCM scm_i_program_name (SCM program); +SCM_INTERNAL SCM scm_i_program_documentation (SCM program); +SCM_INTERNAL SCM scm_i_program_properties (SCM program); SCM_INTERNAL SCM scm_find_source_for_addr (SCM ip); diff --git a/libguile/vm.c b/libguile/vm.c index e2e460645..c4aa65e54 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -1214,13 +1214,13 @@ scm_bootstrap_vm (void) sym_regular = scm_from_latin1_symbol ("regular"); sym_debug = scm_from_latin1_symbol ("debug"); - rtl_boot_continuation = scm_i_make_rtl_program (rtl_boot_continuation_code); + rtl_boot_continuation = scm_i_make_program (rtl_boot_continuation_code); SCM_SET_CELL_WORD_0 (rtl_boot_continuation, (SCM_CELL_WORD_0 (rtl_boot_continuation) | SCM_F_PROGRAM_IS_BOOT)); #define DEFINE_BUILTIN(builtin, BUILTIN, req, opt, rest) \ - vm_builtin_##builtin = scm_i_make_rtl_program (vm_builtin_##builtin##_code); + vm_builtin_##builtin = scm_i_make_program (vm_builtin_##builtin##_code); FOR_EACH_VM_BUILTIN (DEFINE_BUILTIN); #undef DEFINE_BUILTIN |