summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-27 01:43:14 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-27 01:43:14 +0000
commitcd31dc23e73c36da44e9985ce7df0d71f5fc153d (patch)
tree9e1d99695c2fed66259cc39bf3f8972d0ef496d4 /ext
parent29683492f665a89ec40249facabb64b3546f618c (diff)
downloadruby-cd31dc23e73c36da44e9985ce7df0d71f5fc153d.tar.gz
ruby-cd31dc23e73c36da44e9985ce7df0d71f5fc153d.tar.xz
ruby-cd31dc23e73c36da44e9985ce7df0d71f5fc153d.zip
* 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] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/bigdecimal/bigdecimal.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 0a4357090..62ff80a86 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);