summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ext/bigdecimal/bigdecimal.c5
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 754c5c6b3b..67dd495b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Nov 27 10:40:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * 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]
+
Wed Nov 26 23:15:47 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* strftime.c (STRFTIME): use rb_strftime() recursively, instead of
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 0a43570903..62ff80a860 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -1169,7 +1169,10 @@ BigDecimal_div2(int argc, VALUE *argv, VALUE self)
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);