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 ba578d1dfc5bf21719fa8c515dedc3a311210db3..7109ebfbe402086e61ab43ad2db61874de55d20b 100644 (file)
--- a/mi2mu/my-midi-lexer.cc
+++ b/mi2mu/my-midi-lexer.cc
@@ -15,23 +15,26 @@ My_midi_lexer* midi_lexer_l_g = 0;
 
 My_midi_lexer::My_midi_lexer( String &filename_str, Sources * sources )
 {
-    source_file_p_ =sources->get_file_l(filename_str);
-    switch_streams( source_file_p_->istream_l() );
+    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 source_file_p_;
+//    delete source_file_p_;
 }
 
 void
 My_midi_lexer::error( char const* sz_l )
 {
-    if ( !source_file_p_ ) {
+    if (1|| !source_file_l_ ) {
        cerr << "error at EOF" << sz_l << '\n';
     } else {
+       
+       // FIXME
+       #if 0
        char const* ch_C = here_ch_C();
        if ( ch_C ) {
            ch_C--;
@@ -40,14 +43,15 @@ My_midi_lexer::error( char const* sz_l )
            ch_C++;
        }
        errorlevel_i_ |= 1;
-       ::error( sz_l, ch_C );
+       error( sz_l);
+       #endif
     }
 }
 
 char const*
 My_midi_lexer::here_ch_C()
 {
-    return source_file_p_->ch_C() + char_count_ ;
+    return source_file_l_->ch_C() + char_count_ ;
 }
 
 int