release: 1.3.39

[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..fc00a1465c1c7f2bee42b27ab355c21c81144fd8 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -19,6 +19,7 @@
 #include "includable-lexer.hh"
 #include "duration.hh"
 #include "musical-pitch.hh"
+#include "protected-scm.hh"
 
 bool busy_parsing();
 void kill_lexer();
@@ -33,8 +34,12 @@ public:
   Scope * toplevel_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_;
@@ -49,15 +54,12 @@ public:
   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;