summaryrefslogtreecommitdiff
path: root/libguile
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-04-17 15:02:56 +0200
committerAndy Wingo <wingo@pobox.com>2010-04-17 15:21:08 +0200
commit07e424b753b31702bdee9a2f144af8dd407abfaf (patch)
tree6abb585285a30776f4d48209b362f0dffc672f7d /libguile
parent90fa152c1d2cf2e57050ac0f9da7eba1449bbc26 (diff)
downloadguile-07e424b753b31702bdee9a2f144af8dd407abfaf.tar.gz
scm_i_program_properties is internal; just use procedure-properties
* libguile/programs.h: * libguile/programs.c (scm_i_program_properties): Make internal. (scm_program_name): Use scm_i_program_properties. * libguile/procprop.c (scm_procedure_properties): Use scm_i_program_properties, for programs. * libguile/procs.c (scm_procedure_documentation): Use procedure-property to get to 'documentation, not program-property. * module/system/vm/program.scm (program-properties, program-property): Remove from the exports list. (program-documentation): Use procedure-property. * module/texinfo/reflection.scm (macro-arguments) (macro-additional-stexi) (object-stexi-documentation): Use procedure-property, not program-property.
Diffstat (limited to 'libguile')
-rw-r--r--libguile/procprop.c2
-rw-r--r--libguile/procs.c7
-rw-r--r--libguile/programs.c9
-rw-r--r--libguile/programs.h2
4 files changed, 8 insertions, 12 deletions
diff --git a/libguile/procprop.c b/libguile/procprop.c
index 13b175869..2b894977a 100644
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -88,7 +88,7 @@ SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0,
if (scm_is_false (ret))
{
if (SCM_PROGRAM_P (proc))
- ret = scm_program_properties (proc);
+ ret = scm_i_program_properties (proc);
else
ret = SCM_EOL;
}
diff --git a/libguile/procs.c b/libguile/procs.c
index 10ae8855f..c6fab7214 100644
--- a/libguile/procs.c
+++ b/libguile/procs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -86,10 +86,7 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0,
#define FUNC_NAME s_scm_procedure_documentation
{
SCM_VALIDATE_PROC (SCM_ARG1, proc);
- if (SCM_PROGRAM_P (proc))
- return scm_assq_ref (scm_program_properties (proc), sym_documentation);
- else
- return SCM_BOOL_F;
+ return scm_procedure_property (proc, sym_documentation);
}
#undef FUNC_NAME
diff --git a/libguile/programs.c b/libguile/programs.c
index 79b1c320b..08b6f65ab 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -244,10 +244,9 @@ SCM_DEFINE (scm_program_arities, "program-arities", 1, 0, 0,
}
#undef FUNC_NAME
-SCM_DEFINE (scm_program_properties, "program-properties", 1, 0, 0,
- (SCM program),
- "")
-#define FUNC_NAME s_scm_program_properties
+SCM
+scm_i_program_properties (SCM program)
+#define FUNC_NAME "%program-properties"
{
SCM meta;
@@ -267,7 +266,7 @@ SCM_DEFINE (scm_program_name, "program-name", 1, 0, 0,
#define FUNC_NAME s_scm_program_name
{
SCM_VALIDATE_PROGRAM (1, program);
- return scm_assq_ref (scm_program_properties (program), scm_sym_name);
+ return scm_assq_ref (scm_i_program_properties (program), scm_sym_name);
}
#undef FUNC_NAME
diff --git a/libguile/programs.h b/libguile/programs.h
index c8e3bf626..6c59fdd1e 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_properties (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);
@@ -67,6 +66,7 @@ SCM_API SCM scm_program_objcode (SCM program);
SCM_API SCM scm_c_program_source (SCM program, size_t ip);
+SCM_INTERNAL SCM scm_i_program_properties (SCM program);
SCM_INTERNAL int scm_i_program_arity (SCM program, int *req, int *opt, int *rest);
SCM_INTERNAL void scm_i_program_print (SCM program, SCM port,
scm_print_state *pstate);