release: 1.5.29

[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 5cb3eb0124cbf18eb7267998dc3decc33f8a1b4c..9868a3f68614b9a613ebc6963e3a83e9463447a9 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--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -18,23 +18,30 @@
 #include "string.hh"
 #include "includable-lexer.hh"
 #include "duration.hh"
-#include "musical-pitch.hh"
+#include "pitch.hh"
+#include "protected-scm.hh"
 
-bool busy_parsing();
-void kill_lexer();
-void set_lexer();
+bool busy_parsing ();
+void kill_lexer ();
+void set_lexer ();
 
-/// lexer for Mudela
+/// lexer for Lilypond
 class My_lily_lexer : public Includable_lexer 
 {
 public:
   String main_input_str_;
   void * lexval_l;
-  Scope * toplevel_scope_p_;
+  Scheme_hash_table * toplevel_variable_tab_;
+  Scope * scope_p_;
+  
   bool main_input_b_;
 
-  Notename_table *chordmodifier_tab_p_;
-  Notename_table *note_tab_p_;
+  /*
+    Scheme hash tables with (oct name acc)  values, and symbol keys
+   */
+  Protected_scm chordmodifier_tab_;
+  Protected_scm pitchname_tab_;
+  
   Link_array<Scope> scope_l_arr_;
   Keyword_table * keytable_p_;
   int errorlevel_i_;
@@ -46,28 +53,25 @@ public:
   Input here_input () const;
 
   void start_main_input ();
-  void set_chordmodifier_table (Notename_table*tab_p);
-  void set_notename_table (Notename_table*tab_p);
-  Identifier*lookup_identifier (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 *);
-  void set_identifier (String str, Identifier* i, bool unique_b = true);
-  void print_declarations (bool init_b) const;
-  bool note_state_b() const;
-  bool chord_state_b() const;
-  bool lyric_state_b() const;
 
+  SCM lookup_identifier (String s);
+  void push_note_state ();
+  void push_figuredbass_state ();
+  void push_chord_state ();
+  void push_lyric_state ();
+  void pop_state ();
+  void LexerError (char const *);
+  void set_identifier (String str, SCM);
+  bool note_state_b () const;
+  bool chord_state_b () const;
+  bool lyric_state_b () const;
+  bool figure_state_b () const;
 private:
   int lookup_keyword (String);
   int scan_bare_word (String);
   int scan_escaped_word (String);
 
-  char escaped_char(char) const;
+  char escaped_char (char) const;
 };
 
 #endif