*/
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 (Byte bin_char)
{
- std::string str;
- Byte const *byte = (Byte const*)bin_string.data ();
+ 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 (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 (std::string bin_string)
+String_convert::bin2int (const string &bin_string)
{
return bin2unsigned (bin_string);
}
unsigned
-String_convert::bin2unsigned (std::string bin_string)
+String_convert::bin2unsigned (const string &bin_string)
{
assert (bin_string.length () <= (int)sizeof (unsigned));
return result_u;
}
-// breendet imp from std::string
int
-String_convert::dec2int (std::string dec_string)
+String_convert::dec2int (const 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);
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);
+ (fmt ? fmt : "%Ld"), i64); // assume radix 10
+ return string (buffer);
}
-// breendet imp from std::string
+// breendet imp from string
double
-String_convert::dec2double (std::string dec_string)
+String_convert::dec2double (const 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;
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
- 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;
}
-std::string
-String_convert::hex2bin (std::string hex_string)
+string
+String_convert::hex2bin (const 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;
}
}
// stupido. Should use int_string ()
-std::string
-String_convert::int2dec (int i, int length_i, char ch)
+string
+String_convert::int2dec (int i, size_t length_i, char ch)
{
char fill_char = ch;
if (fill_char)
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;
+ return ::to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string;
}
// stupido. Should use int_string ()
-std::string
-String_convert::unsigned2hex (unsigned u, ssize length, char fill_char)
+string
+String_convert::unsigned2hex (unsigned u, size_t length, char fill_char)
{
- std::string str;
+ string str;
if (!u)
str = "0";
#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);
return str;
}
-std::string
-String_convert::int2hex (int i, int length_i, char fill_char)
+string
+String_convert::int2hex (int i, size_t length_i, char fill_char)
{
return unsigned2hex ((unsigned)i, length_i, fill_char);
}
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
@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);
+ (fmt ? fmt : "%d"), i); // assume radix 10
+ return string (buffer);
}
-std::string
+string
String_convert::form_string (char const *format, ...)
{
va_list args;
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);
}
/**
@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);
}
/**
@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);
}
/**
@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);
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
return (sign (x) > 0 ? str : "-" + str);
}
-std::vector<std::string>
-String_convert::split (std::string str, char c)
-{
- std::vector<std::string> a;
- ssize i = str.find (c);
- while (i != NPOS)
- {
- std::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;
-}
-
-std::string
+string
String_convert::long_string (long l)
{
char s[STRING_BUFFER_LEN];
return s;
}
-std::string
+string
String_convert::unsigned_string (unsigned u)
{
char s[STRING_BUFFER_LEN];
- sprintf (s, "%ud", u);
+ sprintf (s, "%u", u);
+ return s;
+}
+
+string
+String_convert::unsigned_long_string (unsigned long ul)
+{
+ char s[STRING_BUFFER_LEN];
+ sprintf (s, "%lu", ul);
return s;
}
-std::string
-String_convert::pad_to (std::string s, int n)
+string
+String_convert::pad_to (const string &s, size_t 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 ());
+ return strnupr (const_cast<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 ());
+ return strnlwr (const_cast<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 ());
+ return (char *) memrev ((unsigned char *)s.data (), s.length ());
}
projects / lilypond.git / blobdiff