release: 0.0.49

[lilypond.git] / mi2mu / my-midi-lexer.cc

diff --git a/mi2mu/my-midi-lexer.cc b/mi2mu/my-midi-lexer.cc
index 843899567b42c5acced37e13ac7d644a3247fe4f..7109ebfbe402086e61ab43ad2db61874de55d20b 100644 (file)
--- a/mi2mu/my-midi-lexer.cc
+++ b/mi2mu/my-midi-lexer.cc
@@ -8,71 +8,72 @@
 int
 yylex() 
 {
-       return midi_lexer_l_g->yylex();
+    return midi_lexer_l_g->yylex();
 }
 
 My_midi_lexer* midi_lexer_l_g = 0;
 
-My_midi_lexer::My_midi_lexer( String filename_str )
+My_midi_lexer::My_midi_lexer( String &filename_str, Sources * sources )
 {
-       midi_lexer_l_g = this;
-       input_file_p_ = new Input_file( filename_str );
-       switch_streams( input_file_p_->is );
-       errorlevel_i_ = 0;
+    source_file_l_ =sources->get_file_l(filename_str);
+    switch_streams( source_file_l_->istream_l() );
+    errorlevel_i_ = 0;
+    char_count_ = 0;
 }
 
 My_midi_lexer::~My_midi_lexer()
 {
-       delete input_file_p_;
-       midi_lexer_l_g = 0;
+//    delete source_file_p_;
 }
 
 void
 My_midi_lexer::error( char const* sz_l )
 {
-    if ( !input_file_p_ ) {
-//     *mlog << "error at EOF" << sz_l << '\n';
+    if (1|| !source_file_l_ ) {
        cerr << "error at EOF" << sz_l << '\n';
     } else {
-       char const* ch_c_l = here_ch_c_l();
-       if ( ch_c_l ) {
-           ch_c_l--;
-           while ( ( *ch_c_l == ' ' ) || ( *ch_c_l == '\t' ) || ( *ch_c_l == '\n' ) )
-                   ch_c_l--;
-           ch_c_l++;
+       
+       // FIXME
+       #if 0
+       char const* ch_C = here_ch_C();
+       if ( ch_C ) {
+           ch_C--;
+           while ( ( *ch_C == ' ' ) || ( *ch_C == '\t' ) || ( *ch_C == '\n' ) )
+               ch_C--;
+           ch_C++;
        }
        errorlevel_i_ |= 1;
-//     ::error( sz_l, ch_c_l );
-       ::error( sz_l, ch_c_l );
+       error( sz_l);
+       #endif
     }
 }
 
 char const*
-My_midi_lexer::here_ch_c_l()
+My_midi_lexer::here_ch_C()
 {
-    return input_file_p_->sourcefile_l_->ch_c_l() + yyin->tellg();
+    return source_file_l_->ch_C() + char_count_ ;
 }
 
 int
 My_midi_lexer::varint2_i( String str )
 {
-        int var_i = 0;
+    int var_i = 0;
 
-       for ( int i = 0; i < str.length_i(); i++ ) {
-               Byte byte = str[ i ];
-               var_i <<= 7;
-               var_i += byte & 0x7f;
-               if ( ! ( byte & 0x80 ) )
-                       return var_i;
-       }
-       cout << "\nvarint2_i:" << String_convert::bin2hex_str( str ) << endl;
-       assert( 0 ); // illegal varint
-       return 0;
+    for ( int i = 0; i < str.length_i(); i++ ) {
+       Byte byte = str[ i ];
+       var_i <<= 7;
+       var_i += byte & 0x7f;
+       if ( ! ( byte & 0x80 ) )
+           return var_i;
+    }
+    cout << "\nvarint2_i:" << String_convert::bin2hex_str( str ) << endl;
+    assert( 0 ); // illegal varint
+    return 0;
 }
 
 int
 My_midi_lexer::close_i()
 {
-       return 0;
+    return 0;
 }