X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstring-convert.cc;h=eda9aa9012eeae66c645ab4d43323015f74ff96e;hb=ff90d34b47b91a7321ff9b21fe20133911376364;hp=140c77632deb526a681c3e22556e7977cbfbfa79;hpb=f5c678d37918cc47be3970ddea55335e075ffc2c;p=lilypond.git diff --git a/flower/string-convert.cc b/flower/string-convert.cc index 140c77632d..eda9aa9012 100644 --- a/flower/string-convert.cc +++ b/flower/string-convert.cc @@ -12,7 +12,7 @@ using namespace std; #include "libc-extension.hh" #include "rational.hh" -#include "array.hh" +#include "std-vector.hh" /** A safe length for stringconversion buffers. @@ -318,22 +318,22 @@ String_convert::precision_string (double x, int n) return (sign (x) > 0 ? str : "-" + str); } -Array +std::vector String_convert::split (std::string str, char c) { - Array a; + std::vector a; ssize i = str.find (c); while (i != NPOS) { std::string s = str.substr (0, i); - a.push (s); + a.push_back (s); while (str[++i] == c) ; str = str.substr (i); i = str.find (c); } if (str.length ()) - a.push (str); + a.push_back (str); return a; } @@ -345,6 +345,14 @@ String_convert::long_string (long l) return s; } +std::string +String_convert::unsigned_string (unsigned u) +{ + char s[STRING_BUFFER_LEN]; + sprintf (s, "%u", u); + return s; +} + std::string String_convert::pad_to (std::string s, int n) {