2003 -> 2004

[lilypond.git] / lily / include / my-lily-lexer.hh

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index f4eae8ca4a7b9ee5b7fad171f92094401cdbfc44..a7653902e64dbfdeba37c03f4f7ae724f360f0fd 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -12,7 +12,6 @@
 #include "includable-lexer.hh"
 
 #include "input.hh"
-#include "dictionary.hh"
 #include "lily-proto.hh"
 #include "flower-proto.hh"
 #include "array.hh"
@@ -30,7 +29,7 @@ class My_lily_lexer : public Includable_lexer
 {
   Protected_scm scopes_;
 public:
-  String main_input_string_;
+  String main_input_name_;
   void * lexval;
   bool main_input_b_;
 
@@ -38,7 +37,7 @@ public:
     Scheme hash tables with (oct name acc)  values, and symbol keys
    */
   Protected_scm chordmodifier_tab_;
-  Protected_scm pitchname_tab_;
+  Protected_scm pitchname_tab_stack_;
   Keyword_table * keytable_;
   int errorlevel_;
 
@@ -57,10 +56,10 @@ public:
   void start_main_input ();
 
   SCM lookup_identifier (String s);
-  void push_note_state ();
+  void push_note_state (SCM tab);
+  void push_chord_state (SCM tab);
   void push_markup_state ();
   void push_figuredbass_state ();
-  void push_chord_state ();
   void push_lyric_state ();
   void pop_state ();
   void LexerError (char const *);