patch::: 1.1.23.jbr1

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

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index 23ab488cf3d776e80496dbf9351abd1e61dd5850..bb293f062dc4e5e67f27d6bf56c3860bc8741b87 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -4,15 +4,17 @@
 
 --*/
 
-
+#include <stdio.h>
 #include <assert.h>
 #include <limits.h>
 #include "libc-extension.hh"
 #include "string.hh"
 #include "string-convert.hh"
+#include "rational.hh"
+#include "array.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.
@@ -22,8 +24,16 @@
    @see
    man 3 snprintf
    */
+
+// hmm, this is shorter even than PATH_MAX
 static const int STRING_BUFFER_LEN=1024;
 
+String
+String_convert::bool_str (bool b)
+{
+  return String (b ? "true" : "false");
+}
+
 String
 String_convert::bin2hex_str (String bin_str)
 {
@@ -31,8 +41,8 @@ String_convert::bin2hex_str (String bin_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++);
+      str += to_str ((char)nibble2hex_byte (*byte_C >> 4));
+      str += to_str ((char)nibble2hex_byte (*byte_C++));
     }
   return str;
 }
@@ -107,7 +117,7 @@ String_convert::hex2bin_i (String hex_str, String& bin_str_r)
       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 );
+      bin_str_r += to_str ((char)(high_i << 4 | low_i), 1 );
       i += 2;
     }
   return 0;
@@ -145,10 +155,10 @@ String_convert::i2dec_str (int i, int length_i, char ch)
     fill_ch = '0';
 
   // ugh
-  String dec_str (i);
+  String dec_str = to_str (i);
   
   // ugh
-  return String (fill_ch, length_i - dec_str.length_i()) + dec_str;
+  return to_str (fill_ch, length_i - dec_str.length_i()) + dec_str;
 }
 
 
@@ -163,16 +173,16 @@ String_convert::u2hex_str (unsigned u, int length_i, char fill_ch)
 #if 1 // both go...
   while (u) 
     {
-      str = String ((char)((u % 16)["0123456789abcdef"] ) ) + str;
+      str = to_str ((char)((u % 16)["0123456789abcdef"] ) ) + str;
       u /= 16;
     }
 #else
   str += int_str (u, "%x");    // hmm. %lx vs. %x -> portability?
 #endif
 
-  str = String (fill_ch, length_i - str.length_i()) + str;
+  str = to_str (fill_ch, length_i - str.length_i()) + str;
   while ((str.length_i() > length_i) &&  (str[ 0 ] == 'f' ) )
-    str = str.cut (2, INT_MAX);
+    str = str.cut_str (2, INT_MAX);
 
   return str;
 }
@@ -206,6 +216,25 @@ String_convert::int_str (int i, char const* fmt)
   return String (buffer);
 }
 
+String
+String_convert::form_str (char const* format, ...)
+{
+  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_str (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.
 
@@ -240,18 +269,7 @@ String_convert::char_str (char c, int n)
 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;
+       return r.str ();
 }
 
 String
@@ -271,31 +289,50 @@ String_convert::pointer_str (void const *l)
 String
 String_convert::precision_str (double x, int n)
 {
-  String format = "%." + String (0 >? n - 1) + "e";
+  String format = "%." + to_str (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.len () - 4);
+  str = str.left_str (str.length_i () - 4);
 
-  while (str[str.len () - 1] == '0')
-    str = str.left_str (str.len () - 1);
-  if (str[str.len () - 1] == '.')
-    str = str.left_str (str.len () - 1);
+  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);
+  str = str.left_str (1) + str.cut_str (2, INT_MAX);
   int dot = 1 + exp;
   if (dot <= 0)
-    str = "0." + String ('0', -dot) + str;
-  else if (dot >= str.len ())
-    str += String ('0', dot - str.len ());
-  else if (( dot > 0) && (dot < str.len ()))
-    str = str.left_str (dot) + '.' + str.cut (dot, INT_MAX);
+    str = "0." + to_str ('0', -dot) + str;
+  else if (dot >= str.length_i ())
+    str += to_str ('0', dot - str.length_i ());
+  else if (( dot > 0) && (dot < str.length_i ()))
+    str = str.left_str (dot) + "." + str.cut_str (dot, INT_MAX);
   else
     assert (0);
 
   return (sign (x) > 0 ? str : "-" + str);
 }
 
+Array<String>
+String_convert::split_arr (String str, char c)
+{
+  Array<String> a;
+  int i = str.index_i (c);
+  while (i >=0)
+    {
+      String s = str.left_str (i);
+      a.push (s);
+      while (str[++i] == c)
+       ;
+      str = str.cut_str (i, INT_MAX);
+      i = str.index_i (c);
+    }
+  if (str.length_i ())
+    a.push (str);
+  return a;
+}
+