X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstd-string.cc;h=593a286d84e291313a3266c4f0d874549268bc56;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=e9cd0d9e5cac08eea88ef7a6f8b0200d57ea746a;hpb=7c6188a8eb50175e9e6e776b8830f5374814cae9;p=lilypond.git

diff --git a/flower/std-string.cc b/flower/std-string.cc
index e9cd0d9e5c..593a286d84 100644
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -1,42 +1,151 @@
 /*
-  std-tring.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--2015  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"
+#include "string-convert.hh"
+#include "std-vector.hh"
 
-#if STD_STRING
+string
+to_string (const string &s)
+{
+  return s;
+}
 
-namespace std {
-  Std_string
-  to_std_string (char c, int n)
-  {
-    /* FIXME, remove this function and use std::string interface for
-       String?  This interface is a bit clumsy, almost alway you want
-       n=1.  */
-    return Std_string (n, c);
-  }
+string
+to_string (char c, int n)
+{
+  return string (max (n, 0), c);
 }
 
-#define FIND_FAILED string::npos
-#define SIZE_T size_t
-#else /* !STD_STRING */
+string
+to_string (double f, char const *format)
+{
+  return String_convert::double_string (f, format);
+}
 
-#define FIND_FAILED -1
-#define SIZE_T int
+string
+to_string (int i, char const *format)
+{
+  return String_convert::int_string (i, format);
+}
 
-#endif /* STD_STRING */
+string
+to_string (bool b)
+{
+  return String_convert::bool_string (b);
+}
 
-Std_string &
-replace_all (Std_string &str, Std_string find, Std_string replace)
+string
+to_string (long b)
 {
-  int len = find.length ();
-  for (SIZE_T i = str.find (find); i != FIND_FAILED; i = str.find (find,
-								   i + len))
-    str = str.replace (i, len, replace);
+  return String_convert::long_string (b);
+}
+
+string
+to_string (long unsigned b)
+{
+  return String_convert::unsigned_long_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 ();
+  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)
+{
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + 1))
+    (*str)[i] = replace;
+  return *str;
+}
+
+char *
+string_copy (const string &s)
+{
+  ssize len = s.length ();
+  char *dest = new char[len + 1];
+  copy (s.begin (), s.end (), dest);
+  dest[len] = 0;
+
+  return dest;
+}
+
+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, const string &infix)
+{
+  string result;
+  for (vsize i = 0; i < strs.size (); i++)
+    {
+      if (i)
+        result += infix;
+      result += strs[i];
+    }
+
+  return result;
+}