X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fincludable-lexer.hh;h=bfc3d81718904244e7b4638735f9105bb905fdfd;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=d596f95a3c5442ea6601ef9ba026245e578afbda;hpb=2745cbd907f8216a4cc1fc5f488ae19efdfdbd10;p=lilypond.git

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index d596f95a3c..bfc3d81718 100644
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -1,54 +1,63 @@
 /*
-  includable-lexer.hh -- declare Includable_lexer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef INCLUDABLE_LEXER_HH
 #define INCLUDABLE_LEXER_HH
 
 #ifndef LEXER_CC
-using namespace std;
 #include <FlexLexer.h>
 #endif
 
-#include "string.hh"
-#include "parray.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 
+   an yyFlexLexer child with provisions for inclusion.
+*/
+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_;
+  bool close_input ();
+  vector<Source_file *> include_stack_;
+  vector<int> char_count_stack_;
 
 public:
-  bool allow_includes_b_;
-  
+
   Includable_lexer ();
   ~Includable_lexer ();
+  string main_input_name_;
 
   /// store dependencies for Makefile stuff.
-  Array<String> filename_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*);
+  Source_file *get_source_file () const;
+  virtual void new_input (const string &s, Sources *);
 
-  void add_lexed_char (int);
-  char const * here_str0 () const;
-};
+  void new_input (const string &name, string data, Sources *);
 
+  char const *here_str0 () const;
+};
 
 #endif // INCLUDABLE_LEXER_HH