X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstd-string.cc;h=d2c2d624d2981893ce9ac21879d450015f2364d9;hb=2383bd3692349e7e124abae4a4f7bb2da694ea28;hp=304ddf33cf773076d1f43f3a70b1d30822a5b7ed;hpb=72bd1ea165831738260e671737d84dbaffe6a6fc;p=lilypond.git

diff --git a/flower/std-string.cc b/flower/std-string.cc
index 304ddf33cf..d2c2d624d2 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -1,9 +1,20 @@
 /*
-  std-string.cc -- implement external interface for Std_String
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2012  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2006  Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "std-string.hh"
@@ -48,7 +59,7 @@ to_string (long b)
 string
 to_string (long unsigned b)
 {
-  return String_convert::unsigned_string (b);
+  return String_convert::unsigned_long_string (b);
 }
 
 string
@@ -57,6 +68,12 @@ 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, ...)
 {
@@ -67,21 +84,25 @@ 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)
+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;
+  ssize replen = replace.length ();
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + replen))
+    * str = str->replace (i, len, replace);
+  return *str;
 }
 
 string &
-replace_all (string &str, char find, char replace)
+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;
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + 1))
+    (*str)[i] = replace;
+  return *str;
 }
 
 char *
@@ -89,8 +110,9 @@ string_copy (string s)
 {
   ssize len = s.length ();
   char *dest = new char[len + 1];
-  //s.copy (dest, len + 1);
-  memcpy (dest, s.c_str (), len + 1);
+  copy (s.begin (), s.end (), dest);
+  dest[len] = 0;
+
   return dest;
 }
 
@@ -105,14 +127,14 @@ string_compare (string const &a, string const &b)
 vector<string>
 string_split (string str, char c)
 {
-  vector<string> a;
   ssize i = str.find (c);
+
+  vector<string> a;
   while (i != NPOS)
     {
       string s = str.substr (0, i);
       a.push_back (s);
-      while (str[++i] == c)
-	;
+      i++;
       str = str.substr (i);
       i = str.find (c);
     }
@@ -120,3 +142,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;
+}