Run `make grand-replace'.

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

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 2d4754fec2a7f537a6d4c02854d6d907dcc6a1dd..1e35012f335fe9c48fd357a34c2fcefe08ef7818 100644 (file)
--- 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--2008 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;
 };