diff options
author | Andy Wingo <wingo@pobox.com> | 2010-04-17 15:17:24 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-04-17 15:21:08 +0200 |
commit | 1e23b461ecd25c582dd0b10ebb1d7fd22f5e5ec4 (patch) | |
tree | 196955f1910c7899ea3cf77f155508f93ecd5a52 /libguile | |
parent | 07e424b753b31702bdee9a2f144af8dd407abfaf (diff) | |
download | guile-1e23b461ecd25c582dd0b10ebb1d7fd22f5e5ec4.tar.gz |
remove program-name, program-documentation
* libguile/programs.h:
* libguile/programs.c (scm_program_name): Remove. procedure-name is
sufficient.
* module/system/vm/program.scm (program-name): Remove from exports list.
(program-documentation): Remove; procedure-documentation is
sufficient.
* libguile/debug.c (scm_procedure_name): Remove special case for
programs.
* module/language/tree-il/analyze.scm (validate-arity): Use
procedure-name.
* module/ice-9/documentation.scm (object-documentation): Just use
procedure-documentation, without special cases for programs.
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/debug.c | 7 | ||||
-rw-r--r-- | libguile/programs.c | 10 | ||||
-rw-r--r-- | libguile/programs.h | 1 |
3 files changed, 1 insertions, 17 deletions
diff --git a/libguile/debug.c b/libguile/debug.c index c8e908fdf..30332f496 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -137,15 +137,10 @@ SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0, "Return the name of the procedure @var{proc}") #define FUNC_NAME s_scm_procedure_name { - SCM name; - SCM_VALIDATE_PROC (1, proc); while (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc)) proc = SCM_STRUCT_PROCEDURE (proc); - name = scm_procedure_property (proc, scm_sym_name); - if (scm_is_false (name) && SCM_PROGRAM_P (proc)) - name = scm_program_name (proc); - return name; + return scm_procedure_property (proc, scm_sym_name); } #undef FUNC_NAME diff --git a/libguile/programs.c b/libguile/programs.c index 08b6f65ab..70c399ba8 100644 --- a/libguile/programs.c +++ b/libguile/programs.c @@ -260,16 +260,6 @@ scm_i_program_properties (SCM program) } #undef FUNC_NAME -SCM_DEFINE (scm_program_name, "program-name", 1, 0, 0, - (SCM program), - "") -#define FUNC_NAME s_scm_program_name -{ - SCM_VALIDATE_PROGRAM (1, program); - return scm_assq_ref (scm_i_program_properties (program), scm_sym_name); -} -#undef FUNC_NAME - SCM_DEFINE (scm_program_source, "program-source", 2, 0, 0, (SCM program, SCM ip), "") diff --git a/libguile/programs.h b/libguile/programs.h index 6c59fdd1e..7f9b6f72d 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -56,7 +56,6 @@ SCM_API SCM scm_program_bindings (SCM program); SCM_API SCM scm_program_sources (SCM program); SCM_API SCM scm_program_source (SCM program, SCM ip); SCM_API SCM scm_program_arities (SCM program); -SCM_API SCM scm_program_name (SCM program); SCM_API SCM scm_program_objects (SCM program); SCM_API SCM scm_program_module (SCM program); SCM_API SCM scm_program_num_free_variables (SCM program); |