nobu	2011-05-29 15:09:08 +0900 (Sun, 29 May 2011)

  New Revision: 31778

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

  Log:
    * numeric.c (flo_round): fix for negative value.

  Modified files:
    trunk/ChangeLog
    trunk/bignum.c
    trunk/internal.h
    trunk/numeric.c
    trunk/test/ruby/test_float.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31777)
+++ ChangeLog	(revision 31778)
@@ -1,3 +1,7 @@
+Sun May 29 15:09:05 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* numeric.c (flo_round): fix for negative value.
+
 Sun May 29 02:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
Index: numeric.c
===================================================================
--- numeric.c	(revision 31777)
+++ numeric.c	(revision 31778)
@@ -97,6 +97,7 @@
 }
 #endif
 
+static VALUE fix_uminus(VALUE num);
 static VALUE fix_mul(VALUE x, VALUE y);
 static VALUE int_pow(long x, unsigned long y);
 
@@ -1504,10 +1505,15 @@
     }
     else {
 	if (ndigits < 0) {
-	    if (fabs(number) < f) return INT2FIX(0);
+	    double absnum = fabs(number);
+	    if (absnum < f) return INT2FIX(0);
 	    if (!FIXABLE(number)) {
 		VALUE f10 = int_pow(10, -ndigits);
-		num = rb_big_idiv(rb_dbl2big(number), f10);
+		VALUE n10 = f10;
+		if (number < 0) {
+		    f10 = FIXNUM_P(f10) ? fix_uminus(f10) : rb_big_uminus(f10);
+		}
+		num = rb_big_idiv(rb_dbl2big(absnum), n10);
 		return FIXNUM_P(num) ? fix_mul(num, f10) : rb_big_mul(num, f10);
 	    }
 	    number /= f;
Index: internal.h
===================================================================
--- internal.h	(revision 31777)
+++ internal.h	(revision 31778)
@@ -25,6 +25,8 @@
     struct st_table *const_tbl;
 };
 
+VALUE rb_big_uminus(VALUE x);
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */
Index: bignum.c
===================================================================
--- bignum.c	(revision 31777)
+++ bignum.c	(revision 31778)
@@ -1641,7 +1641,7 @@
  * Unary minus (returns an integer whose value is 0-big)
  */
 
-static VALUE
+VALUE
 rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
Index: test/ruby/test_float.rb
===================================================================
--- test/ruby/test_float.rb	(revision 31777)
+++ test/ruby/test_float.rb	(revision 31778)
@@ -322,6 +322,7 @@
     assert_equal(11100.0, 11111.1.round(-2))
 
     assert_equal(10**300, 1.1e300.round(-300))
+    assert_equal(-10**300, -1.1e300.round(-300))
   end
 
   VS = [

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