From 072ff356c9d88df7d5d3a019681d385f92576153 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 16:32:40 +0000
Subject: 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]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/bigdecimal/bigdecimal.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index b21041a32..93fab7b36 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);
-- 
cgit