Merge branch 'master' into translation

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

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 2175dd8cd43d11e6aec729f72710f2d54b70a575..68e6a0c0b82b199c9a499cf0e00c4d75a65dc12a 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -33,14 +33,23 @@ String_convert::bool_string (bool b)
   return string (b ? "true" : "false");
 }
 
+string
+String_convert::bin2hex (Byte bin_char)
+{
+  string str;
+  str += to_string ((char) nibble2hex_byte ((Byte) (bin_char >> 4)));
+  str += to_string ((char) nibble2hex_byte (bin_char++));
+  return str;
+}
+
 string
 String_convert::bin2hex (string bin_string)
 {
   string str;
-  Byte const *byte = (Byte const*)bin_string.data ();
+  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) (*byte >> 4)));
       str += to_string ((char)nibble2hex_byte (*byte++));
     }
   return str;
@@ -66,7 +75,6 @@ String_convert::bin2unsigned (string bin_string)
   return result_u;
 }
 
-// breendet imp from string
 int
 String_convert::dec2int (string dec_string)
 {
@@ -74,8 +82,10 @@ String_convert::dec2int (string dec_string)
     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;
 }
@@ -85,7 +95,7 @@ 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
@@ -94,9 +104,11 @@ 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;
 }
 
@@ -107,14 +119,14 @@ 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; // illegal char
+        return 1; // invalid char
       bin_string_r += to_string ((char) (high_i << 4 | low_i), 1);
       i += 2;
     }
@@ -125,10 +137,10 @@ string
 String_convert::hex2bin (string hex_string)
 {
   string str;
-  //  silly, asserts should alway be "on"!
-  //    assert (!hex2bin (hex_string, str) );
-  int error_i = hex2bin (hex_string, str);
-  assert (!error_i);
+
+  if (hex2bin (hex_string, str))
+    assert (false);
+
   return str;
 }
 
@@ -146,7 +158,7 @@ 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)
@@ -156,12 +168,12 @@ String_convert::int2dec (int i, int length_i, char ch)
   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)
@@ -174,10 +186,10 @@ String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
       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);
 
@@ -185,7 +197,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);
 }
@@ -194,9 +206,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
@@ -209,7 +221,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);
 }
 
@@ -259,7 +271,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;
 }
@@ -315,25 +327,6 @@ String_convert::precision_string (double x, int n)
   return (sign (x) > 0 ? str : "-" + str);
 }
 
-vector<string>
-String_convert::split (string str, char c)
-{
-  vector<string> a;
-  ssize i = str.find (c);
-  while (i != NPOS)
-    {
-      string s = str.substr (0, i);
-      a.push_back (s);
-      while (str[++i] == c)
-       ;
-      str = str.substr (i);
-      i = str.find (c);
-    }
-  if (str.length ())
-    a.push_back (str);
-  return a;
-}
-
 string
 String_convert::long_string (long l)
 {
@@ -351,9 +344,17 @@ 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 (string s, size_t n)
 {
-  return s + string (max (int(n - s.length ()), 0), ' ');
+  return s + string (max (int (n - s.length ()), 0), ' ');
 }
 
 string
@@ -371,5 +372,5 @@ String_convert::to_lower (string s)
 string
 String_convert::reverse (string s)
 {
-  return (char*) memrev ((unsigned char *)s.data (), s.length ());
+  return (char *) memrev ((unsigned char *)s.data (), s.length ());
 }