merge revision(s) 41623,41723: [Backport #8603]

* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
	  the argument x is not a BigDecimal.
	  This change is based on the patch made by Garth Snyder.
	  [Fix GH-332] https://github.com/ruby/ruby/pull/332
	  This change is based on the patch made by Heesob Park and Garth Snyder.
	  [Bug #6862] [ruby-core:47145]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@41909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2013-07-11 01:09:39 +00:00
parent 322ce91a97
commit 24eff272f1
4 changed files with 41 additions and 9 deletions

View file

@ -1,3 +1,11 @@
Thu Jul 11 10:07:15 2013 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
the argument x is not a BigDecimal.
This change is based on the patch made by Heesob Park and Garth Snyder.
[Bug #6862] [ruby-core:47145]
[Fix GH-332] https://github.com/ruby/ruby/pull/332
Wed Jul 10 10:27:12 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/intern.h (rb_path_next, rb_path_skip_prefix,

View file

@ -2554,7 +2554,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
else if (vx == NULL) {
cannot_be_coerced_into_BigDecimal(rb_eArgError, x);
}
RB_GC_GUARD(vx->obj);
x = RB_GC_GUARD(vx->obj);
n = prec + rmpd_double_figures();
negative = VpGetSign(vx) < 0;

View file

@ -1210,11 +1210,35 @@ class TestBigDecimal < Test::Unit::TestCase
end
def test_BigMath_exp
n = 20
assert_in_epsilon(Math.exp(n), BigMath.exp(BigDecimal("20"), n))
assert_in_epsilon(Math.exp(40), BigMath.exp(BigDecimal("40"), n))
assert_in_epsilon(Math.exp(-n), BigMath.exp(BigDecimal("-20"), n))
assert_in_epsilon(Math.exp(-40), BigMath.exp(BigDecimal("-40"), n))
prec = 20
assert_in_epsilon(Math.exp(20), BigMath.exp(BigDecimal("20"), prec))
assert_in_epsilon(Math.exp(40), BigMath.exp(BigDecimal("40"), prec))
assert_in_epsilon(Math.exp(-20), BigMath.exp(BigDecimal("-20"), prec))
assert_in_epsilon(Math.exp(-40), BigMath.exp(BigDecimal("-40"), prec))
end
def test_BigMath_exp_with_float
prec = 20
assert_in_epsilon(Math.exp(20), BigMath.exp(20.0, prec))
assert_in_epsilon(Math.exp(40), BigMath.exp(40.0, prec))
assert_in_epsilon(Math.exp(-20), BigMath.exp(-20.0, prec))
assert_in_epsilon(Math.exp(-40), BigMath.exp(-40.0, prec))
end
def test_BigMath_exp_with_fixnum
prec = 20
assert_in_epsilon(Math.exp(20), BigMath.exp(20, prec))
assert_in_epsilon(Math.exp(40), BigMath.exp(40, prec))
assert_in_epsilon(Math.exp(-20), BigMath.exp(-20, prec))
assert_in_epsilon(Math.exp(-40), BigMath.exp(-40, prec))
end
def test_BigMath_exp_with_rational
prec = 20
assert_in_epsilon(Math.exp(20), BigMath.exp(Rational(40,2), prec))
assert_in_epsilon(Math.exp(40), BigMath.exp(Rational(80,2), prec))
assert_in_epsilon(Math.exp(-20), BigMath.exp(Rational(-40,2), prec))
assert_in_epsilon(Math.exp(-40), BigMath.exp(Rational(-80,2), prec))
end
def test_BigMath_exp_under_gc_stress

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 451
#define RUBY_PATCHLEVEL 452
#define RUBY_RELEASE_DATE "2013-07-10"
#define RUBY_RELEASE_DATE "2013-07-11"
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 10
#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"