X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=768e759b54f1deb5be4646f3023fb119c80854e3;hb=c89f780d0c5c221e766ee6e818dcd85307fffaae;hp=4240406cd5ba3fe6a7d32cdb5477696d1fe13d8d;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 4240406cd5..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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INCLUDABLE_LEXER_HH
@@ -13,8 +13,8 @@
 #include <FlexLexer.h>
 #endif
 
-#include "string.hh"
-#include "parray.hh"
+#include "std-string.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 
 // GIGA urg!
@@ -25,26 +25,26 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 */
 class Includable_lexer : public yyFlexLexer
 {
-  Array<YY_BUFFER_STATE> state_stack_;
+  vector<YY_BUFFER_STATE> state_stack_;
 
 protected:
   bool close_input ();
-  Link_array<Source_file> include_stack_;
-  Array<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.
-  Array<String> file_name_strings_;
+  vector<string> file_name_strings_;
 
   Source_file *get_source_file () const;
-  void new_input (String s, Sources *);
-  void new_input (String name, String data, Sources *);
-
+  virtual void new_input (string s, Sources *);
+  
+  void new_input (string name, string data, Sources *);
+  
   char const *here_str0 () const;
 };