X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=768e759b54f1deb5be4646f3023fb119c80854e3;hb=489ffb188ae02237fa0a22763d08841a669dc2a4;hp=f495424f282336e0dfc55180a7b017491ca9687e;hpb=9d4a5bbc9687aef811a60aabd9cb839412984e96;p=lilypond.git

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index f495424f28..768e759b54 100644
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INCLUDABLE_LEXER_HH
@@ -25,26 +25,26 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 */
 class Includable_lexer : public yyFlexLexer
 {
-  std::vector<YY_BUFFER_STATE> state_stack_;
+  vector<YY_BUFFER_STATE> state_stack_;
 
 protected:
   bool close_input ();
-  Link_array__Source_file_ include_stack_;
-  std::vector<int> char_count_stack_;
+  vector<Source_file*> include_stack_;
+  vector<int> char_count_stack_;
 
 public:
-  bool allow_includes_b_;
 
   Includable_lexer ();
   ~Includable_lexer ();
 
   /// store dependencies for Makefile stuff.
-  std::vector<std::string> file_name_strings_;
+  vector<string> file_name_strings_;
 
   Source_file *get_source_file () const;
-  void new_input (std::string s, Sources *);
-  void new_input (std::string name, std::string data, Sources *);
-
+  virtual void new_input (string s, Sources *);
+  
+  void new_input (string name, string data, Sources *);
+  
   char const *here_str0 () const;
 };