diff options
author | Martin Grabmüller <mgrabmue@cs.tu-berlin.de> | 2001-03-12 07:08:46 +0000 |
---|---|---|
committer | Martin Grabmüller <mgrabmue@cs.tu-berlin.de> | 2001-03-12 07:08:46 +0000 |
commit | 67e8151b65659fdfb803fe2b9bb1b60f65638b85 (patch) | |
tree | 0697b1e99077bfb2310746ab980b7bdf1cbdd2c3 | |
parent | e41561b49031c43dcfeecc93130f9a357857acef (diff) | |
download | guile-67e8151b65659fdfb803fe2b9bb1b60f65638b85.tar.gz |
* load.c (scm_primitive_load, scm_primitive_load_path),
(scm_sys_search_load_path): Corrected docstrings (file ->
filename).
* eval.c (scm_force): Added texinfo markup to docstring.
(scm_promise_p): Renamed parameter to `obj' to match docstring.
* debug-malloc.c: Reinserted #include <stdio.h>.
-rw-r--r-- | libguile/ChangeLog | 11 | ||||
-rw-r--r-- | libguile/debug-malloc.c | 1 | ||||
-rw-r--r-- | libguile/eval.c | 11 | ||||
-rw-r--r-- | libguile/load.c | 37 |
4 files changed, 38 insertions, 22 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 7371eb5fa..7fc9c4d40 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,14 @@ +2001-03-12 Martin Grabmueller <mgrabmue@cs.tu-berlin.de> + + * load.c (scm_primitive_load, scm_primitive_load_path), + (scm_sys_search_load_path): Corrected docstrings (file -> + filename). + + * eval.c (scm_force): Added texinfo markup to docstring. + (scm_promise_p): Renamed parameter to `obj' to match docstring. + + * debug-malloc.c: Reinserted #include <stdio.h>. + 2001-03-11 Keisuke Nishida <kxn30@po.cwru.edu> * list.c (s_scm_reverse_x): Use SCM_VALIDATE_LIST. diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c index 4240f7d8b..8b2a08ceb 100644 --- a/libguile/debug-malloc.c +++ b/libguile/debug-malloc.c @@ -40,6 +40,7 @@ * If you do not wish that, delete this exception notice. */ #include <string.h> +#include <stdio.h> #include "libguile/_scm.h" #include "libguile/alist.h" diff --git a/libguile/eval.c b/libguile/eval.c index e48398466..56019c552 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -3760,9 +3760,10 @@ promise_print (SCM exp, SCM port, scm_print_state *pstate) SCM_DEFINE (scm_force, "force", 1, 0, 0, - (SCM x), - "If the promise X has not been computed yet, compute and return\n" - "X, otherwise just return the previously computed value.") + (SCM x), + "If the promise @var{x} has not been computed yet, compute and\n" + "return @var{x}, otherwise just return the previously computed\n" + "value.") #define FUNC_NAME s_scm_force { SCM_VALIDATE_SMOB (1, x, promise); @@ -3783,12 +3784,12 @@ SCM_DEFINE (scm_force, "force", 1, 0, 0, SCM_DEFINE (scm_promise_p, "promise?", 1, 0, 0, - (SCM x), + (SCM obj), "Return true if @var{obj} is a promise, i.e. a delayed computation\n" "(@pxref{Delayed evaluation,,,r4rs.info,The Revised^4 Report on Scheme}).") #define FUNC_NAME s_scm_promise_p { - return SCM_BOOL (SCM_TYP16_PREDICATE (scm_tc16_promise, x)); + return SCM_BOOL (SCM_TYP16_PREDICATE (scm_tc16_promise, obj)); } #undef FUNC_NAME diff --git a/libguile/load.c b/libguile/load.c index a3d28a95a..d6612b12c 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -103,12 +103,13 @@ load (void *data) SCM_DEFINE (scm_primitive_load, "primitive-load", 1, 0, 0, (SCM filename), - "Load @var{file} and evaluate its contents in the top-level environment.\n" - "The load paths are not searched; @var{file} must either be a full\n" - "pathname or be a pathname relative to the current directory. If the\n" - "variable @code{%load-hook} is defined, it should be bound to a procedure\n" - "that will be called before any code is loaded. See documentation for\n" - "@code{%load-hook} later in this section.") + "Load the file named @var{filename} and evaluate its contents in\n" + "the top-level environment. The load paths are not searched;\n" + "@var{filename} must either be a full pathname or be a pathname\n" + "relative to the current directory. If the variable\n" + "@code{%load-hook} is defined, it should be bound to a procedure\n" + "that will be called before any code is loaded. See the\n" + "documentation for @code{%load-hook} later in this section.") #define FUNC_NAME s_scm_primitive_load { SCM hook = *scm_loc_load_hook; @@ -409,13 +410,14 @@ SCM_DEFINE (scm_search_path, "search-path", 2, 1, 0, If we find one, return its full filename; otherwise, return #f. If FILENAME is absolute, return it unchanged. */ SCM_DEFINE (scm_sys_search_load_path, "%search-load-path", 1, 0, 0, - (SCM filename), - "Search @var{%load-path} for @var{file}, which must be readable by the\n" - "current user. If @var{file} is found in the list of paths to search or\n" - "is an absolute pathname, return its full pathname. Otherwise, return\n" - "@code{#f}. Filenames may have any of the optional extensions in the\n" - "@code{%load-extensions} list; @code{%search-load-path} will try each\n" - "extension automatically.") + (SCM filename), + "Search @var{%load-path} for the file named @var{filename},\n" + "which must be readable by the current user. If @var{filename}\n" + "is found in the list of paths to search or is an absolute\n" + "pathname, return its full pathname. Otherwise, return\n" + "@code{#f}. Filenames may have any of the optional extensions\n" + "in the @code{%load-extensions} list; @code{%search-load-path}\n" + "will try each extension automatically.") #define FUNC_NAME s_scm_sys_search_load_path { SCM path = *scm_loc_load_path; @@ -432,10 +434,11 @@ SCM_DEFINE (scm_sys_search_load_path, "%search-load-path", 1, 0, 0, SCM_DEFINE (scm_primitive_load_path, "primitive-load-path", 1, 0, 0, - (SCM filename), - "Search @var{%load-path} for @var{file} and load it into the top-level\n" - "environment. If @var{file} is a relative pathname and is not found in\n" - "the list of search paths, an error is signalled.") + (SCM filename), + "Search @var{%load-path} for the file named @var{filename} and\n" + "load it into the top-level environment. If @var{filename} is a\n" + "relative pathname and is not found in the list of search paths,\n" + "an error is signalled.") #define FUNC_NAME s_scm_primitive_load_path { SCM full_filename; |