X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstd-string.cc;h=ec5ddffbd4bd05f013b666004938e7350a50ec15;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9eea7ca9411f570d66de50ce9ebb84b6869bdb09;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/flower/std-string.cc b/flower/std-string.cc
index 9eea7ca941..ec5ddffbd4 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -3,97 +3,144 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006  Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2006--2008  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "std-string.hh"
 #include "string-convert.hh"
 
-namespace std {
+string
+to_string (string s)
+{
+  return s;
+}
+
+string
+to_string (char c, int n)
+{
+  return string (max (n, 0), c);
+}
+
+string
+to_string (double f, char const *format)
+{
+  return String_convert::double_string (f, format);
+}
+
+string
+to_string (int i, char const *format)
+{
+  return String_convert::int_string (i, format);
+}
+
+string
+to_string (bool b)
+{
+  return String_convert::bool_string (b);
+}
+
+string
+to_string (long b)
+{
+  return String_convert::long_string (b);
+}
+
+string
+to_string (long unsigned b)
+{
+  return String_convert::unsigned_string (b);
+}
+
+string
+to_string (unsigned u)
+{
+  return String_convert::unsigned_string (u);
+}
+
+string
+to_string (I64 b, char const *format)
+{
+  return String_convert::i64_string (b, format);
+}
+
+string
+to_string (char const *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  string str = String_convert::vform_string (format, args);
+  va_end (args);
+  return str;
+}
+
+/*
+  TODO: this O(n^2) in #occurences of find, due to repeated copying.
+ */
+string &
+replace_all (string *str, string const &find, string const &replace)
+{
+  ssize len = find.length ();
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + len))
+    *str = str->replace (i, len, replace);
+  return *str;
+}
+
+string &
+replace_all (string *str, char find, char replace)
+{
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + 1))
+    (*str)[i] = replace;
+  return *str;
+}
+
+char *
+string_copy (string s)
+{
+  ssize len = s.length ();
+  char *dest = new char[len + 1];
+  copy (s.begin (), s.end (), dest);
+  dest[len] = 0;
   
-  std::string
-  to_string (std::string s)
-  {
-    return s;
-  }
-
-  std::string
-  to_string (char c, int n)
-  {
-    return std::string (max (n, 0), c);
-  }
-
-  std::string
-  to_string (double f, char const *format)
-  {
-    return String_convert::double_string (f, format);
-  }
-
-  std::string
-  to_string (int i, char const *format)
-  {
-    return String_convert::int_string (i, format);
-  }
-
-  std::string
-  to_string (bool b)
-  {
-    return String_convert::bool_string (b);
-  }
-
-  std::string
-  to_string (long b)
-  {
-    return String_convert::long_string (b);
-  }
-
-  std::string
-  to_string (unsigned u)
-  {
-    return String_convert::unsigned_string (u);
-  }
-
-  std::string
-  to_string (char const *format, ...)
-  {
-    va_list args;
-    va_start (args, format);
-    std::string str = String_convert::vform_string (format, args);
-    va_end (args);
-    return str;
-  }
-
-  std::string &
-  replace_all (std::string &str, std::string find, std::string replace)
-  {
-    ssize len = find.length ();
-    for (ssize i = str.find (find); i != NPOS; i = str.find (find, i + len))
-      str = str.replace (i, len, replace);
-    return str;
-  }
-
-  std::string &
-  replace_all (std::string &str, char find, char replace)
-  {
-    for (ssize i = str.find (find); i != NPOS; i = str.find (find, i + 1))
-      str[i] = replace;
-    return str;
-  }
-
-  char *
-  string_copy (std::string s)
-  {
-    ssize len = s.length ();
-    char *dest = new char[len + 1];
-    //s.copy (dest, len + 1);
-    memcpy (dest, s.c_str (), len + 1);
-    return dest;
-  }
-
-  int
-  string_compare (std::string const &a, std::string const &b)
-  {
-    return a.compare (b);
-  }
+  return dest;
+}
+
+int
+string_compare (string const &a, string const &b)
+{
+  return a.compare (b);
+}
+
+#include "std-vector.hh"
+
+vector<string>
+string_split (string str, char c)
+{
+  ssize i = str.find (c);
+
+  vector<string> a;
+  while (i != NPOS)
+    {
+      string s = str.substr (0, i);
+      a.push_back (s);
+      i ++;
+      str = str.substr (i);
+      i = str.find (c);
+    }
+  if (str.length ())
+    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;
 }