2003 -> 2004

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

diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh
index 23b972439447ab2669b778f450110f42bf93ea42..ab4f520ac1a77f2043b2119ff9a0a760542e3d4b 100644 (file)
--- a/lily/include/includable-lexer.hh
+++ b/lily/include/includable-lexer.hh
@@ -3,19 +3,20 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #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 "fproto.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
 
 // GIGA urg!
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
@@ -39,14 +40,14 @@ public:
   ~Includable_lexer ();
 
   /// store dependencies for Makefile stuff.
-  Array<String> filename_str_arr_;
+  Array<String> filename_strings_;
 
-  Source_file* source_file_l () const;
+  Source_file* get_source_file () const;
   void new_input (String s, Sources*);
   void new_input (String name, String data, Sources*);
 
   void add_lexed_char (int);
-  char const * here_ch_C ();
+  char const * here_str0 () const;
 };