X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fstring-convert.cc;h=e3e8bc824da7e3cc4b93937b093d07f04672d603;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=4c6069ba519800a818a8e5b0c90aae3f31e12a17;hpb=3f374e66968308461daa390a7aeed0b013bfe33d;p=lilypond.git

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 4c6069ba51..e3e8bc824d 100644
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -2,250 +2,373 @@
   PROJECT: FlowerSoft C++ library
   FILE   : string-convert.cc
 
---*/
+  --*/
 
+#include "string-convert.hh"
+
+#include <cstring>
+#include <cstdio>
+using namespace std;
 
-#include <assert.h>
-#include <limits.h>
 #include "libc-extension.hh"
-#include "string.hh"
-#include "string-convert.hh"
+#include "rational.hh"
+#include "std-vector.hh"
 
 /**
-   a safe length for stringconversion buffers
+   A safe length for stringconversion buffers.
 
    worst case would be %f printing HUGE (or 1/HUGE), which is approx
    2e318, this number would have approx 318 zero's in its string.
 
    Should enlarge buff dynamically.
-   
+
    @see
    man 3 snprintf
-   */
-static const int STRING_BUFFER_LEN=1024;
+*/
+static const int STRING_BUFFER_LEN = 1024;
+
+string
+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_str( String bin_str )
+string
+String_convert::bin2hex (const string &bin_string)
 {
-    String str;
-    Byte const* byte_C = bin_str.byte_C();
-    for ( int i = 0; i < bin_str.length_i(); i++ ) {
-	str += (char)nibble2hex_byte( *byte_C >> 4 );
-	str += (char)nibble2hex_byte( *byte_C++ );
+  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) (*byte >> 4)));
+      str += ::to_string ((char)nibble2hex_byte (*byte++));
     }
-    return str;
+  return str;
 }
 
 int
-String_convert::bin2_i( String bin_str )
+String_convert::bin2int (const string &bin_string)
+{
+  return bin2unsigned (bin_string);
+}
+
+unsigned
+String_convert::bin2unsigned (const string &bin_string)
 {
-    assert( bin_str.length_i() <= 4 );
+  assert (bin_string.length () <= (int)sizeof (unsigned));
 
-    int result_i = 0;
-    for ( int i = 0; i < bin_str.length_i(); i++ ) {
-	result_i <<= 8;
-	result_i += (Byte)bin_str[ i ];
+  unsigned result_u = 0;
+  for (ssize i = 0; i < bin_string.length (); i++)
+    {
+      result_u <<= 8;
+      result_u += (Byte)bin_string[ i ];
     }
-    return result_i;
+  return result_u;
 }
 
-// breendet imp from String
 int
-String_convert::dec2_i( String dec_str )
+String_convert::dec2int (const string &dec_string)
 {
-    if ( !dec_str.length_i() )
-    	return 0;
+  if (!dec_string.length ())
+    return 0;
 
-    long l = 0;
-    int conv = sscanf( dec_str.ch_C(), "%ld", &l );
-    assert( conv );
+  long l = 0;
+  if (!sscanf (dec_string.c_str (), "%ld", &l))
+    assert (false);
 
-    return (int)l;
+  return (int)l;
 }
 
-String
-String_convert::i64_str( I64 i64, char const* fmt)
+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 String(buffer);
-
+  char buffer[STRING_BUFFER_LEN];
+  snprintf (buffer, STRING_BUFFER_LEN,
+            (fmt ? fmt : "%Ld"), i64); // assume radix 10
+  return string (buffer);
 }
-// breendet imp from String
+// breendet imp from string
 double
-String_convert::dec2_f( String dec_str )
+String_convert::dec2double (const string &dec_string)
 {
-    if ( !dec_str.length_i() )
-    	return 0;
-    double d = 0;
-    int conv = sscanf( dec_str.ch_C(), "%lf", &d );
-    assert( conv );
-    return d;
+  if (!dec_string.length ())
+    return 0;
+
+  double d = 0.0;
+  if (!sscanf (dec_string.c_str (), "%lf", &d))
+    assert (false);
+
+  return d;
 }
 
 int
-String_convert::hex2bin_i( String hex_str, String& bin_str_r )
-{
-    if ( hex_str.length_i() % 2 )
-        hex_str = "0" + hex_str;
-
-    bin_str_r = "";
-    Byte const* byte_C= hex_str.byte_C();
-    int i = 0;
-    while ( i < hex_str.length_i() ) {   
-        int high_i = hex2nibble_i( *byte_C++ );
-        int low_i = hex2nibble_i( *byte_C++ );
-        if ( high_i < 0 || low_i < 0 )
-            return 1; // illegal char
-        bin_str_r += String( (char)( high_i << 4 | low_i ), 1 );
-        i += 2;
+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 ();
+  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);
+      i += 2;
     }
-    return 0;
+  return 0;
 }
 
-String 
-String_convert::hex2bin_str( String hex_str )
+string
+String_convert::hex2bin (const string &hex_string)
 {
-    String str;
-//  silly, asserts should alway be "on"!
-//    assert( !hex2bin_i( hex_str, str ) );
-    int error_i = hex2bin_i( hex_str, str );
-    assert( !error_i );
-    return str;
+  string str;
+
+  if (hex2bin (hex_string, str))
+    assert (false);
+
+  return str;
 }
 
-int 
-String_convert::hex2nibble_i( Byte byte )
+int
+String_convert::hex2nibble (Byte byte)
 {
-    if ( byte >= '0' && byte <= '9' )
-        return byte - '0';
-    if ( byte >= 'A' && byte <= 'F' )
-        return byte - 'A' + 10;
-    if ( byte >= 'a' && byte <= 'f')
-        return byte - 'a' + 10;
-    return -1;
+  if (byte >= '0' && byte <= '9')
+    return byte - '0';
+  if (byte >= 'A' && byte <= 'F')
+    return byte - 'A' + 10;
+  if (byte >= 'a' && byte <= 'f')
+    return byte - 'a' + 10;
+  return -1;
 }
 
-// stupido.  Should use int_str()
-String 
-String_convert::i2dec_str( int i, int length_i, char ch )
+// stupido.  Should use int_string ()
+string
+String_convert::int2dec (int i, size_t length_i, char ch)
 {
-    char fill_ch = ch;
-    if ( fill_ch)
-        fill_ch = '0';
+  char fill_char = ch;
+  if (fill_char)
+    fill_char = '0';
 
-    // ugh
-    String dec_str( i );
-    
-    // ugh
-    return String( fill_ch, length_i - dec_str.length_i() ) + dec_str;
-}
+  // ugh
+  string dec_string = ::to_string (i);
 
+  // ugh
+  return ::to_string (fill_char, ssize_t (length_i - dec_string.length ())) + dec_string;
+}
 
-// stupido.  Should use int_str()
-String 
-String_convert::u2hex_str( unsigned u, int length_i, char fill_ch )
+// stupido.  Should use int_string ()
+string
+String_convert::unsigned2hex (unsigned u, size_t length, char fill_char)
 {
-    String str;
-    if ( !u )
-	str = "0";
+  string str;
+  if (!u)
+    str = "0";
 
 #if 1 // both go...
-    while ( u ) {
-	str = String( (char)( ( u % 16 )["0123456789abcdef"] ) ) + str;
-	u /= 16;
+  while (u)
+    {
+      str = ::to_string ((char) ((u % 16)["0123456789abcdef"])) + str;
+      u /= 16;
     }
 #else
-    str += int_str( u, "%x" );	// hmm. %lx vs. %x -> portability?
+  str += int_string (u, "%x");  // hmm. %lx vs. %x -> portability?
 #endif
 
-    str = String( fill_ch, length_i - str.length_i() ) + str;
-    while ( ( str.length_i() > length_i ) &&  ( str[ 0 ] == 'f' ) )
-    	str = str.mid_str( 2, INT_MAX );
+  str = ::to_string (fill_char, ssize_t (length - str.length ())) + str;
+  while ((str.length () > length) && (str[ 0 ] == 'f'))
+    str = str.substr (2);
 
-    return str;
+  return str;
 }
 
-String 
-String_convert::i2hex_str( int i, int length_i, char fill_ch )
+string
+String_convert::int2hex (int i, size_t length_i, char fill_char)
 {
-    return u2hex_str( (unsigned)i, length_i, fill_ch );
+  return unsigned2hex ((unsigned)i, length_i, fill_char);
 }
 
 Byte
-String_convert::nibble2hex_byte( Byte byte )
+String_convert::nibble2hex_byte (Byte byte)
 {
-    if ( ( byte & 0x0f ) <= 9 )
-	return ( byte & 0x0f ) + '0';
-    else
-	return ( byte & 0x0f ) - 10 + 'a';
+  if ((byte & 0x0f) <= 9)
+    return (Byte) ((byte & 0x0f) + '0');
+  else
+    return (Byte) ((byte & 0x0f) - 10 + 'a');
 }
 /**
-  Convert an integer to a string
+   Convert an integer to a string
+
+   @param
+   #fmt# is a printf style format, default assumes "%d" as format.
+*/
+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 string (buffer);
+}
 
-  @param
-  #fmt# is a printf style format, default assumes "%d" as format. 
-  */
-String
-String_convert::int_str(int i, char const* fmt)
+string
+String_convert::form_string (char const *format, ...)
 {
-    char buffer[STRING_BUFFER_LEN];
-    snprintf(buffer, STRING_BUFFER_LEN,
-	     (fmt ? fmt : "%d"), i );     // assume radix 10
-    return String(buffer);
+  va_list args;
+  va_start (args, format);
+  char buffer[STRING_BUFFER_LEN];
+  vsnprintf (buffer, STRING_BUFFER_LEN, format, args);
+  va_end (args);
+  return string (buffer);
+}
+
+string
+String_convert::vform_string (char const *format, va_list args)
+{
+  char buffer[STRING_BUFFER_LEN];
+  vsnprintf (buffer, STRING_BUFFER_LEN, format, args);
+  return string (buffer);
 }
 
 /**
-  Convert a double to a string.
+   Convert a double to a string.
 
-  @param #fmt# is a printf style format, default assumes "%lf" as format
- */
-String
-String_convert::double_str(double f, char const* fmt)
+   @param #fmt# is a printf style format, default assumes "%lf" as format
+*/
+string
+String_convert::double_string (double f, char const *fmt)
 {
-    char buf[STRING_BUFFER_LEN]; 
+  char buf[STRING_BUFFER_LEN];
 
-    snprintf(buf, STRING_BUFFER_LEN, fmt ? fmt : "%f", f);
-    return buf;
+  snprintf (buf, STRING_BUFFER_LEN, fmt ? fmt : "%f", f);
+  return string (buf);
 }
 
 /**
-  Make a string from a single character.
-
-  @param
-    #n# is a repetition count, default value is 1
- */
-String
-String_convert::char_str(char c, int n)
-{
-    n = n >= 0 ? n : 0;
-    char* ch_p = new char[ n ];
-    memset( ch_p, c, n );
-    String s((Byte*)ch_p, n);
-    delete ch_p;
-    return s;
-}
-
-String
-String_convert::rational_str(Rational r)
-{
-    char * n = Itoa(r.numerator()); // LEAK????
-    
-    String s = n;
-    if (r.denominator() != 1) {
-	char * d = Itoa(r.denominator());
-	s +=  String( '/' ) + String(d);
-	//delete d;
-    }
-/*    delete n;
-    */
-    return s;
+   Make a string from a single character.
+
+   @param
+   #n# is a repetition count, default value is 1
+*/
+string
+String_convert::char_string (char c, int n)
+{
+  n = n >= 0 ? n : 0;
+  char *ch = new char[ n ];
+  memset (ch, c, n);
+  string s (ch, n);
+
+  delete[] ch;
+  return s;
+}
+
+string
+String_convert::rational_string (Rational r)
+{
+  return r.to_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 string (buffer);
+}
+
+/**
+   Convert a double to a string.
+
+   @param
+   #n# is the number of nonzero digits
+*/
+string
+String_convert::precision_string (double x, int n)
+{
+  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);
+
+  while (str[str.length () - 1] == '0')
+    str = str.substr (0, str.length () - 1);
+  if (str[str.length () - 1] == '.')
+    str = str.substr (0, str.length () - 1);
+
+  if (exp == 0)
+    return (sign (x) > 0 ? str : "-" + str);
+
+  str = str.substr (0, 1) + str.substr (2);
+  ssize dot = 1 + exp;
+  if (dot <= 0)
+    str = "0." + ::to_string ('0', -dot) + str;
+  else if (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
+    assert (0);
+
+  return (sign (x) > 0 ? str : "-" + str);
+}
+
+string
+String_convert::long_string (long l)
+{
+  char s[STRING_BUFFER_LEN];
+  sprintf (s, "%ld", l);
+  return s;
+}
+
+string
+String_convert::unsigned_string (unsigned u)
+{
+  char s[STRING_BUFFER_LEN];
+  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;
+}
+
+string
+String_convert::pad_to (const string &s, size_t n)
+{
+  return s + string (max (int (n - s.length ()), 0), ' ');
+}
+
+string
+String_convert::to_upper (string s)
+{
+  return strnupr (const_cast<char*>(s.c_str ()), s.length ());
+}
+
+string
+String_convert::to_lower (string s)
+{
+  return strnlwr (const_cast<char*>(s.c_str ()), s.length ());
 }
 
-String
-String_convert::pointer_str(void const *l)
+string
+String_convert::reverse (string s)
 {
-    I64 i64 = (I64)l;
-    return String_convert::i64_str(i64,  "0x%0Lx");
+  return (char *) memrev ((unsigned char *)s.data (), s.length ());
 }