diff options
author | Mark H Weaver <mhw@netris.org> | 2012-02-15 11:47:31 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2012-02-15 11:47:31 -0500 |
commit | 38f190749da57150b5329676b6fd70ff73d66e02 (patch) | |
tree | 12b32c8ce97e2f668e471ac57495fc35c287c295 /libguile/read.c | |
parent | 32fbc38fbb3c7544a45f7be3cf0a981a31681cbb (diff) | |
download | guile-38f190749da57150b5329676b6fd70ff73d66e02.tar.gz |
Add support for source properties on non-immediate numbers
* libguile/read.c (scm_read_number): Set source properties on
non-immediate numbers if the 'positions' reader option is set.
* doc/ref/api-debug.texi (Source Properties): Update manual.
Diffstat (limited to 'libguile/read.c')
-rw-r--r-- | libguile/read.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libguile/read.c b/libguile/read.c index 4b1975008..bbaf3f63e 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -600,6 +600,10 @@ scm_read_number (scm_t_wchar chr, SCM port) int overflow; scm_t_port *pt = SCM_PTAB_ENTRY (port); + /* Need to capture line and column numbers here. */ + long line = SCM_LINUM (port); + int column = SCM_COL (port) - 1; + scm_ungetc (chr, port); overflow = read_complete_token (port, buffer, sizeof (buffer), &overflow_buffer, &bytes_read); @@ -611,13 +615,15 @@ scm_read_number (scm_t_wchar chr, SCM port) pt->ilseq_handler); result = scm_string_to_number (str, SCM_UNDEFINED); - if (!scm_is_true (result)) + if (scm_is_false (result)) { /* Return a symbol instead of a number */ if (SCM_CASE_INSENSITIVE_P) str = scm_string_downcase_x (str); result = scm_string_to_symbol (str); } + else if (SCM_NIMP (result)) + result = maybe_annotate_source (result, port, line, column); if (overflow) free (overflow_buffer); |