Add missing underscores to Lily_lexer member variables.

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 71fb2479eec8596df6d390f989aa0b46f9176782..82dbd695f04470f70adec6cb9d8893178a359e25 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -1,13 +1,23 @@
 %{ // -*-Fundamental-*-
 /*
-  lexer.ll -- implement the Flex lexer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+                 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
-           Jan Nieuwenhuizen <janneke@gnu.org>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 /*
   backup rules
@@ -75,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 ());
 
@@ -171,8 +181,10 @@ BOM_UTF8   \357\273\277
   return type;
 }
 
-<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
-  if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
+   /* 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)
     {
       LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
       exit (1);
@@ -335,7 +347,7 @@ BOM_UTF8    \357\273\277
        Input hi = here_input();
        hi.step_forward ();
        SCM sval = ly_parse_scm (hi.start (), &n, hi,
-               be_safe_global && is_main_input_);
+               be_safe_global && is_main_input_, parser_);
 
        if (sval == SCM_UNDEFINED)
        {
@@ -537,6 +549,8 @@ BOM_UTF8    \357\273\277
                                return MARKUP_HEAD_SCM0_MARKUP1;
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
                                return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+                       else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2-markup3"))
+                               return MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3;
                        else if (tag == ly_symbol2scm ("scheme0-markup1-markup2"))
                                return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
@@ -820,11 +834,15 @@ Lily_lexer::scan_bare_word (string str)
                        else if (scm_is_symbol (yylval.scm))
                            return DRUM_PITCH;
                }
-               else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+               else if ((YYSTATE == chords)
+                       && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
                {
                    yylval.scm = scm_cdr (handle);
                    return CHORD_MODIFIER;
                }
+               if ((chord_repetition_.repetition_symbol_ != SCM_EOL)
+                   && to_boolean (scm_equal_p (chord_repetition_.repetition_symbol_, sym)))
+                       return CHORD_REPETITION;
        }
 
        yylval.scm = ly_string2scm (str);