Add missing underscores to Lily_lexer member variables.

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 94f609658bd137d440b8d721214dd99344439e31..f2491864ea95552ca832b957cd64fc9c5249cd16 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -63,8 +63,8 @@ private:
   int hidden_state_;
 public:
   vector<int> extra_token_types_;
-  void *lexval;
-  Input *lexloc;
+  void *lexval_;
+  Input *lexloc_;
   bool is_main_input_;
   
   Sources *sources_;

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 98b6e0f3d7f978e83f8cc75aca42c71b87730e65..82dbd695f04470f70adec6cb9d8893178a359e25 100644 (file)
--- 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);

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 178853fc15b5cf5a9242710437c6e110ebed1184..1c5931dfe90fa04234ca196044f015e9ac9943f5 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -315,7 +315,7 @@ Lily_lexer::LexerError (char const *s)
   else
     {
       error_level_ |= 1;
-      Input spot (*lexloc);
+      Input spot (*lexloc_);
       spot.error (s);
     }
 }
@@ -340,7 +340,7 @@ Lily_lexer::escaped_char (char c) const
 Input
 Lily_lexer::here_input () const
 {
-  return Input (*lexloc);
+  return Input (*lexloc_);
 }
 
 void
@@ -357,8 +357,8 @@ void
 Lily_lexer::add_lexed_char (int count)
 {
   char const *start = here_str0 ();
-  lexloc->set (get_source_file (),
-              start, start + count);
+  lexloc_->set (get_source_file (),
+               start, start + count);
   char_count_stack_.back () += count;
 }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 3268ae1e2573e52168d35d3945742ea0c7175062..5f18eef53191b046830953038da9a8c2561233ed 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2745,8 +2745,8 @@ yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
        Lily_parser *pars = (Lily_parser*) v;
        Lily_lexer *lex = pars->lexer_;
 
-       lex->lexval = (void*) s;
-       lex->lexloc = loc;
+       lex->lexval_ = (void*) s;
+       lex->lexloc_ = loc;
        lex->prepare_for_next_token ();
        return lex->yylex ();
 }