X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fdata-file.cc;h=9f4c16b115fb6dea2693a352955b9a8751f9ba8b;hb=1539b48e9bd7cd7698e602dc3d3dbe74a6567a49;hp=8339524cd0519681bf43544581773714ce906320;hpb=ded955452c352915d43c6ef78ba2a0f70b71ce2b;p=lilypond.git diff --git a/flower/data-file.cc b/flower/data-file.cc index 8339524cd0..9f4c16b115 100644 --- a/flower/data-file.cc +++ b/flower/data-file.cc @@ -15,27 +15,27 @@ #include "data-file.hh" void -Data_file::gobble_white() +Data_file::gobble_white () { char c; - while ((c=data_get()) == ' ' ||c == '\t') - if (eof_b()) + while ((c=data_get ()) == ' ' ||c == '\t') + if (eof_b ()) return; data_unget (c); } String -Data_file::get_word() +Data_file::get_word () {// should handle escape seq's String s; while (1) { - char c = data_get(); + char c = data_get (); - if (eof_b ()) + if (eof_b ()) break; if (isspace (c)) @@ -49,7 +49,7 @@ Data_file::get_word() { rawmode= true; - while ((c = data_get()) != '\"') + while ((c = data_get ()) != '\"') if (eof_b ()) error (_ ("EOF in a string")); else @@ -66,12 +66,12 @@ Data_file::get_word() } char -Data_file::data_get() +Data_file::data_get () { - char c = get(); + char c = get (); if (!rawmode && c == '#') // gobble comment { - while (!eof_b () && (c = get()) != '\n') + while (!eof_b () && (c = get ()) != '\n') ; return '\n'; } @@ -80,23 +80,23 @@ Data_file::data_get() } String -Data_file::get_line() +Data_file::get_line () { char c; String s; - while (!eof_b () && (c = data_get()) != '\n') + while (!eof_b () && (c = data_get ()) != '\n') s += to_str (c); return s; } void -Data_file::gobble_leading_white() +Data_file::gobble_leading_white () { // eat blank lines. while (!eof_b ()) { - char c = data_get(); + char c = data_get (); if (!isspace (c)) { data_unget (c); @@ -108,7 +108,7 @@ Data_file::gobble_leading_white() Data_file::Data_file (String s) : Text_stream (s) { - //*mlog << "(" << s << flush; + //*mlog << " (" << s << flush; rawmode= false; }