X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=94f609658bd137d440b8d721214dd99344439e31;hb=da2cbdd4623e5ea51a2a99de4f2935b37195136e;hp=71a0d58fdf43ab7a6209821302397354f07bfc4d;hpb=5ef2f17ae2971f84ee4518cdb6a8c804c268dcd0;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 71a0d58fdf..ff2e8668c3 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--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 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
@@ -12,43 +23,52 @@
 #include "includable-lexer.hh"
 
 #include "input.hh"
-#include "lily-proto.hh"
-#include "flower-proto.hh"
-#include "array.hh"
-#include "string.hh"
 #include "duration.hh"
 #include "pitch.hh"
-#include "smobs.hh"
+#include "parser.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
-/*
-  TODO: this has a lot of SCM objects. Smobify me.
- */
-class Lily_lexer : public Includable_lexer 
+class Lily_lexer : public Smob<Lily_lexer>, public Includable_lexer
 {
-  DECLARE_SMOBS(Lily_lexer,);
 public:
-  SCM scopes_;
-  SCM encoding_;
-  
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
+  virtual ~Lily_lexer ();
+  int scan_word (SCM & output, SCM sym);
 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);
+  void push_markup_predicates (SCM sig);
   char escaped_char (char) const;
+  const char *YYText_utf8 ();
 
+  Lily_parser *parser_;
   Keyword_table *keytable_;
+  SCM scopes_;
+  SCM start_module_;
+  Input override_input_;
+  SCM eval_scm (SCM, Input, char extra_token = 0);
 public:
-  String main_input_name_;
-  void *lexval;
-  bool main_input_b_;
-  
-  Sources *sources_; 
+  SCM eval_scm_token (SCM sval, Input w)
+  {
+    w.step_forward ();
+    return eval_scm (sval, w, '#');
+  }
+  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.  */
   SCM chordmodifier_tab_;
@@ -57,36 +77,50 @@ 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 *, SCM);
   int yylex ();
 
+  void add_lexed_char (int);
+
   void prepare_for_next_token ();
-  int try_special_identifiers (SCM* ,SCM);
+  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 ();
+  bool has_scope () const;
   SCM remove_scope ();
-  
+
   void start_main_input ();
 
-  SCM lookup_identifier (String s);
+  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 (const string &s);
   SCM lookup_identifier_symbol (SCM s);
-  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_encoding (String);
-  SCM encoding () 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 */