Merge with git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond.git

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 7d51b8a64027e5d850edfb214918c3a917f56ff2..543178ca257be56136b83d8dbdf8c03c4b69a5c0 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -31,6 +31,7 @@ private:
   int identifier_type (SCM);
   char escaped_char (char) const;
 
+  Lily_parser *parser_;
   Keyword_table *keytable_;
   SCM scopes_;
   SCM start_module_;
@@ -41,7 +42,7 @@ public:
   void *lexval;
   Input *lexloc;
   bool is_main_input_;
-
+  
   Sources *sources_;
 
   /* Scheme hash tables with (oct name acc)  values, and symbol keys.  */
@@ -51,8 +52,8 @@ 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);