diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:07:57 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:07:57 +0000 |
commit | ddcc7aff1ba08011a78cd1a55ce0637c9af3215e (patch) | |
tree | 55d379bf5a0a13efe165ea00e569677cc4349321 /ext | |
parent | f6fb6db04a6805b1d45aece6a5ea296e8111ba57 (diff) | |
download | ruby-ddcc7aff1ba08011a78cd1a55ce0637c9af3215e.tar.gz ruby-ddcc7aff1ba08011a78cd1a55ce0637c9af3215e.tar.xz ruby-ddcc7aff1ba08011a78cd1a55ce0637c9af3215e.zip |
merges r23609 from trunk into ruby_1_9_1.
--
* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
exp is bigger than DBL_MANT_DIG.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/bigdecimal/bigdecimal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 3472970fd..061ec088e 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -604,16 +604,18 @@ BigDecimal_to_f(VALUE self) volatile VALUE str; GUARD_OBJ(p,GetVpValue(self,1)); - if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d); + if (VpVtoD(&d, &e, p)!=1) return rb_float_new(d); + if (e > DBL_MAX_10_EXP) goto erange; str = rb_str_new(0, VpNumOfChars(p,"E")); buf = RSTRING_PTR(str); VpToString(p, buf, 0, 0); errno = 0; d = strtod(buf, 0); if(errno == ERANGE) { + erange: VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0); - if(d>0.0) return rb_float_new(DBL_MAX); - else return rb_float_new(-DBL_MAX); + if(d>0.0) d = VpGetDoublePosInf(); + else d = VpGetDoubleNegInf(); } return rb_float_new(d); } |