X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Flily-lexer.hh;h=e078c9edc394a02b26ade5b66236f11d419197ac;hb=6dc515376e07af1160edd46b61c0fd235c65db7d;hp=6aa0a54d74a6cf8ca7fe4f9d46f9d1ab7b2bdf94;hpb=41b8dd4d0bec0445e1850ed8b87fef3599d2d41b;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 6aa0a54d74..e078c9edc3 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.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,6 +25,7 @@
 #include "input.hh"
 #include "duration.hh"
 #include "pitch.hh"
+#include "parser.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
@@ -21,23 +33,29 @@ void set_lexer ();
 
 class Lily_lexer : public Includable_lexer
 {
-  DECLARE_SMOBS (Lily_lexer,);
+  DECLARE_SMOBS (Lily_lexer);
 
 private:
-  int lookup_keyword (String);
-  int scan_bare_word (String);
-  SCM scan_markup_word (String);
-  int scan_escaped_word (String);
+  int lookup_keyword (string);
+  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:
-  String main_input_name_;
-  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_;
@@ -49,8 +67,8 @@ public:
   int error_level_;
   Input last_input_;
 
-  Lily_lexer (Sources *);
-  Lily_lexer (Lily_lexer const &);
+  Lily_lexer (Sources *, Lily_parser *);
+  Lily_lexer (Lily_lexer const &, Lily_parser *);
   int yylex ();
 
   void add_lexed_char (int);
@@ -61,25 +79,35 @@ public:
 
   void add_scope (SCM);
   SCM set_current_scope ();
+  bool has_scope () const;
   SCM remove_scope ();
 
   void start_main_input ();
 
-  SCM lookup_identifier (String s);
+  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_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 */