X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=1e35012f335fe9c48fd357a34c2fcefe08ef7818;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9cf7087369832046e9946caea707284992c46baf;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 9cf7087369..1e35012f33 100644
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,43 +3,49 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef INCLUDABLE_LEXER_HH
 #define INCLUDABLE_LEXER_HH
 
+#ifndef LEXER_CC
 #include <FlexLexer.h>
+#endif
 
-#include "string.hh"
-#include "varray.hh"
-#include "fproto.hh"
-#include "proto.hh"
+#include "std-string.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
 
 // GIGA urg!
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 
 /**
-  an yyFlexLexer child with provisions for inclusion.
- */
-class Includable_lexer : public yyFlexLexer {
-  Array<YY_BUFFER_STATE> state_stack_;
+   an yyFlexLexer child with provisions for inclusion.
+*/
+class Includable_lexer : public yyFlexLexer
+{
+  vector<YY_BUFFER_STATE> state_stack_;
+
 protected:
-  bool  close_input ();
-  Array<Source_file*> include_stack_;
-  Array<int> char_count_stack_;
+  bool close_input ();
+  vector<Source_file*> include_stack_;
+  vector<int> char_count_stack_;
+
 public:
-  /// store dependencies for Makefile stuff.
-  Array<String> filename_str_arr_;
 
-  Source_file* source_file_l () const;
-  void new_input (String s,Sources*);
   Includable_lexer ();
   ~Includable_lexer ();
-  void add_lexed_char (int);
-  char const * here_ch_C ();
-};
 
+  /// store dependencies for Makefile stuff.
+  vector<string> file_name_strings_;
+
+  Source_file *get_source_file () const;
+  virtual void new_input (string s, Sources *);
+  
+  void new_input (string name, string data, Sources *);
+  
+  char const *here_str0 () const;
+};
 
 #endif // INCLUDABLE_LEXER_HH