patch::: 1.3.8.uu1

[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 70dc4623c8f697dcbda3f80db15e8845b5545d15..cc86ccdac19294aa005dec466de5028dbf570033 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@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -25,49 +25,52 @@ bool busy_parsing();
 void kill_lexer();
 void set_lexer();
 
-
 /// lexer for Mudela
-class My_lily_lexer : public Includable_lexer {
-  int lookup_keyword (String);
-  int scan_bare_word (String);
-  int scan_escaped_word (String);
-
-  char escaped_char(char) const;
+class My_lily_lexer : public Includable_lexer 
+{
 public:
   String main_input_str_;
   void * lexval_l;
   Scope * toplevel_scope_p_;
   bool main_input_b_;
-  
+
+  Notename_table *chordmodifier_tab_p_;
   Notename_table *note_tab_p_;
-  Array<Scope*> scope_l_arr_;
+  Link_array<Scope> scope_l_arr_;
   Keyword_table * keytable_p_;
   int errorlevel_i_;
-  Notename_table *chordmodifier_tab_p_;
-  Musical_pitch lookup_notename (String s);
+
+  My_lily_lexer ();
+  ~My_lily_lexer ();
+  int yylex ();
+
+  Input here_input () const;
+
   void start_main_input ();
-  void set_notename_table(Notename_table*tab_p);
+  bool notename_b (String) const;
   bool chordmodifier_b (String) const;
   void set_chordmodifier_table (Notename_table*tab_p);
-  Musical_pitch lookup_chordmodifier (String s);
-   
-  bool notename_b(String) const;
+  void set_notename_table (Notename_table*tab_p);
   Identifier*lookup_identifier (String s);
-  Musical_pitch lookup_pitch (String s);
+  Musical_pitch lookup_notename (String s);
+  Musical_pitch lookup_chordmodifier (String s);
   void push_note_state();
   void push_chord_state();
   void push_lyric_state();
   void pop_state();
   void LexerError (char const *);
-  My_lily_lexer();
   void set_identifier (String str, Identifier* i, bool unique_b = true);
-  ~My_lily_lexer();
-  int yylex();
   void print_declarations (bool init_b) const;
-  void add_notename (String, Musical_pitch);
   bool note_state_b() const;
   bool chord_state_b() const;
   bool lyric_state_b() const;
+
+private:
+  int lookup_keyword (String);
+  int scan_bare_word (String);
+  int scan_escaped_word (String);
+
+  char escaped_char(char) const;
 };
 
 #endif