X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=f4f6e14d3e020a14b21df5bc4b46f6e39170e636;hb=108699247848e254f996236bca44d8ff46cabb14;hp=83a9f89b9353fa70257bf97b7d74c126dbabe118;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 83a9f89b93..f4f6e14d3e 100644
--- 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--2008 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,24 +63,25 @@ private:
   int hidden_state_;
 public:
   vector<int> extra_token_types_;
-  string main_input_name_;
-  void *lexval;
-  Input *lexloc;
+  void *lexval_;
+  Input *lexloc_;
   bool is_main_input_;
-  
+
   Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
   SCM chordmodifier_tab_;
   SCM pitchname_tab_stack_;
 
+  Chord_repetition chord_repetition_;
+
   int error_level_;
   Input last_input_;
 
   Lily_lexer (Sources *, Lily_parser *);
   Lily_lexer (Lily_lexer const &, Lily_parser *);
   int yylex ();
-  
+
   void add_lexed_char (int);
 
   void prepare_for_next_token ();
@@ -76,6 +102,7 @@ public:
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
   void push_extra_token (int token_type);
+  void push_embedded_token ();
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();
   void push_lyric_state ();
@@ -84,12 +111,14 @@ public:
   void push_note_state (SCM tab);
   void pop_state ();
   void LexerError (char const *);
-  void set_identifier (SCM name_string, SCM);
+  void LexerWarning (char const *);
+  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 */