* The grand 2005-2006 replace.

[lilypond.git] / lily / include / lily-lexer.hh

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 37e25fa10176dfef285d04c9bd9e30b6492bc123..f1b88bf7c6a0bda217f965423586ccd73e0aef19 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -22,8 +22,6 @@ void set_lexer ();
 class Lily_lexer : public Includable_lexer
 {
   DECLARE_SMOBS (Lily_lexer,);
-public:
-  SCM scopes_;
 
 private:
   int lookup_keyword (String);
@@ -34,7 +32,8 @@ private:
   char escaped_char (char) const;
 
   Keyword_table *keytable_;
-
+  SCM scopes_;
+  SCM start_module_;
 public:
   String main_input_name_;
   void *lexval;
@@ -61,6 +60,7 @@ public:
   Input here_input () const;
 
   void add_scope (SCM);
+  SCM set_current_scope ();
   SCM remove_scope ();
 
   void start_main_input ();