X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=82dbd695f04470f70adec6cb9d8893178a359e25;hb=0e4883e95834d2692a0568e42d2fe697ae771c3a;hp=98b6e0f3d7f978e83f8cc75aca42c71b87730e65;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 98b6e0f3d7..82dbd695f0 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -85,10 +85,10 @@ bool is_valid_version (string s);
 	yylval.string = new string
 
 #define yylval \
-	(*(YYSTYPE*)lexval)
+	(*(YYSTYPE*)lexval_)
 
 #define yylloc \
-	(*(YYLTYPE*)lexloc)
+	(*(YYLTYPE*)lexloc_)
 
 #define YY_USER_ACTION	add_lexed_char (YYLeng ());
 
@@ -184,7 +184,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. */
 <INITIAL,chords,lyrics,figures,notes>{BOM_UTF8}/.* {
-  if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+  if (this->lexloc_->line_number () != 1 || this->lexloc_->column_number () != 0)
     {
       LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
       exit (1);