partial: 0.0.39-1.hanjan

[lilypond.git] / hdr / lexer.hh

diff --git a/hdr/lexer.hh b/hdr/lexer.hh
index 9e5cf1b3039248ceaf2bff58da1c35f30bd33d2e..6a9d21a98ed7314e566ed04e94d3257b7ab4fb42 100644 (file)
--- a/hdr/lexer.hh
+++ b/hdr/lexer.hh
@@ -1,3 +1,11 @@
+/*
+  lexer.hh -- declare My_flex_lexer
+
+  source file of the LilyPond music typesetter
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
 #ifndef LEXER_HH
 #define LEXER_HH
 #include <FlexLexer.h>
@@ -12,18 +20,6 @@ bool busy_parsing();
 void kill_lexer();
 void set_lexer();
 
-struct Input_file {
-       istream* is;
-       char const* defined_ch_c_l_m;
-       Source_file* sourcefile_l_;
-       int line;
-       String name;
-
-       Input_file(String);
-       ~Input_file();
-};
-
-
 /// lexer with provisions for include files.
 struct My_flex_lexer : yyFlexLexer {
 
@@ -31,9 +27,8 @@ struct My_flex_lexer : yyFlexLexer {
     Assoc<String, Identifier*> *the_id_tab;
     Keyword_table * keytable;
     Notename_tab * defaulttab;
-    char const* data_ch_c_l_m;
     int errorlevel_i_;
-    /****************/
+    /* *************** */
     int ret_notename(int *p, String text, int octave_mod);    
     char const* here_ch_c_l();
     void set(Notename_tab *n);
@@ -48,6 +43,7 @@ struct My_flex_lexer : yyFlexLexer {
     void new_input(String s);
     bool  close_input();
     int yylex();
+    void print_declarations() const;
 };
 
 extern My_flex_lexer *lexer;