release: 1.0.15

[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 b0bccca7f5183cfd40b42286ad9a691a0ff89163..3030a09eb45871a36e5981af2fdddd8f161697a8 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--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -11,13 +11,15 @@
 
 #include <FlexLexer.h>
 
+#include "dictionary.hh"
 #include "lily-proto.hh"
 #include "lily-proto.hh"
 #include "fproto.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "string.hh"
 #include "includable-lexer.hh"
 #include "duration.hh"
+#include "musical-pitch.hh"
 
 bool busy_parsing();
 void kill_lexer();
@@ -36,17 +38,17 @@ public:
   void * lexval_l;
   Scope * toplevel_scope_p_;
   
-  Notename_table  *note_tab_p_;
+  Notename_table *note_tab_p_;
   Array<Scope*> scope_l_arr_;
   Keyword_table * keytable_p_;
   int errorlevel_i_;
 
-  /* *************** */
 
   void start_main_input ();
-  void clear_notenames();
+  void set_notename_table(Notename_table*tab_p);
+  bool notename_b(String) const;
   Identifier*lookup_identifier (String s);
-  Melodic_req* lookup_melodic_req_l (String s);
+  Musical_pitch lookup_pitch (String s);
   void push_note_state();
   void push_lyric_state();
   void pop_state();
@@ -56,7 +58,7 @@ public:
   ~My_lily_lexer();
   int yylex();
   void print_declarations (bool init_b) const;
-  void add_notename (String, Melodic_req*);
+  void add_notename (String, Musical_pitch);
   bool note_state_b() const;
   bool lyric_state_b() const;
 };