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/srcprop.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/srcprop.h')
| -rw-r--r-- | libguile/srcprop.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libguile/srcprop.h b/libguile/srcprop.h index b32203c0b..ea1631bbf 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -1,7 +1,7 @@ #ifndef SCM_SRCPROP_H #define SCM_SRCPROP_H -/* Copyright 1995-1996,2000-2001,2006,2008-2012,2018 +/* Copyright 1995-1996,2000-2001,2006,2008-2012,2018,2020 Free Software Foundation, Inc. This file is part of Guile. @@ -28,27 +28,24 @@ /* {Source properties} */ -#define SCM_PROCTRACEP(x) (scm_is_true (scm_procedure_property (x, scm_sym_trace))) -#define SCM_SOURCE_PROPERTY_FLAG_BREAK 1 - -SCM_API scm_t_bits scm_tc16_srcprops; SCM_API SCM scm_sym_filename; -SCM_API SCM scm_sym_copy; SCM_API SCM scm_sym_line; SCM_API SCM scm_sym_column; SCM_API SCM scm_supports_source_properties_p (SCM obj); -SCM_API SCM scm_make_srcprops (long line, int col, SCM fname, SCM copy, SCM plist); SCM_API SCM scm_source_property (SCM obj, SCM key); SCM_API SCM scm_set_source_property_x (SCM obj, SCM key, SCM datum); SCM_API SCM scm_source_properties (SCM obj); SCM_API SCM scm_set_source_properties_x (SCM obj, SCM props); + +SCM_INTERNAL SCM scm_i_make_srcprops (SCM line, SCM col, SCM fname, SCM alist); SCM_INTERNAL int scm_i_has_source_properties (SCM obj); -SCM_INTERNAL void scm_i_set_source_properties_x (SCM obj, long line, int col, +SCM_INTERNAL void scm_i_set_source_properties_x (SCM obj, SCM line, SCM col, SCM fname); + SCM_API SCM scm_cons_source (SCM xorig, SCM x, SCM y); SCM_INTERNAL void scm_init_srcprop (void); |