*** empty log message ***

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 26ac92a6c2c46b5b011cfbd96c8da10b91f12897..a767f1dcbcb2d0170817b0088bf8526632dbfeda 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -12,13 +12,8 @@
 #include "includable-lexer.hh"
 
 #include "input.hh"
-#include "lily-proto.hh"
-#include "flower-proto.hh"
-#include "array.hh"
-#include "string.hh"
 #include "duration.hh"
 #include "pitch.hh"
-#include "smobs.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
@@ -29,7 +24,6 @@ class Lily_lexer : public Includable_lexer
   DECLARE_SMOBS(Lily_lexer,);
 public:
   SCM scopes_;
-  SCM encoding_;
   
 private:
   int lookup_keyword (String);
@@ -40,10 +34,12 @@ private:
   char escaped_char (char) const;
 
   Keyword_table *keytable_;
+
 public:
   String main_input_name_;
   void *lexval;
-  bool main_input_b_;
+  Input *lexloc;
+  bool is_main_input_;
   
   Sources *sources_; 
 
@@ -58,6 +54,8 @@ public:
   Lily_lexer (Lily_lexer const&);
   int yylex ();
 
+  void add_lexed_char (int);
+
   void prepare_for_next_token ();
   int try_special_identifiers (SCM* ,SCM);
   Input here_input () const;
@@ -77,8 +75,6 @@ public:
   void push_note_state (SCM tab);
   void pop_state ();
   void LexerError (char const *);
-  void set_encoding (String);
-  SCM encoding () const;
   void set_identifier (SCM name_string, SCM);
   bool is_note_state () const;
   bool is_chord_state () const;