lilypond-0.0.28

diff --git a/hdr/main.hh b/hdr/main.hh
index 1102833face510097b2b24ba2d195c0193adc171..e19b0aff12fb8154783d822c3621c21dcaec49cf 100644 (file)
--- a/hdr/main.hh
+++ b/hdr/main.hh
@@ -10,6 +10,6 @@ void set_default_output(String s);
 Input_score* current_iscore_l();
 String find_file(String);
 const char *get_version();
-extern Source* source_l;
+extern Source* source_global_l;
 
 #endif

diff --git a/src/lexerinit.cc b/src/lexerinit.cc
index 508c61e30d993ace379110598d5e9bb1aedf8bb6..92b52ad8b2020e6b8f0d3481f48234cd0f16d651 100644 (file)
--- a/src/lexerinit.cc
+++ b/src/lexerinit.cc
@@ -38,7 +38,7 @@ Input_file::Input_file(String s)
     }
     else {
        Source_file* sourcefile_p = new Source_file( pf );
-       source_l->add( sourcefile_p );
+       source_global_l->add( sourcefile_p );
        sourcefile_l_ = sourcefile_p;
        is = sourcefile_l_->istream_l();
     }

diff --git a/src/main.cc b/src/main.cc
index 7e20c89a70d5d41f10dfbd2fc0bff519c4fcec85..e100ec2884f21156d8b6b85eff4591142fdd65de 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -12,7 +12,7 @@
 #include "source.hh"
 
 Source source;
-Source* source_l = &source;
+Source* source_global_l = &source;
 
 extern void parse_file(String,String);
 

diff --git a/src/warn.cc b/src/warn.cc
index 8328f64fb7fd7f8f86e8883ceeaf572f66092ba3..f8688d72277131451a89557960c69159b3093f17 100644 (file)
--- a/src/warn.cc
+++ b/src/warn.cc
@@ -48,10 +48,9 @@ void
 message( String message_str, char const* context_ch_c_l )
 {
     String str = "lilypond: ";
-    Source_file* sourcefile_l = source_l->sourcefile_l( context_ch_c_l );
+    Source_file* sourcefile_l = source_global_l->sourcefile_l( context_ch_c_l );
     if ( sourcefile_l ) {
-       str += sourcefile_l->name_str() + ": ";
-       str += String( sourcefile_l->line_i( context_ch_c_l ) ) + ": ";
+       str += sourcefile_l->file_line_no_str(context_ch_c_l);
     }
     str += message_str;
     if ( sourcefile_l ) {