Release: bump Welcome versions.

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

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index ef64af25b606fe753ac6d4015cba154f73f899fe..e3e8bc824da7e3cc4b93937b093d07f04672d603 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -34,26 +34,35 @@ String_convert::bool_string (bool b)
 }
 
 string
-String_convert::bin2hex (string bin_string)
+String_convert::bin2hex (Byte bin_char)
 {
   string str;
-  Byte const *byte = (Byte const*)bin_string.data ();
+  str += ::to_string ((char) nibble2hex_byte ((Byte) (bin_char >> 4)));
+  str += ::to_string ((char) nibble2hex_byte (bin_char++));
+  return str;
+}
+
+string
+String_convert::bin2hex (const string &bin_string)
+{
+  string str;
+  Byte const *byte = (Byte const *)bin_string.data ();
   for (ssize i = 0; i < bin_string.length (); i++)
     {
-      str += to_string ((char)nibble2hex_byte (*byte >> 4));
-      str += to_string ((char)nibble2hex_byte (*byte++));
+      str += ::to_string ((char)nibble2hex_byte ((Byte) (*byte >> 4)));
+      str += ::to_string ((char)nibble2hex_byte (*byte++));
     }
   return str;
 }
 
 int
-String_convert::bin2int (string bin_string)
+String_convert::bin2int (const string &bin_string)
 {
   return bin2unsigned (bin_string);
 }
 
 unsigned
-String_convert::bin2unsigned (string bin_string)
+String_convert::bin2unsigned (const string &bin_string)
 {
   assert (bin_string.length () <= (int)sizeof (unsigned));
 
@@ -67,7 +76,7 @@ String_convert::bin2unsigned (string bin_string)
 }
 
 int
-String_convert::dec2int (string dec_string)
+String_convert::dec2int (const string &dec_string)
 {
   if (!dec_string.length ())
     return 0;
@@ -76,8 +85,6 @@ String_convert::dec2int (string dec_string)
   if (!sscanf (dec_string.c_str (), "%ld", &l))
     assert (false);
 
-  assert (form_string ("%ld", l) == dec_string);
-  
   return (int)l;
 }
 
@@ -86,20 +93,20 @@ 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
+            (fmt ? fmt : "%Ld"), i64); // assume radix 10
   return string (buffer);
 }
 // breendet imp from string
 double
-String_convert::dec2double (string dec_string)
+String_convert::dec2double (const string &dec_string)
 {
   if (!dec_string.length ())
     return 0;
-  
+
   double d = 0.0;
   if (!sscanf (dec_string.c_str (), "%lf", &d))
     assert (false);
-  
+
   return d;
 }
 
@@ -110,28 +117,28 @@ String_convert::hex2bin (string hex_string, string &bin_string_r)
     hex_string = "0" + hex_string;
 
   bin_string_r = "";
-  Byte const *byte = (Byte const*) hex_string.data ();
+  Byte const *byte = (Byte const *) hex_string.data ();
   ssize i = 0;
   while (i < hex_string.length ())
     {
       int high_i = hex2nibble (*byte++);
       int low_i = hex2nibble (*byte++);
       if (high_i < 0 || low_i < 0)
-       return 1; // invalid char
-      bin_string_r += to_string ((char) (high_i << 4 | low_i), 1);
+        return 1; // invalid char
+      bin_string_r += ::to_string ((char) (high_i << 4 | low_i), 1);
       i += 2;
     }
   return 0;
 }
 
 string
-String_convert::hex2bin (string hex_string)
+String_convert::hex2bin (const string &hex_string)
 {
   string str;
 
   if (hex2bin (hex_string, str))
     assert (false);
-  
+
   return str;
 }
 
@@ -149,22 +156,22 @@ String_convert::hex2nibble (Byte byte)
 
 // stupido.  Should use int_string ()
 string
-String_convert::int2dec (int i, int length_i, char ch)
+String_convert::int2dec (int i, size_t length_i, char ch)
 {
   char fill_char = ch;
   if (fill_char)
     fill_char = '0';
 
   // ugh
-  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;
+  return ::to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string;
 }
 
 // stupido.  Should use int_string ()
 string
-String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
+String_convert::unsigned2hex (unsigned u, size_t length, char fill_char)
 {
   string str;
   if (!u)
@@ -173,14 +180,14 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
 #if 1 // both go...
   while (u)
     {
-      str = to_string ((char) ((u % 16)["0123456789abcdef"])) + str;
+      str = ::to_string ((char) ((u % 16)["0123456789abcdef"])) + str;
       u /= 16;
     }
 #else
-  str += int_string (u, "%x"); // hmm. %lx vs. %x -> portability?
+  str += int_string (u, "%x");  // hmm. %lx vs. %x -> portability?
 #endif
 
-  str = to_string (fill_char, length - str.length ()) + str;
+  str = ::to_string (fill_char, ssize_t (length - str.length ())) + str;
   while ((str.length () > length) && (str[ 0 ] == 'f'))
     str = str.substr (2);
 
@@ -188,7 +195,7 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
 }
 
 string
-String_convert::int2hex (int i, int length_i, char fill_char)
+String_convert::int2hex (int i, size_t length_i, char fill_char)
 {
   return unsigned2hex ((unsigned)i, length_i, fill_char);
 }
@@ -197,9 +204,9 @@ Byte
 String_convert::nibble2hex_byte (Byte byte)
 {
   if ((byte & 0x0f) <= 9)
-    return (byte & 0x0f) + '0';
+    return (Byte) ((byte & 0x0f) + '0');
   else
-    return (byte & 0x0f) - 10 + 'a';
+    return (Byte) ((byte & 0x0f) - 10 + 'a');
 }
 /**
    Convert an integer to a string
@@ -212,7 +219,7 @@ 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
+            (fmt ? fmt : "%d"), i); // assume radix 10
   return string (buffer);
 }
 
@@ -262,7 +269,7 @@ String_convert::char_string (char c, int n)
   char *ch = new char[ n ];
   memset (ch, c, n);
   string s (ch, n);
-  
+
   delete[] ch;
   return s;
 }
@@ -290,7 +297,7 @@ String_convert::pointer_string (void const *l)
 string
 String_convert::precision_string (double x, int n)
 {
-  string format = "%." + to_string (max (0, n - 1)) + "e";
+  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));
@@ -307,9 +314,9 @@ String_convert::precision_string (double x, int n)
   str = str.substr (0, 1) + str.substr (2);
   ssize dot = 1 + exp;
   if (dot <= 0)
-    str = "0." + to_string ('0', -dot) + str;
+    str = "0." + ::to_string ('0', -dot) + str;
   else if (dot >= str.length ())
-    str += to_string ('0', dot - str.length ());
+    str += ::to_string ('0', dot - str.length ());
   else if ((dot > 0) && (dot < str.length ()))
     str = str.substr (0, dot) + "." + str.substr (dot);
   else
@@ -318,7 +325,6 @@ String_convert::precision_string (double x, int n)
   return (sign (x) > 0 ? str : "-" + str);
 }
 
-
 string
 String_convert::long_string (long l)
 {
@@ -336,25 +342,33 @@ String_convert::unsigned_string (unsigned u)
 }
 
 string
-String_convert::pad_to (string s, int n)
+String_convert::unsigned_long_string (unsigned long ul)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%lu", ul);
+  return s;
+}
+
+string
+String_convert::pad_to (const string &s, size_t n)
 {
-  return s + string (max (int(n - s.length ()), 0), ' ');
+  return s + string (max (int (n - s.length ()), 0), ' ');
 }
 
 string
 String_convert::to_upper (string s)
 {
-  return strnupr ((char *)s.c_str (), s.length ());
+  return strnupr (const_cast<char*>(s.c_str ()), s.length ());
 }
 
 string
 String_convert::to_lower (string s)
 {
-  return strnlwr ((char *)s.c_str (), s.length ());
+  return strnlwr (const_cast<char*>(s.c_str ()), s.length ());
 }
 
 string
 String_convert::reverse (string s)
 {
-  return (char*) memrev ((unsigned char *)s.data (), s.length ());
+  return (char *) memrev ((unsigned char *)s.data (), s.length ());
 }