matz	2008-12-11 01:54:43 +0900 (Thu, 11 Dec 2008)

  New Revision: 20616

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

  Log:
    * ext/bigdecimal/bigdecimal.c (BigDecimal_round): should be round
      to integer.  [ruby-dev:37355]
    * ext/bigdecimal/bigdecimal.c (BigDecimal_divmod): division should
      be integer.  [incompatible] [ruby-dev:37355]

  Modified files:
    trunk/ChangeLog
    trunk/ext/bigdecimal/bigdecimal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20615)
+++ ChangeLog	(revision 20616)
@@ -1,3 +1,11 @@
+Thu Dec 11 01:48:00 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_round): should be round
+	  to integer.  [ruby-dev:37355]
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divmod): division should
+	  be integer.  [incompatible] [ruby-dev:37355]
+
 Thu Dec 11 01:21:58 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* thread.c (rb_mutex_unlock): shut up warning.  a patch from
Index: ext/bigdecimal/bigdecimal.c
===================================================================
--- ext/bigdecimal/bigdecimal.c	(revision 20615)
+++ ext/bigdecimal/bigdecimal.c	(revision 20616)
@@ -1155,7 +1155,7 @@
     obj = BigDecimal_DoDivmod(self,r,&div,&mod);
     if(obj!=(VALUE)0) return obj;
     SAVE(div);SAVE(mod);
-    obj = rb_assoc_new(ToValue(div), ToValue(mod));
+    obj = rb_assoc_new(BigDecimal_to_i(ToValue(div)), ToValue(mod));
     return obj;
 }
 
@@ -1369,6 +1369,9 @@
     GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
     VpSetPrecLimit(pl);
     VpActiveRound(c,a,sw,iLoc);
+    if (argc == 0) {
+	return BigDecimal_to_i(ToValue(c));
+    }
     return ToValue(c);
 }
 
@@ -1983,7 +1986,7 @@
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
     rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
-    rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
+    rb_define_method(rb_cBigDecimal, "div", BigDecimal_div2, -1);
     rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
     rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
     rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);

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