diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-11-28 16:42:49 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-28 16:43:59 +0100 |
commit | c438cd7175540536c3965b4ffea28ae6df7e59e0 (patch) | |
tree | d605cd827451938f46218bb8692d44438cb0ecce /libguile/procs.c | |
parent | fc32c44995dacb2c3f2fb9d1eafec59c44787c32 (diff) | |
download | guile-c438cd7175540536c3965b4ffea28ae6df7e59e0.tar.gz |
eval: Store docstrings for lambdas.
Fixes <http://bugs.gnu.org/12173>.
Reported by Ian Price <ianprice90@googlemail.com>.
* libguile/memoize.c (MAKMEMO_LAMBDA): New `docstring' parameter. Add
it as the second argument of `SCM_M_LAMBDA'. Update caller.
(memoize)[SCM_M_LAMBDA]: Extract docstring from EXP; when `memoize'
returns, add the docstring to the lambda's arguments.
(unmemoize)[SCM_M_LAMBDA]: Adjust to new argument layout of
`SCM_M_LAMBDA'.
* libguile/eval.c (BOOT_CLOSURE_NUM_REQUIRED_ARGS,
BOOT_CLOSURE_HAS_REST_ARGS, BOOT_CLOSURE_IS_REST,
BOOT_CLOSURE_PARSE_FULL): Adjust to new argument layout of
`SCM_M_LAMBDA'.
* module/ice-9/eval.scm (primitive-eval)[make-general-closure]:
Likewise.
[eval]: When EXP is a lambda, match its docstring; when the docstring
is not #f, add it to the closures procedure properties.
* test-suite/tests/eval.test ("docstrings"): New test prefix.
* libguile/procs.c (sym_documentation): Rename to...
(scm_sym_documentation): ... this. Make it global.
* libguile/procs.h (scm_sym_documentation): New declaration.
Diffstat (limited to 'libguile/procs.c')
-rw-r--r-- | libguile/procs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libguile/procs.c b/libguile/procs.c index a096591df..59caed1b4 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - * +/* Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2006, 2008, 2009, + * 2010, 2011, 2012 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 * as published by the Free Software Foundation; either version 3 of @@ -75,7 +76,7 @@ SCM_DEFINE (scm_thunk_p, "thunk?", 1, 0, 0, } #undef FUNC_NAME -SCM_SYMBOL (sym_documentation, "documentation"); +SCM_GLOBAL_SYMBOL (scm_sym_documentation, "documentation"); SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, (SCM proc), @@ -86,7 +87,7 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0, #define FUNC_NAME s_scm_procedure_documentation { SCM_VALIDATE_PROC (SCM_ARG1, proc); - return scm_procedure_property (proc, sym_documentation); + return scm_procedure_property (proc, scm_sym_documentation); } #undef FUNC_NAME |