Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index d0a188ab69883d77fca0c278266a74ff67f9e4ac..4062e3410fe1a1e3e8d2c6f883140fe83f87e934 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef MY_LILY_LEXER_HH
@@ -21,7 +21,7 @@ void set_lexer ();
 
 class Lily_lexer : public Includable_lexer
 {
-  DECLARE_SMOBS (Lily_lexer,);
+  DECLARE_SMOBS (Lily_lexer);
 
 private:
   int lookup_keyword (string);
@@ -31,15 +31,17 @@ private:
   int identifier_type (SCM);
   char escaped_char (char) const;
 
+  Lily_parser *parser_;
   Keyword_table *keytable_;
   SCM scopes_;
   SCM start_module_;
+  int hidden_state_;
 public:
-  string main_input_name_;
+  vector<int> extra_token_types_;
   void *lexval;
   Input *lexloc;
   bool is_main_input_;
-
+  
   Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
@@ -49,10 +51,10 @@ public:
   int error_level_;
   Input last_input_;
 
-  Lily_lexer (Sources *);
-  Lily_lexer (Lily_lexer const &);
+  Lily_lexer (Sources *, Lily_parser *);
+  Lily_lexer (Lily_lexer const &, Lily_parser *);
   int yylex ();
-
+  
   void add_lexed_char (int);
 
   void prepare_for_next_token ();
@@ -61,12 +63,18 @@ public:
 
   void add_scope (SCM);
   SCM set_current_scope ();
+  bool has_scope () const;
   SCM remove_scope ();
 
   void start_main_input ();
 
+  virtual void new_input (string s, Sources *);
+  virtual void new_input (string s, string d, Sources *);
+
+  SCM keyword_list () const;
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
+  void push_extra_token (int token_type);
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();
   void push_lyric_state ();
@@ -76,6 +84,7 @@ public:
   void pop_state ();
   void LexerError (char const *);
   void set_identifier (SCM name_string, SCM);
+  int get_state () const;
   bool is_note_state () const;
   bool is_chord_state () const;
   bool is_lyric_state () const;