X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=26426ae8af1e80824e2626f41c1ff1449e134d99;hb=da83d823fe2fea01d78c7cad71c85e175729fd30;hp=d847605425b0d9be7a9ec79bf66f0d2b462a8004;hpb=bdf74886dc9bcaf01c55677bf2086f4b76a7ef8c;p=lilypond.git diff --git a/lily/source-file.cc b/lily/source-file.cc index d847605425..26426ae8af 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -55,7 +55,7 @@ Source_file::load_stdin () return contents of FILENAME. *Not 0-terminated!* */ vector -gulp_file (string filename, int desired_size) +gulp_file (const string &filename, int desired_size) { /* "b" must ensure to open literally, avoiding text (CR/LF) conversions. */ @@ -106,7 +106,7 @@ Source_file::init () smobify_self (); } -Source_file::Source_file (string filename, string data) +Source_file::Source_file (const string &filename, const string &data) { init (); @@ -124,7 +124,7 @@ Source_file::Source_file (string filename, string data) newline_locations_.push_back (&characters_[0] + i); } -Source_file::Source_file (string filename_string) +Source_file::Source_file (const string &filename_string) { init (); @@ -182,7 +182,7 @@ Source_file::file_line_column_string (char const *context_str0) const get_counts (context_str0, &l, &ch, &col, &offset); return name_string () + ":" + to_string (l) - + ":" + to_string (col); + + ":" + to_string (col + 1); } }