X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lib%2Finput.cc;h=e9cc3fd0070ea54f6b3a0a7ef1ebd930b319c25b;hb=0f30a0db2cb940cecc5567359a57d9ed1fa191cd;hp=6f05290422b128aae18787e0f00495395e091121;hpb=13e79c0250d34b6bdfbafbc551ef64e8b59b2991;p=lilypond.git diff --git a/lib/input.cc b/lib/input.cc index 6f05290422..e9cc3fd007 100644 --- a/lib/input.cc +++ b/lib/input.cc @@ -11,65 +11,65 @@ #include "source.hh" #include "source-file.hh" -Input::Input(Source_file*s, char const *cl) +Input::Input (Source_file*s, char const *cl) { source_file_l_=s; defined_ch_C_=cl; } -Input::Input() +Input::Input () { source_file_l_ = 0; defined_ch_C_ = 0; } -Input::Input(Input const &s) +Input::Input (Input const &s) { source_file_l_ = s.source_file_l_; defined_ch_C_ = s.defined_ch_C_; } void -Input::set_spot(Input const &i) +Input::set_spot (Input const &i) { *this = i; } void -Input::message(String message_str)const +Input::message (String message_str) const { String str = ""; - - if ( source_file_l_ ) + + if (source_file_l_) { - str += location_str() + String(": "); + str += location_str () + String (": "); } - + str += message_str; - if ( source_file_l_ ) + if (source_file_l_) { str += ":\n"; - str += source_file_l_->error_str( defined_ch_C_); + str += source_file_l_->error_str (defined_ch_C_); } cerr << str << endl; } void -Input::warning( String message_str)const +Input::warning (String message_str) const { - message( "warning: " + message_str); + message (_ ("warning: ") + message_str); } void -Input::error(String s)const +Input::error (String s) const { - message("error: "+ s); + message (_ ("error: ")+ s); } String -Input::location_str()const +Input::location_str () const { - if (source_file_l_) - return source_file_l_->file_line_no_str(defined_ch_C_); + if (source_file_l_) + return source_file_l_->file_line_no_str (defined_ch_C_); else - return "(location unknown)"; + return _ ("(location unknown)"); }