Imported Upstream version 2.14.2

[lilypond.git] / lily / include / lily-lexer.hh

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 4062e3410fe1a1e3e8d2c6f883140fe83f87e934..4f5f92d4e11a97f6520cd7b0e8361a03f24e3ee2 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -1,9 +1,20 @@
 /*
-  lexer.hh -- declare Lily_lexer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  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/>.
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -19,6 +30,20 @@ bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
+struct Chord_repetition
+{
+  Chord_repetition ()
+  {
+    last_chord_ = SCM_EOL;
+    repetition_function_ = SCM_EOL;
+    repetition_symbol_ = SCM_EOL;
+  }
+
+  SCM repetition_symbol_;
+  SCM repetition_function_;
+  SCM last_chord_;
+};
+
 class Lily_lexer : public Includable_lexer
 {
   DECLARE_SMOBS (Lily_lexer);
@@ -38,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_;
@@ -48,6 +73,8 @@ public:
   SCM chordmodifier_tab_;
   SCM pitchname_tab_stack_;
 
+  Chord_repetition chord_repetition_;
+
   int error_level_;
   Input last_input_;
 
@@ -83,12 +110,13 @@ public:
   void push_note_state (SCM tab);
   void pop_state ();
   void LexerError (char const *);
-  void set_identifier (SCM name_string, SCM);
+  void set_identifier (SCM path, SCM val);
   int get_state () const;
   bool is_note_state () const;
   bool is_chord_state () const;
   bool is_lyric_state () const;
   bool is_figure_state () const;
+  bool is_clean () const;
 };
 
 #endif /* MY_LILY_LEXER_HH */