--*/
-
+#include <stdio.h>
#include <assert.h>
#include <limits.h>
#include "libc-extension.hh"
#include "string.hh"
#include "string-convert.hh"
+#include "rational.hh"
/**
a safe length for stringconversion buffers
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;
String
-String_convert::bin2hex_str( String bin_str )
+String_convert::bin2hex_str (String bin_str)
{
- String str;
- Byte const* byte_c_l = bin_str.byte_c_l();
- for ( int i = 0; i < bin_str.length_i(); i++ ) {
- str += (char)nibble2hex_byte( *byte_c_l >> 4 );
- str += (char)nibble2hex_byte( *byte_c_l++ );
+ 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++);
}
- return str;
+ return str;
}
int
-String_convert::bin2_i( String bin_str )
+String_convert::bin2_i (String bin_str)
+{
+ return bin2_u (bin_str);
+}
+
+unsigned
+String_convert::bin2_u (String bin_str)
{
- assert( bin_str.length_i() <= 4 );
+ assert (bin_str.length_i() <= (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 (int i = 0; i < bin_str.length_i(); i++)
+ {
+ result_u <<= 8;
+ result_u += (Byte)bin_str[ i ];
}
- return result_i;
+ return result_u;
}
// breendet imp from String
int
-String_convert::dec2_i( String dec_str )
+String_convert::dec2_i (String dec_str)
{
- if ( !dec_str.length_i() )
- return 0;
+ if (!dec_str.length_i())
+ return 0;
- long l = 0;
- int conv = sscanf( dec_str.ch_c_l(), "%ld", &l );
- assert( conv );
+ long l = 0;
+ int conv = sscanf (dec_str.ch_C(), "%ld", &l);
+ assert (conv);
- return (int)l;
+ return (int)l;
}
String
-String_convert::i64_str( I64 i64, char const* fmt)
+String_convert::i64_str (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
double
-String_convert::dec2_f( String dec_str )
+String_convert::dec2_f (String dec_str)
{
- if ( !dec_str.length_i() )
- return 0;
- double d = 0;
- int conv = sscanf( dec_str.ch_c_l(), "%lf", &d );
- assert( conv );
- return d;
+ if (!dec_str.length_i())
+ return 0;
+ double d = 0;
+ int conv = sscanf (dec_str.ch_C(), "%lf", &d);
+ assert (conv);
+ 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_l= hex_str.byte_c_l();
- int i = 0;
- while ( i < hex_str.length_i() ) {
- int high_i = hex2nibble_i( *byte_c_l++ );
- int low_i = hex2nibble_i( *byte_c_l++ );
- 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_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;
}
- return 0;
+ return 0;
}
String
-String_convert::hex2bin_str( String hex_str )
+String_convert::hex2bin_str (String hex_str)
{
- 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;
+ // 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;
}
int
-String_convert::hex2nibble_i( Byte byte )
+String_convert::hex2nibble_i (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 )
+String_convert::i2dec_str (int i, int length_i, char ch)
{
- char fill_ch = ch;
- if ( fill_ch)
- fill_ch = '0';
-
- // ugh
- String dec_str( i );
-
- // ugh
- return String( fill_ch, length_i - dec_str.length_i() ) + dec_str;
+ char fill_ch = ch;
+ if (fill_ch)
+ fill_ch = '0';
+
+ // ugh
+ String dec_str (i);
+
+ // ugh
+ return String (fill_ch, length_i - dec_str.length_i()) + dec_str;
}
// stupido. Should use int_str()
String
-String_convert::u2hex_str( unsigned u, int length_i, char fill_ch )
+String_convert::u2hex_str (unsigned u, int length_i, char fill_ch)
{
- 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 = String ((char)((u % 16)["0123456789abcdef"] ) ) + str;
+ u /= 16;
}
#else
- str += int_str( u, "%x" );
+ str += int_str (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 = String (fill_ch, length_i - str.length_i()) + str;
+ while ((str.length_i() > length_i) && (str[ 0 ] == 'f' ) )
+ str = str.cut (2, INT_MAX);
- return str;
+ return str;
}
String
-String_convert::i2hex_str( int i, int length_i, char fill_ch )
+String_convert::i2hex_str (int i, int length_i, char fill_ch)
{
- return u2hex_str( (unsigned)i, length_i, fill_ch );
+ return u2hex_str ((unsigned)i, length_i, fill_ch);
}
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 & 0x0f) + '0';
+ else
+ return (byte & 0x0f) - 10 + 'a';
}
/**
Convert an integer to a string
#fmt# is a printf style format, default assumes "%d" as format.
*/
String
-String_convert::int_str(int i, char const* fmt)
+String_convert::int_str (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);
+ 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 "%lf" as format
*/
String
-String_convert::double_str(double f, char const* fmt)
+String_convert::double_str (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.
+Make a string from a single character.
@param
- #n# is a repetition count, default value is 1
+ #n# is a repetition count, default value is 1
*/
String
-String_convert::char_str(char c, int n)
+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;
+ 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;
+String_convert::rational_str (Rational r)
+{
+ return r.str ();
}
String
-String_convert::pointer_str(void const *l)
+String_convert::pointer_str (void const *l)
{
- I64 i64 = (I64)l;
- return String_convert::i64_str(i64, "0x%0Lx");
+ 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_str (double x, int n)
+{
+ String format = "%." + String (0 >? n - 1) + "e";
+ String str = double_str (abs (x), format.ch_C ());
+
+ int exp = str.right_str (3).value_i ();
+ str = str.left_str (str.length_i () - 4);
+
+ while (str[str.length_i () - 1] == '0')
+ str = str.left_str (str.length_i () - 1);
+ if (str[str.length_i () - 1] == '.')
+ str = str.left_str (str.length_i () - 1);
+
+ if (exp == 0)
+ return (sign (x) > 0 ? str : "-" + str);
+
+ str = str.left_str (1) + str.cut (2, INT_MAX);
+ int dot = 1 + exp;
+ if (dot <= 0)
+ str = "0." + String ('0', -dot) + str;
+ else if (dot >= str.length_i ())
+ str += String ('0', dot - str.length_i ());
+ else if (( dot > 0) && (dot < str.length_i ()))
+ str = str.left_str (dot) + '.' + str.cut (dot, INT_MAX);
+ else
+ assert (0);
+
+ return (sign (x) > 0 ? str : "-" + str);
+}
+
projects / lilypond.git / blobdiff