yugui	2008-12-26 01:32:40 +0900 (Fri, 26 Dec 2008)

  New Revision: 21053

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

  Log:
    merges r20368 from trunk into ruby_1_9_1.
    * ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
      Integer for #div operation.
    * ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should raise
      ZeroDivisionError if divisor is zero.  [ruby-dev:37207]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/bigdecimal/bigdecimal.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21052)
+++ ruby_1_9_1/ChangeLog	(revision 21053)
@@ -1,3 +1,11 @@
+Thu Nov 27 10:40:52 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
+	  Integer for #div operation.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should raise
+	  ZeroDivisionError if divisor is zero.  [ruby-dev:37207]
+
 Mon Nov  3 00:36:44 2008  Masaki Suketa  <masaki.suketa@n...>
 
 	* test/win32ole/test_win32ole_event.rb: rename test class.
Index: ruby_1_9_1/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_1_9_1/ext/bigdecimal/bigdecimal.c	(revision 21052)
+++ ruby_1_9_1/ext/bigdecimal/bigdecimal.c	(revision 21053)
@@ -1169,7 +1169,10 @@
        Real *mod;
        obj = BigDecimal_DoDivmod(self,b,&div,&mod);
        if(obj!=(VALUE)0) return obj;
-       return ToValue(div);
+       if(VpIsNaN(div) && rb_equal(b, INT2FIX(0))) {
+	   rb_raise(rb_eZeroDivError, "divided by 0");
+       }
+       return BigDecimal_to_i(ToValue(div));
     } else {    /* div in BigDecimal sense */
        U_LONG ix = (U_LONG)GetPositiveInt(n);
        if(ix==0) return BigDecimal_div(self,b);

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