X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=d1150026dadd850ba5bc361f8acf70e6606a7094;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=4062e3410fe1a1e3e8d2c6f883140fe83f87e934;hpb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 4062e3410f..d1150026da 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--2014 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,6 +25,7 @@
 #include "input.hh"
 #include "duration.hh"
 #include "pitch.hh"
+#include "parser.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
@@ -24,24 +36,29 @@ class Lily_lexer : public Includable_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 (const string&);
+  int scan_bare_word (const string&);
+  int scan_escaped_word (const string&);
+  int scan_shorthand (const 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_;
+  Input override_input_;
+  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_;
+  SCM *lexval_;
+  Input *lexloc_;
   bool is_main_input_;
-  
+  vsize main_input_level_;
+
   Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
@@ -52,14 +69,15 @@ public:
   Input last_input_;
 
   Lily_lexer (Sources *, Lily_parser *);
-  Lily_lexer (Lily_lexer const &, Lily_parser *);
+  Lily_lexer (Lily_lexer const &, Lily_parser *, SCM);
   int yylex ();
-  
+
   void add_lexed_char (int);
 
   void prepare_for_next_token ();
   int try_special_identifiers (SCM *, SCM);
   Input here_input () const;
+  Input const &override_input (Input const &) const;
 
   void add_scope (SCM);
   SCM set_current_scope ();
@@ -68,27 +86,32 @@ public:
 
   void start_main_input ();
 
-  virtual void new_input (string s, Sources *);
-  virtual void new_input (string s, string d, Sources *);
+  virtual void new_input (const string &s, Sources *);
+  virtual void new_input (const 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 (const 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 (Input const &where,
+                         int token_type, SCM scm = SCM_UNSPECIFIED);
+  int pop_extra_token ();
+  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 */