nobu	2010-05-12 16:43:14 +0900 (Wed, 12 May 2010)

  New Revision: 27758

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27758

  Log:
    * numeric.c (flo_to_s): fixed broken output including nuls.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/numeric.c
    trunk/ChangeLog
    trunk/numeric.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27757)
+++ ChangeLog	(revision 27758)
@@ -1,3 +1,7 @@
+Wed May 12 16:43:12 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* numeric.c (flo_to_s): fixed broken output including nuls.
+
 Wed May 12 16:25:46 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (flo_to_s): exponent needs 2 digits.
Index: numeric.c
===================================================================
--- numeric.c	(revision 27757)
+++ numeric.c	(revision 27758)
@@ -585,10 +585,15 @@
 	}
 	else if (decpt - digs < float_dig) {
 	    long len;
+	    char *ptr;
 	    rb_str_cat(s, buf, digs);
 	    rb_str_resize(s, (len = RSTRING_LEN(s)) + decpt - digs + 2);
-	    if (decpt > digs) memset(RSTRING_PTR(s) + len, '0', decpt - digs);
-	    rb_str_cat(s, ".0", 2);
+	    ptr = RSTRING_PTR(s) + len;
+	    if (decpt > digs) {
+		memset(ptr, '0', decpt - digs);
+		ptr += decpt - digs;
+	    }
+	    memcpy(ptr, ".0", 2);
 	}
 	else {
 	    goto exp;
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27757)
+++ ruby_1_9_2/ChangeLog	(revision 27758)
@@ -1,3 +1,7 @@
+Wed May 12 16:43:12 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* numeric.c (flo_to_s): fixed broken output including nuls.
+
 Wed May 12 16:34:20 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval_intern.h (rb_vm_get_sourceline): add prototype.
Index: ruby_1_9_2/numeric.c
===================================================================
--- ruby_1_9_2/numeric.c	(revision 27757)
+++ ruby_1_9_2/numeric.c	(revision 27758)
@@ -585,10 +585,15 @@
 	}
 	else if (decpt - digs < float_dig) {
 	    long len;
+	    char *ptr;
 	    rb_str_cat(s, buf, digs);
 	    rb_str_resize(s, (len = RSTRING_LEN(s)) + decpt - digs + 2);
-	    if (decpt > digs) memset(RSTRING_PTR(s) + len, '0', decpt - digs);
-	    rb_str_cat(s, ".0", 2);
+	    ptr = RSTRING_PTR(s) + len;
+	    if (decpt > digs) {
+		memset(ptr, '0', decpt - digs);
+		ptr += decpt - digs;
+	    }
+	    memcpy(ptr, ".0", 2);
 	}
 	else {
 	    goto exp;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/