From: Patrick McCarty <pnorcks@gmail.com>
Date: Sat, 20 Mar 2010 20:53:29 +0000 (-0700)
Subject: Add missing underscores to Lily_lexer member variables.
X-Git-Tag: release/2.13.17-1~24
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10149664e3c54b0d827c266e5ab88a61273a68ba;p=lilypond.git

Add missing underscores to Lily_lexer member variables.
---

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 94f609658b..f2491864ea 100644
--- 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 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);
diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 178853fc15..1c5931dfe9 100644
--- 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 3268ae1e25..5f18eef531 100644
--- 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 ();
 }