* 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 0e42719912c893717dac5e0e3e8d24ea63e0f3b1..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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -19,12 +19,10 @@ bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
-class Lily_lexer : public Includable_lexer 
+class Lily_lexer : public Includable_lexer
 {
-  DECLARE_SMOBS(Lily_lexer,);
-public:
-  SCM scopes_;
-  
+  DECLARE_SMOBS (Lily_lexer,);
+
 private:
   int lookup_keyword (String);
   int scan_bare_word (String);
@@ -34,14 +32,15 @@ private:
   char escaped_char (char) const;
 
   Keyword_table *keytable_;
-
+  SCM scopes_;
+  SCM start_module_;
 public:
   String main_input_name_;
   void *lexval;
   Input *lexloc;
-  bool main_input_b_;
-  
-  Sources *sources_; 
+  bool is_main_input_;
+
+  Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
   SCM chordmodifier_tab_;
@@ -50,19 +49,20 @@ public:
   int error_level_;
   Input last_input_;
 
-  Lily_lexer (Sources*);
-  Lily_lexer (Lily_lexer const&);
+  Lily_lexer (Sources *);
+  Lily_lexer (Lily_lexer const &);
   int yylex ();
 
   void add_lexed_char (int);
 
   void prepare_for_next_token ();
-  int try_special_identifiers (SCM* ,SCM);
+  int try_special_identifiers (SCM *, SCM);
   Input here_input () const;
-  
+
   void add_scope (SCM);
+  SCM set_current_scope ();
   SCM remove_scope ();
-  
+
   void start_main_input ();
 
   SCM lookup_identifier (String s);