X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=caa3b4b44b5987f5c094b74a8ad96606a8c4b7d7;hb=9cba6d0b05bd28e2fc73f091b09ace570c976182;hp=f290f4ea8b169d50b7ac06e0e4a9e4d2474f1057;hpb=e26f468ce5bdb4738bb34d6ad200cd888c6011ac;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index f290f4ea8b..caa3b4b44b 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--2012 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
@@ -14,25 +25,12 @@
 #include "input.hh"
 #include "duration.hh"
 #include "pitch.hh"
+#include "parser.hh"
 
 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);
@@ -42,35 +40,37 @@ private:
   int scan_bare_word (string);
   SCM scan_markup_word (string);
   int scan_escaped_word (string);
+  int scan_scm_id (SCM);
   int identifier_type (SCM);
   char escaped_char (char) const;
+  const char *YYText_utf8 ();
 
   Lily_parser *parser_;
   Keyword_table *keytable_;
   SCM scopes_;
   SCM start_module_;
   int hidden_state_;
+  SCM eval_scm (SCM, char extra_token = 0);
 public:
-  vector<int> extra_token_types_;
-  void *lexval;
-  Input *lexloc;
+  SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); }
+  SCM extra_tokens_;
+  YYSTYPE *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 ();
@@ -87,24 +87,27 @@ public:
   virtual void new_input (string s, Sources *);
   virtual void new_input (string s, string d, Sources *);
 
+  bool top_input () { return include_stack_.size () < 2; }
   SCM keyword_list () const;
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
-  void push_extra_token (int token_type);
-  void push_chord_state (SCM tab);
+  void push_extra_token (int token_type, SCM scm = SCM_UNDEFINED);
+  void push_chord_state (SCM alist);
   void push_figuredbass_state ();
   void push_lyric_state ();
   void push_initial_state ();
   void push_markup_state ();
-  void push_note_state (SCM tab);
+  void push_note_state (SCM alist);
   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 */