lilypond-0.0.44

diff --git a/lily/warn.cc b/lily/warn.cc
index 4fe33452cce9476826f3e9f13194a60e403fcbf4..2b9f1db767d265d4a5a2cfcef701e71834aab139 100644 (file)
--- a/lily/warn.cc
+++ b/lily/warn.cc
@@ -21,10 +21,7 @@ warning(String s)
 void
 error(String s)
 {
-    if (busy_parsing())
-       yyerror(s);
-    else
-       cerr <<  "error: " << s << "\n";
+    cerr <<  "error: " << s << "\n";
        
     exit(1);
 }
@@ -45,17 +42,17 @@ error_t(String const & s, Time_description const &t_tdes)
 }
 
 void
-message( String message_str, char const* context_ch_c_l )
+message( String message_str, char const* context_ch_C )
 {
     String str = "";           //"lilypond: ";// GNU format messages!
-    Source_file* sourcefile_l = source_l_g->sourcefile_l( context_ch_c_l );
+    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_l) + String(": ");
+       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_l );
+       str += sourcefile_l->error_str( context_ch_C );
     }
     if ( busy_parsing() )
        cerr << endl;
@@ -63,19 +60,19 @@ message( String message_str, char const* context_ch_c_l )
 }
 
 void
-warning( String message_str, char const* context_ch_c_l )
+warning( String message_str, char const* context_ch_C )
 {
-    message( "warning: " + message_str, context_ch_c_l );
+    message( "warning: " + message_str, context_ch_C );
 }
 
 void
-error( String message_str, char const* context_ch_c_l )
+error( String message_str, char const* context_ch_C )
 {
-    message( message_str, context_ch_c_l );
+    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 ( lexer )
-        lexer->errorlevel_i_ |= 1;
+/*    if ( lexer )
+        lexer->errorlevel_i_ |= 1;*/
 //    exit( 1 );
 }