diff options
author | Daniel Kraft <d@domob.eu> | 2009-08-27 19:26:04 +0200 |
---|---|---|
committer | Daniel Kraft <d@domob.eu> | 2009-08-27 19:26:04 +0200 |
commit | ff810079188b8d04224959d5b54254d3e142d6c3 (patch) | |
tree | a58a203dd1a4f151ee8730c5a8290b0c36c2a04e /libguile/procs.c | |
parent | 9a9f123144c179ef659252d3442117d6b774be7f (diff) | |
parent | fa316af70ff11767d9a8eb971d9e0b888152a15c (diff) | |
download | guile-ff810079188b8d04224959d5b54254d3e142d6c3.tar.gz |
Merge branch 'master' of git://git.savannah.gnu.org/guile into elisp
Diffstat (limited to 'libguile/procs.c')
-rw-r--r-- | libguile/procs.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libguile/procs.c b/libguile/procs.c index 93e35ab6c..815e29fe7 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -112,6 +112,7 @@ SCM_DEFINE (scm_procedure_p, "procedure?", 1, 0, 0, case scm_tcs_closures: case scm_tcs_subrs: case scm_tc7_pws: + case scm_tc7_program: return SCM_BOOL_T; case scm_tc7_smob: return scm_from_bool (SCM_SMOB_DESCRIPTOR (obj).apply); @@ -151,6 +152,10 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0, return SCM_BOOL_T; case scm_tc7_gsubr: return scm_from_bool (SCM_GSUBR_REQ (SCM_GSUBR_TYPE (obj)) == 0); + case scm_tc7_program: + return scm_from_bool (SCM_PROGRAM_DATA (obj)->nargs == 0 + || (SCM_PROGRAM_DATA (obj)->nargs == 1 + && SCM_PROGRAM_DATA (obj)->nrest)); case scm_tc7_pws: obj = SCM_PROCEDURE (obj); goto again; @@ -179,6 +184,8 @@ scm_subr_p (SCM obj) return 0; } +SCM_SYMBOL (sym_documentation, "documentation"); + SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, (SCM proc), "Return the documentation string associated with @code{proc}. By\n" @@ -190,6 +197,8 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, SCM code; SCM_ASSERT (scm_is_true (scm_procedure_p (proc)), proc, SCM_ARG1, FUNC_NAME); + if (SCM_PROGRAM_P (proc)) + return scm_assq_ref (scm_program_properties (proc), sym_documentation); switch (SCM_TYP7 (proc)) { case scm_tcs_closures: |