From 3426bec4228bde5a526bd4ad1d5c3bda220097cf Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Mon, 25 Nov 2013 19:33:34 +0100 Subject: [PATCH 1/1] Issue 3676: Bar checks display the wrong location This one is just embarrassing. The lexer used last_input_ where it should have been using here_input (), resulting in music identifiers and some other stuff to be located one token early. --- lily/lexer.ll | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lily/lexer.ll b/lily/lexer.ll index 68000182bd..71473faa30 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -958,7 +958,7 @@ Lily_lexer::scan_escaped_word (const string &str) SCM sid = lookup_identifier (str); if (Music *m = unsmob_music (sid)) { - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } if (sid != SCM_UNDEFINED) @@ -978,7 +978,7 @@ Lily_lexer::scan_shorthand (const string &str) SCM sid = lookup_identifier (str); if (Music *m = unsmob_music (sid)) { - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } if (sid != SCM_UNDEFINED) @@ -1144,7 +1144,7 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) if (Music *m = unsmob_music (v)) { if (!unsmob_input (m->get_property ("origin"))) - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } int token; @@ -1167,7 +1167,7 @@ Lily_lexer::eval_scm (SCM readerdata, char extra_token) if (Music *m = unsmob_music (sval)) { if (!unsmob_input (m->get_property ("origin"))) - m->set_spot (override_input (last_input_)); + m->set_spot (override_input (here_input ())); } return sval; -- 2.39.2