diff options
| author | Andy Wingo <wingo@pobox.com> | 2020-09-03 22:55:08 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2020-09-03 22:55:08 +0200 |
| commit | 6f6abb3bb57e54444fd68ebcd451032fb5ce19c0 (patch) | |
| tree | 94121e8230b834e56912779e8156a8988bcee213 /libguile/private-options.h | |
| parent | 837580587ba8dfab22ad74e3b4c062df00ca7422 (diff) | |
| download | guile-6f6abb3bb57e54444fd68ebcd451032fb5ce19c0.tar.gz | |
Clean up srcprops implementation
* libguile/deprecated.c (scm_sym_copy, scm_make_srcprops): Deprecate.
* libguile/deprecated.h (scm_tc16_srcprops)
(SCM_SOURCE_PROPERTY_FLAG_BREAK): Deprecate.
* libguile/private-options.h (SCM_COPY_SOURCE_P): Remove.
* libguile/read.c (struct t_read_opts, scm_read_options): Remove useless
copy read option.
(maybe_annotate_source): Change line and column to be tagged, and
subtract off lookahead here. Change all callers.
(READ_OPTION_COPY_SOURCE_P): Remove, renumbering other options.
(init_read_options): Remove copy option.
* libguile/srcprop.c: Change to put filename inline in source
properties. Update private implementation.
* libguile/srcprop.h (SCM_PROCTRACEP): Remove. Unusable given that
scm_sym_trace was undefined.
Diffstat (limited to 'libguile/private-options.h')
| -rw-r--r-- | libguile/private-options.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/libguile/private-options.h b/libguile/private-options.h index 3580c5367..31f4c0ee4 100644 --- a/libguile/private-options.h +++ b/libguile/private-options.h @@ -1,4 +1,4 @@ -/* Copyright 2007,2009-2011,2014,2018 +/* Copyright 2007,2009-2011,2014,2018,2020 Free Software Foundation, Inc. This file is part of Guile. @@ -56,16 +56,15 @@ SCM_INTERNAL scm_t_option scm_print_opts[]; */ SCM_INTERNAL scm_t_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_CASE_INSENSITIVE_P scm_read_opts[2].val -#define SCM_KEYWORD_STYLE scm_read_opts[3].val -#define SCM_R6RS_ESCAPES_P scm_read_opts[4].val -#define SCM_SQUARE_BRACKETS_P scm_read_opts[5].val -#define SCM_HUNGRY_EOL_ESCAPES_P scm_read_opts[6].val -#define SCM_CURLY_INFIX_P scm_read_opts[7].val -#define SCM_R7RS_SYMBOLS_P scm_read_opts[8].val +#define SCM_RECORD_POSITIONS_P scm_read_opts[0].val +#define SCM_CASE_INSENSITIVE_P scm_read_opts[1].val +#define SCM_KEYWORD_STYLE scm_read_opts[2].val +#define SCM_R6RS_ESCAPES_P scm_read_opts[3].val +#define SCM_SQUARE_BRACKETS_P scm_read_opts[4].val +#define SCM_HUNGRY_EOL_ESCAPES_P scm_read_opts[5].val +#define SCM_CURLY_INFIX_P scm_read_opts[6].val +#define SCM_R7RS_SYMBOLS_P scm_read_opts[7].val -#define SCM_N_READ_OPTIONS 9 +#define SCM_N_READ_OPTIONS 8 #endif /* PRIVATE_OPTIONS */ |