archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r26626 and r26627 from trunk into ruby_1_9_1. This fixes #3159.

Browse source 
--
* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix precision.
  [ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
--
* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-03 09:12:41 +00:00
parent 4fcb855ff3
commit b1809bcff1
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Feb 9 23:48:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): fix precision too.
Tue Feb 9 23:26:07 2010 Yusuke Endoh <mame@tsg.ne.jp>
* ext/bigdecimal/bigdecimal.c (BigDecimal_DoDivmod): fix precision.
[ruby-core:17472][ruby-dev:35372][ruby-dev:40105][ruby-dev:40358]
Thu Dec 10 01:12:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 10 01:12:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (dyna_pop_gen): pop dvars. [ruby-dev:39861] * parse.y (dyna_pop_gen): pop dvars. [ruby-dev:39861]

9
ext/bigdecimal/bigdecimal.c
View file

@ -951,7 +951,9 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
if(!b) return DoSomeOne(self,r,'/'); if(!b) return DoSomeOne(self,r,'/');
SAVE(b); SAVE(b);
*div = b; *div = b;
mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig(); mx = a->Prec+abs(a->exponent);
if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
mx =(mx + 1) * VpBaseFig();
GUARD_OBJ((*c),VpCreateRbObject(mx, "#0")); GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0")); GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
VpDivd(*c, *res, a, b); VpDivd(*c, *res, a, b);
@ -1023,8 +1025,8 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
return (VALUE)0; return (VALUE)0;
} }
mx = a->Prec; mx = a->Prec+abs(a->exponent);
if(mx<b->Prec) mx = b->Prec; if(mx<b->Prec+abs(b->exponent)) mx = b->Prec+abs(b->exponent);
mx =(mx + 1) * VpBaseFig(); mx =(mx + 1) * VpBaseFig();
GUARD_OBJ(c,VpCreateRbObject(mx, "0")); GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0")); GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
@ -1036,6 +1038,7 @@ BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
VpAddSub(c,a,res,-1); VpAddSub(c,a,res,-1);
if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) { if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
VpAddSub(res,d,VpOne(),-1); VpAddSub(res,d,VpOne(),-1);
GUARD_OBJ(d,VpCreateRbObject(GetAddSubPrec(c, b)*(VpBaseFig() + 1), "0"));
VpAddSub(d ,c,b, 1); VpAddSub(d ,c,b, 1);
*div = res; *div = res;
*mod = d; *mod = d;

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 422 #define RUBY_PATCHLEVEL 423
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1