release: 1.5.29

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

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 51aa0937adf9d45c9cf3d0c07cd617435349c117..f7a8342da2a427792593fd3049ee6307d01927f5 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,9 +13,8 @@
 #include <FlexLexer.h>
 
 #include "string.hh"
-#include "array.hh"
-#include "fproto.hh"
-#include "proto.hh"
+#include "parray.hh"
+#include "lily-proto.hh"
 
 // GIGA urg!
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -29,7 +28,7 @@ class Includable_lexer : public yyFlexLexer
 
 protected:
   bool  close_input ();
-  Array<Source_file*> include_stack_;
+  Link_array<Source_file> include_stack_;
   Array<int> char_count_stack_;
 
 public:
@@ -46,7 +45,7 @@ public:
   void new_input (String name, String data, Sources*);
 
   void add_lexed_char (int);
-  char const * here_ch_C ();
+  char const * here_ch_C () const;
 };