diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:33:40 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:33:40 +0200 |
commit | 4a4849dbe0ae1b731b408167f90222e05d1ca2bd (patch) | |
tree | caa909b99ffb221e43408a3d19ad3e8209e3a96b /libguile/read.c | |
parent | 3ec17f28b8f96fa43218db83656c0d85b4f69d7c (diff) | |
parent | 032913739218c756f673bfb9c8f66ef9f8f02330 (diff) | |
download | guile-4a4849dbe0ae1b731b408167f90222e05d1ca2bd.tar.gz |
Merge commit '032913739218c756f673bfb9c8f66ef9f8f02330' into boehm-demers-weiser-gc
Conflicts:
libguile/gc.c
libguile/srcprop.c
libguile/srcprop.h
Diffstat (limited to 'libguile/read.c')
-rw-r--r-- | libguile/read.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libguile/read.c b/libguile/read.c index d75839589..de2e87bed 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -38,6 +38,8 @@ #include "libguile/srfi-4.h" #include "libguile/read.h" +#include "libguile/private-options.h" + @@ -52,14 +54,14 @@ scm_t_option scm_read_opts[] = { { SCM_OPTION_BOOLEAN, "case-insensitive", 0, "Convert symbols to lower case."}, { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F), - "Style of keyword recognition: #f or 'prefix."} + "Style of keyword recognition: #f or 'prefix."}, #if SCM_ENABLE_ELISP - , { SCM_OPTION_BOOLEAN, "elisp-vectors", 0, "Support Elisp vector syntax, namely `[...]'."}, { SCM_OPTION_BOOLEAN, "elisp-strings", 0, - "Support `\\(' and `\\)' in strings."} + "Support `\\(' and `\\)' in strings."}, #endif + { 0, }, }; /* @@ -112,7 +114,6 @@ SCM_DEFINE (scm_read_options, "read-options-interface", 0, 1, 0, { SCM ans = scm_options (setting, scm_read_opts, - SCM_N_READ_OPTIONS, FUNC_NAME); if (SCM_COPY_SOURCE_P) SCM_RECORD_POSITIONS_P = 1; @@ -898,7 +899,9 @@ SCM_DEFINE (scm_read_hash_extend, "read-hash-extend", 2, 0, 0, "starting with the character sequence @code{#} and @var{chr}.\n" "@var{proc} will be called with two arguments: the character\n" "@var{chr} and the port to read further data from. The object\n" - "returned will be the return value of @code{read}.") + "returned will be the return value of @code{read}. \n" + "Passing @code{#f} for @var{proc} will remove a previous setting. \n" + ) #define FUNC_NAME s_scm_read_hash_extend { SCM this; @@ -977,7 +980,7 @@ scm_init_read () scm_read_hash_procedures = SCM_VARIABLE_LOC (scm_c_define ("read-hash-procedures", SCM_EOL)); - scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS); + scm_init_opts (scm_read_options, scm_read_opts); #include "libguile/read.x" } |