X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=19b01ca6ff3b67dc3cb7ac0308a3d2b4152818a9;hb=d0b51cc48c2d66efbd1cbdc682dd622e7a2a93f9;hp=b87188b4017630239fb923ee9a4e59e5de63d8da;hpb=b9a18c38bf25fe66b0ecea5e83d7beaf69ffa6c0;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index b87188b401..19b01ca6ff 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -25,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);
@@ -53,19 +40,26 @@ private:
   int scan_bare_word (string);
   SCM scan_markup_word (string);
   int scan_escaped_word (string);
+  int scan_shorthand (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_;
+  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_;
 
@@ -73,13 +67,11 @@ public:
   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 *);
+  Lily_lexer (Lily_lexer const &, Lily_parser *, SCM);
   int yylex ();
 
   void add_lexed_char (int);
@@ -87,6 +79,7 @@ public:
   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 ();
@@ -98,19 +91,20 @@ 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_embedded_token ();
-  void push_chord_state (SCM tab);
+  void push_extra_token (int token_type, SCM scm = SCM_UNSPECIFIED);
+  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 LexerWarning (char const *);
   void set_identifier (SCM path, SCM val);
   int get_state () const;
   bool is_note_state () const;