X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstring-convert.cc;h=ef64af25b606fe753ac6d4015cba154f73f899fe;hb=1a9d44f4edf9c0b3bc12d399491ca7001743b539;hp=7f36355fa883c269ca936ee91cb98d4e4f7e01ff;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 7f36355fa8..ef64af25b6 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -6,14 +6,13 @@
 
 #include "string-convert.hh"
 
-#include <publib.h>
 #include <cstring>
 #include <cstdio>
 using namespace std;
 
 #include "libc-extension.hh"
 #include "rational.hh"
-#include "array.hh"
+#include "std-vector.hh"
 
 /**
    A safe length for stringconversion buffers.
@@ -28,16 +27,16 @@ using namespace std;
 */
 static const int STRING_BUFFER_LEN = 1024;
 
-std::string
+string
 String_convert::bool_string (bool b)
 {
-  return std::string (b ? "true" : "false");
+  return string (b ? "true" : "false");
 }
 
-std::string
-String_convert::bin2hex (std::string bin_string)
+string
+String_convert::bin2hex (string bin_string)
 {
-  std::string str;
+  string str;
   Byte const *byte = (Byte const*)bin_string.data ();
   for (ssize i = 0; i < bin_string.length (); i++)
     {
@@ -48,13 +47,13 @@ String_convert::bin2hex (std::string bin_string)
 }
 
 int
-String_convert::bin2int (std::string bin_string)
+String_convert::bin2int (string bin_string)
 {
   return bin2unsigned (bin_string);
 }
 
 unsigned
-String_convert::bin2unsigned (std::string bin_string)
+String_convert::bin2unsigned (string bin_string)
 {
   assert (bin_string.length () <= (int)sizeof (unsigned));
 
@@ -67,42 +66,45 @@ String_convert::bin2unsigned (std::string bin_string)
   return result_u;
 }
 
-// breendet imp from std::string
 int
-String_convert::dec2int (std::string dec_string)
+String_convert::dec2int (string dec_string)
 {
   if (!dec_string.length ())
     return 0;
 
   long l = 0;
-  int conv = sscanf (dec_string.c_str (), "%ld", &l);
-  assert (conv);
+  if (!sscanf (dec_string.c_str (), "%ld", &l))
+    assert (false);
 
+  assert (form_string ("%ld", l) == dec_string);
+  
   return (int)l;
 }
 
-std::string
+string
 String_convert::i64_string (I64 i64, char const *fmt)
 {
   char buffer[STRING_BUFFER_LEN];
   snprintf (buffer, STRING_BUFFER_LEN,
 	    (fmt ? fmt : "%Ld"), i64); // assume radix 10
-  return std::string (buffer);
+  return string (buffer);
 }
-// breendet imp from std::string
+// breendet imp from string
 double
-String_convert::dec2double (std::string dec_string)
+String_convert::dec2double (string dec_string)
 {
   if (!dec_string.length ())
     return 0;
-  double d = 0;
-  int conv = sscanf (dec_string.c_str (), "%lf", &d);
-  assert (conv);
+  
+  double d = 0.0;
+  if (!sscanf (dec_string.c_str (), "%lf", &d))
+    assert (false);
+  
   return d;
 }
 
 int
-String_convert::hex2bin (std::string hex_string, std::string &bin_string_r)
+String_convert::hex2bin (string hex_string, string &bin_string_r)
 {
   if (hex_string.length () % 2)
     hex_string = "0" + hex_string;
@@ -115,21 +117,21 @@ String_convert::hex2bin (std::string hex_string, std::string &bin_string_r)
       int high_i = hex2nibble (*byte++);
       int low_i = hex2nibble (*byte++);
       if (high_i < 0 || low_i < 0)
-	return 1; // illegal char
+	return 1; // invalid char
       bin_string_r += to_string ((char) (high_i << 4 | low_i), 1);
       i += 2;
     }
   return 0;
 }
 
-std::string
-String_convert::hex2bin (std::string hex_string)
+string
+String_convert::hex2bin (string hex_string)
 {
-  std::string str;
-  //  silly, asserts should alway be "on"!
-  //    assert (!hex2bin (hex_string, str) );
-  int error_i = hex2bin (hex_string, str);
-  assert (!error_i);
+  string str;
+
+  if (hex2bin (hex_string, str))
+    assert (false);
+  
   return str;
 }
 
@@ -146,7 +148,7 @@ String_convert::hex2nibble (Byte byte)
 }
 
 // stupido.  Should use int_string ()
-std::string
+string
 String_convert::int2dec (int i, int length_i, char ch)
 {
   char fill_char = ch;
@@ -154,17 +156,17 @@ String_convert::int2dec (int i, int length_i, char ch)
     fill_char = '0';
 
   // ugh
-  std::string dec_string = to_string (i);
+  string dec_string = to_string (i);
 
   // ugh
   return to_string (fill_char, length_i - dec_string.length ()) + dec_string;
 }
 
 // stupido.  Should use int_string ()
-std::string
+string
 String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
 {
-  std::string str;
+  string str;
   if (!u)
     str = "0";
 
@@ -185,7 +187,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
   return str;
 }
 
-std::string
+string
 String_convert::int2hex (int i, int length_i, char fill_char)
 {
   return unsigned2hex ((unsigned)i, length_i, fill_char);
@@ -205,16 +207,16 @@ String_convert::nibble2hex_byte (Byte byte)
    @param
    #fmt# is a printf style format, default assumes "%d" as format.
 */
-std::string
+string
 String_convert::int_string (int i, char const *fmt)
 {
   char buffer[STRING_BUFFER_LEN];
   snprintf (buffer, STRING_BUFFER_LEN,
 	    (fmt ? fmt : "%d"), i); // assume radix 10
-  return std::string (buffer);
+  return string (buffer);
 }
 
-std::string
+string
 String_convert::form_string (char const *format, ...)
 {
   va_list args;
@@ -222,15 +224,15 @@ String_convert::form_string (char const *format, ...)
   char buffer[STRING_BUFFER_LEN];
   vsnprintf (buffer, STRING_BUFFER_LEN, format, args);
   va_end (args);
-  return std::string (buffer);
+  return string (buffer);
 }
 
-std::string
+string
 String_convert::vform_string (char const *format, va_list args)
 {
   char buffer[STRING_BUFFER_LEN];
   vsnprintf (buffer, STRING_BUFFER_LEN, format, args);
-  return std::string (buffer);
+  return string (buffer);
 }
 
 /**
@@ -238,13 +240,13 @@ String_convert::vform_string (char const *format, va_list args)
 
    @param #fmt# is a printf style format, default assumes "%lf" as format
 */
-std::string
+string
 String_convert::double_string (double f, char const *fmt)
 {
   char buf[STRING_BUFFER_LEN];
 
   snprintf (buf, STRING_BUFFER_LEN, fmt ? fmt : "%f", f);
-  return std::string (buf);
+  return string (buf);
 }
 
 /**
@@ -253,33 +255,30 @@ String_convert::double_string (double f, char const *fmt)
    @param
    #n# is a repetition count, default value is 1
 */
-std::string
+string
 String_convert::char_string (char c, int n)
 {
   n = n >= 0 ? n : 0;
   char *ch = new char[ n ];
   memset (ch, c, n);
-#if STD_STRING
-  std::string s (ch, n);
-#else
-  std::string s (ch, n);
-#endif
+  string s (ch, n);
+  
   delete[] ch;
   return s;
 }
 
-std::string
+string
 String_convert::rational_string (Rational r)
 {
   return r.to_string ();
 }
 
-std::string
+string
 String_convert::pointer_string (void const *l)
 {
   char buffer[STRING_BUFFER_LEN];
   snprintf (buffer, STRING_BUFFER_LEN, "%p", l); // assume radix 10
-  return std::string (buffer);
+  return string (buffer);
 }
 
 /**
@@ -288,11 +287,11 @@ String_convert::pointer_string (void const *l)
    @param
    #n# is the number of nonzero digits
 */
-std::string
+string
 String_convert::precision_string (double x, int n)
 {
-  std::string format = "%." + to_string (max (0, n - 1)) + "e";
-  std::string str = double_string (abs (x), format.c_str ());
+  string format = "%." + to_string (max (0, n - 1)) + "e";
+  string str = double_string (abs (x), format.c_str ());
 
   int exp = dec2int (str.substr (str.length () - 3));
   str = str.substr (0, str.length () - 4);
@@ -319,26 +318,8 @@ String_convert::precision_string (double x, int n)
   return (sign (x) > 0 ? str : "-" + str);
 }
 
-Array<std::string>
-String_convert::split (std::string str, char c)
-{
-  Array<std::string> a;
-  ssize i = str.find (c);
-  while (i != NPOS)
-    {
-      std::string s = str.substr (0, i);
-      a.push (s);
-      while (str[++i] == c)
-	;
-      str = str.substr (i);
-      i = str.find (c);
-    }
-  if (str.length ())
-    a.push (str);
-  return a;
-}
 
-std::string
+string
 String_convert::long_string (long l)
 {
   char s[STRING_BUFFER_LEN];
@@ -346,26 +327,34 @@ String_convert::long_string (long l)
   return s;
 }
 
-std::string
-String_convert::pad_to (std::string s, int n)
+string
+String_convert::unsigned_string (unsigned u)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%u", u);
+  return s;
+}
+
+string
+String_convert::pad_to (string s, int n)
 {
-  return s + std::string (max (int(n - s.length ()), 0), ' ');
+  return s + string (max (int(n - s.length ()), 0), ' ');
 }
 
-std::string
-String_convert::to_upper (std::string s)
+string
+String_convert::to_upper (string s)
 {
   return strnupr ((char *)s.c_str (), s.length ());
 }
 
-std::string
-String_convert::to_lower (std::string s)
+string
+String_convert::to_lower (string s)
 {
   return strnlwr ((char *)s.c_str (), s.length ());
 }
 
-std::string
-String_convert::reverse (std::string s)
+string
+String_convert::reverse (string s)
 {
   return (char*) memrev ((unsigned char *)s.data (), s.length ());
 }