X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bfd2449e6b3e23ba2ec88b7a509791851fef2751;hb=4402d15b615cd29241ebaa99c0fa667c22e1f2b8;hp=b8faf78e31ee7e9bf5ed8283bb721df090c52a97;hpb=652f454fae6ed31ced7f9c3ce22dbc5752460a8c;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index b8faf78e31..bfd2449e6b 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -188,7 +188,7 @@ BOM_UTF8 \357\273\277 /* Use the trailing context feature. Otherwise, the BOM will not be found if the file starts with an identifier definition. */ {BOM_UTF8}/.* { - if (this->lexloc_->line_number () != 1 || this->lexloc_->column_number () != 0) + if (lexloc_->line_number () != 1 || lexloc_->column_number () != 0) { LexerWarning (_ ("stray UTF-8 BOM encountered").c_str ()); // exit (1); @@ -244,7 +244,7 @@ BOM_UTF8 \357\273\277 s = s.substr (0, s.rfind ('\"')); yy_pop_state (); - this->here_input().get_source_file ()->name_ = s; + here_input().get_source_file ()->name_ = s; message (_f ("Renaming input to: `%s'", s.c_str ())); progress_indication ("\n"); scm_module_define (scm_car (scopes_), @@ -258,7 +258,7 @@ BOM_UTF8 \357\273\277 sscanf (YYText (), "%d", &i); yy_pop_state (); - this->here_input ().get_source_file ()->set_line (here_input ().start (), i); + here_input ().get_source_file ()->set_line (here_input ().start (), i); } {ANY_CHAR} {