From: fred <fred>
Date: Sun, 24 Mar 2002 19:38:13 +0000 (+0000)
Subject: lilypond-0.0.49
X-Git-Tag: release/1.5.59~5020
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3651a49ed44159d97ffac591d154279cae2644ae;p=lilypond.git

lilypond-0.0.49
---

diff --git a/mi2mu/lily-stream.cc b/mi2mu/lily-stream.cc
index f1b61cab5b..8552c42267 100644
--- a/mi2mu/lily-stream.cc
+++ b/mi2mu/lily-stream.cc
@@ -25,7 +25,7 @@ Lily_stream::~Lily_stream()
 {
     delete os_p_;
     if ( indent_i_ )
-	warning( "lily indent level: " + String( indent_i_ ), 0 );
+	warning( "lily indent level: " + String( indent_i_ ));
 }
 
 Lily_stream&
@@ -131,7 +131,7 @@ Lily_stream::open()
 {
     os_p_ = new ofstream( filename_str_ );
     if ( !*os_p_ )
-	error ( "can't open `" + filename_str_ + "\'", 0 );
+	error ( "can't open `" + filename_str_ + "\'");
 }
 
 void
diff --git a/mi2mu/main.cc b/mi2mu/main.cc
index b8795395af..b3f0577991 100644
--- a/mi2mu/main.cc
+++ b/mi2mu/main.cc
@@ -11,9 +11,6 @@ Sources* source_l_g = &source;
 
 Verbose level_ver = NORMAL_ver;
 
-//ugh
-char const* defined_ch_C = 0;
-
 // ugh, another global
 String
 find_file( String str )
@@ -21,42 +18,6 @@ find_file( String str )
     return str;
 }
 
-// ugh, copied from warn.cc, cannot use
-void
-message( String message_str, char const* context_ch_C )
-{
-    String str = "mi2mu: ";
-    Source_file* sourcefile_l = source_l_g->sourcefile_l( context_ch_C );
-    if ( sourcefile_l ) {
-	str += sourcefile_l->file_line_no_str(context_ch_C) + String(": ");
-    }
-    str += message_str;
-    if ( sourcefile_l ) {
-	str += ":\n";
-	str += sourcefile_l->error_str( context_ch_C );
-    }
-//    if ( busy_parsing() )
-    cerr << endl; // until we have fine output manager...
-    cerr << str << endl;
-}
-
-void
-warning( String message_str, char const* context_ch_C )
-{
-    message( "warning: " + message_str, context_ch_C );
-}
-
-void
-error( String message_str, char const* context_ch_C )
-{
-    message( message_str, context_ch_C );
-    // since when exits error again?
-    // i-d say: error: errorlevel |= 1; -> no output upon error
-    //          warning: recovery -> output (possibly wrong)
-    if ( midi_lexer_l_g )
-        midi_lexer_l_g->errorlevel_i_ |= 1;
-}
-
 void
 usage()
 {
diff --git a/mi2mu/midi-event.cc b/mi2mu/midi-event.cc
index c909e07c7b..d0715208ef 100644
--- a/mi2mu/midi-event.cc
+++ b/mi2mu/midi-event.cc
@@ -174,7 +174,7 @@ Midi_time::Midi_time( int num_i, int den_i, int clocks_4_i, int count_32_i )
 {
 	sync_f_ = 1.0;
 	if ( count_32_i != 8 )
-		warning( String( "#32 in quarter: " ) + String( count_32_i ), 0 );
+		warning( String( "#32 in quarter: " ) + String( count_32_i ));
 	num_i_ = num_i;
 	den_i_ = den_i;
 	clocks_1_i_ = clocks_4_i * 4; 
diff --git a/mi2mu/my-midi-lexer.cc b/mi2mu/my-midi-lexer.cc
index 8893005c76..7109ebfbe4 100644
--- a/mi2mu/my-midi-lexer.cc
+++ b/mi2mu/my-midi-lexer.cc
@@ -29,9 +29,12 @@ My_midi_lexer::~My_midi_lexer()
 void
 My_midi_lexer::error( char const* sz_l )
 {
-    if ( !source_file_l_ ) {
+    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,7 +43,8 @@ My_midi_lexer::error( char const* sz_l )
 	    ch_C++;
 	}
 	errorlevel_i_ |= 1;
-	::error( sz_l, ch_C );
+	error( sz_l);
+	#endif
     }
 }
 
diff --git a/mi2mu/my-midi-parser.cc b/mi2mu/my-midi-parser.cc
index 1530e36ac8..a8a2fb1e3b 100644
--- a/mi2mu/my-midi-parser.cc
+++ b/mi2mu/my-midi-parser.cc
@@ -142,7 +142,7 @@ My_midi_parser::set_division_4( int division_4_i )
 	division_1_i_ = division_4_i * 4;
 	Duration::division_1_i_s = division_1_i_;
 	if ( division_4_i < 0 )
-		warning( "seconds iso metrical time" , 0 );
+		warning( "seconds iso metrical time" );
 }
 
 void