release: 1.5.47

[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 9868a3f68614b9a613ebc6963e3a83e9463447a9..40701e2355c893a10513519b9fffb854c5211003 100644 (file)
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -32,8 +32,6 @@ public:
   String main_input_str_;
   void * lexval_l;
   Scheme_hash_table * toplevel_variable_tab_;
-  Scope * scope_p_;
-  
   bool main_input_b_;
 
   /*
@@ -42,7 +40,7 @@ public:
   Protected_scm chordmodifier_tab_;
   Protected_scm pitchname_tab_;
   
-  Link_array<Scope> scope_l_arr_;
+  Link_array<Scheme_hash_table> scope_l_arr_;
   Keyword_table * keytable_p_;
   int errorlevel_i_;
 
@@ -61,7 +59,7 @@ public:
   void push_lyric_state ();
   void pop_state ();
   void LexerError (char const *);
-  void set_identifier (String str, SCM);
+  void set_identifier (SCM name_str, SCM);
   bool note_state_b () const;
   bool chord_state_b () const;
   bool lyric_state_b () const;