diff options
| author | Gary Houston <ghouston@arglist.com> | 1997-03-08 18:58:24 +0000 |
|---|---|---|
| committer | Gary Houston <ghouston@arglist.com> | 1997-03-08 18:58:24 +0000 |
| commit | deca31e1736a487104ecde76df8b55be18c1ef65 (patch) | |
| tree | 1f8116879f96d1b2b9192245d1418e01f526afed /libguile/read.h | |
| parent | 90d5e28037bf8fe7b95e2cb3493410128988fa8d (diff) | |
| download | guile-deca31e1736a487104ecde76df8b55be18c1ef65.tar.gz | |
* strports.c (scm_read_0str, scm_eval_0str): update scm_read usage.
* gdbint.c (gdb_read): update scm_lreadr usage.
* load.h: update prototypes.
* load.c (scm_primitive_load, scm_read_and_eval_x,
scm_primitive_load_path): remove case_insensitive_p, sharp arguments.
* read.h: add prototype for scm_read_hash_extend. Change args for
other prototypes.
* read.c (scm_read_hash_procedures): new variable.
(scm_read_hash_extend): new procedure.
(scm_get_hash_procedure): new procedure.
* (scm_lreadr): use scm_get_hash_procedure instead of an argument
for extended # processing.
(scm_read, scm_lreadr, scm_lreadrecparen, scm_lreadparen,
scm_read_token): remove case_i, sharp arguments. Change callers.
* read.h (SCM_N_READ_OPTIONS): increase to 3.
(SCM_CASE_INSENSITIVE_P): define.
* read.c: add case-insensitive option to scm_read_opts.
* (scm_read_token): use SCM_CASE_INSENSITIVE_P instead of an argument
to determine whether to convert symbol case.
(default_case_i): definition removed.
* read.c (scm_read_token): if case_i, downcase ic before doing
anything with it.
Diffstat (limited to 'libguile/read.h')
| -rw-r--r-- | libguile/read.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libguile/read.h b/libguile/read.h index 8eef1ed24..74904452b 100644 --- a/libguile/read.h +++ b/libguile/read.h @@ -71,19 +71,21 @@ extern scm_option scm_read_opts[]; #define SCM_COPY_SOURCE_P scm_read_opts[0].val #define SCM_RECORD_POSITIONS_P scm_read_opts[1].val -#define SCM_N_READ_OPTIONS 2 +#define SCM_CASE_INSENSITIVE_P scm_read_opts[2].val +#define SCM_N_READ_OPTIONS 3 extern SCM scm_read_options SCM_P ((SCM setting)); -extern SCM scm_read SCM_P ((SCM port, SCM casep, SCM sharp)); +extern SCM scm_read SCM_P ((SCM port)); extern char * scm_grow_tok_buf SCM_P ((SCM * tok_buf)); extern int scm_flush_ws SCM_P ((SCM port, char *eoferr)); extern int scm_casei_streq SCM_P ((char * s1, char * s2)); -extern SCM scm_lreadr SCM_P ((SCM * tok_buf, SCM port, int case_i, SCM sharp, SCM *copy)); -extern scm_sizet scm_read_token SCM_P ((int ic, SCM * tok_buf, SCM port, int case_i, int weird)); -extern SCM scm_lreadparen SCM_P ((SCM * tok_buf, SCM port, char *name, int case_i, SCM sharp, SCM *copy)); -extern SCM scm_lreadrecparen SCM_P ((SCM * tok_buf, SCM port, char *name, int case_i, SCM sharp, SCM *copy)); +extern SCM scm_lreadr SCM_P ((SCM * tok_buf, SCM port, SCM *copy)); +extern scm_sizet scm_read_token SCM_P ((int ic, SCM * tok_buf, SCM port, int weird)); +extern SCM scm_lreadparen SCM_P ((SCM * tok_buf, SCM port, char *name, SCM *copy)); +extern SCM scm_lreadrecparen SCM_P ((SCM * tok_buf, SCM port, char *name, SCM *copy)); +extern SCM scm_read_hash_extend SCM_P ((SCM chr, SCM proc)); extern void scm_init_read SCM_P ((void)); #endif /* READH */ |