X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmy-lily-lexer.hh;h=a0f6901b1bcb1c387a021a5286306316b9a254e5;hb=a78c70be8951804126d19eb74b344ae1858023e5;hp=dbe59c6ccd1243dcb3a6801e944a274ccb799b01;hpb=4975901229a1b074f6c93d812e15d653aa8e2952;p=lilypond.git

diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index dbe59c6ccd..a0f6901b1b 100644
--- 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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef LEXER_HH
@@ -21,9 +21,9 @@
 #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 Lilypond
 class My_lily_lexer : public Includable_lexer 
@@ -31,7 +31,9 @@ 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_;
 
   /*
@@ -53,22 +55,22 @@ public:
   void start_main_input ();
 
   SCM lookup_identifier (String s);
-  void push_note_state();
-  void push_chord_state();
-  void push_lyric_state();
-  void pop_state();
+  void push_note_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 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;
+  char escaped_char (char) const;
 };
 
 #endif