Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / flower / std-string.cc

diff --git a/flower/std-string.cc b/flower/std-string.cc
index b78b0196616aa1adde6f46b9ab64df379b523ed5..1221609c6c0ce4bc2e76a140d4fcbb1ed35f3d11 100644 (file)
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -67,6 +67,9 @@ to_string (char const *format, ...)
   return str;
 }
 
+/*
+  TODO: this O(n^2) in #occurences of find, due to repeated copying.
+ */
 string &
 replace_all (string &str, string find, string replace)
 {
@@ -113,8 +116,7 @@ string_split (string str, char c)
     {
       string s = str.substr (0, i);
       a.push_back (s);
-      while (str[++i] == c)
-       ;
+      i ++;
       str = str.substr (i);
       i = str.find (c);
     }
@@ -122,3 +124,17 @@ string_split (string str, char c)
     a.push_back (str);
   return a;
 }
+
+string
+string_join (vector<string> const &strs, string infix)
+{
+  string result;
+  for (vsize i = 0; i < strs.size (); i ++)
+    {
+      if (i)
+       result += infix;
+      result += strs[i];
+    }
+
+  return result;
+}