From c6e36800918f294e889264e2231557ad2b32e85f Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 23 Oct 2012 00:21:12 -0400 Subject: [PATCH 4/9] Add source properties to more datum types in scm_read_sharp_extension. * libguile/read.c (scm_read_sharp_extension): Attach source properties to the result of a custom token reader if the returned datum is not immediate. Previously, source properties were added to pairs only. --- libguile/read.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libguile/read.c b/libguile/read.c index 3afb75c..45c4e04 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -1503,7 +1503,8 @@ scm_read_sharp_extension (int chr, SCM port, scm_t_read_opts *opts) got = scm_call_2 (proc, SCM_MAKE_CHAR (chr), port); - if (scm_is_pair (got) && !scm_i_has_source_properties (got)) + if (opts->record_positions_p && SCM_NIMP (got) + && !scm_i_has_source_properties (got)) scm_i_set_source_properties_x (got, line, column, SCM_FILENAME (port)); return got; -- 1.7.10.4