archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 55123,55129,55130,55133,55136: [Backport #12414]

Browse source 
* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
	  non-finite float values not to raise FloatDomainError.
	  [ruby-core:75682] [Bug #12414]

	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
	  exist.  fixed build error on Windows itroduced at r55123.
	  exist.  fixed build error on Windows introduced at r55123.

	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
	  cygwin. [Bug #12417][ruby-core:75691]

	* include/ruby/missing.h (isfinite): move from numeric.c.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-06-10 07:09:00 +00:00
parent f1cae09ec4
commit 0a619ef7ef
6 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,23 @@
Fri Jun 10 16:06:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/missing.h (isfinite): move from numeric.c.
Fri Jun 10 16:06:25 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
cygwin. [Bug #12417][ruby-core:75691]
Fri Jun 10 16:06:25 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
exist. fixed build error on Windows introduced at r55123.
Fri Jun 10 16:06:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
non-finite float values not to raise FloatDomainError.
[ruby-core:75682] [Bug #12414]
Fri Jun 10 16:00:27 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* thread.c (recursive_list_access): a object id may be a Bignum. so,

6
ext/bigdecimal/bigdecimal.c
View file

@ -215,6 +215,12 @@ again:
if (prec < 0) goto unable_to_coerce_without_prec;
if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
d = RFLOAT_VALUE(v);
if (!isfinite(d)) {
pv = VpCreateRbObject(prec, NULL);
pv->sign = isnan(d) ? VP_SIGN_NaN :
d > 0 ? VP_SIGN_POSITIVE_INFINITE : VP_SIGN_NEGATIVE_FINITE;
return pv;
}
if (d != 0.0) {
v = rb_funcall(v, id_to_r, 0);
goto again;

7
include/ruby/missing.h
View file

@ -171,6 +171,13 @@ RUBY_EXTERN int isnan(double);
# endif
#endif
#ifndef isfinite
# ifndef HAVE_ISFINITE
# define HAVE_ISFINITE 1
# define isfinite(x) finite(x)
# endif
#endif
#ifndef HAVE_NEXTAFTER
RUBY_EXTERN double nextafter(double x, double y);
#endif

8
numeric.c
View file

@ -28,14 +28,6 @@
#include <ieeefp.h>
#endif
#if !defined HAVE_ISFINITE && !defined isfinite
#if defined HAVE_FINITE && !defined finite && !defined _WIN32
extern int finite(double);
# define HAVE_ISFINITE 1
# define isfinite(x) finite(x)
#endif
#endif
/* use IEEE 64bit values if not defined */
#ifndef FLT_RADIX
#define FLT_RADIX 2

12
test/bigdecimal/test_bigdecimal.rb
View file

@ -458,6 +458,18 @@ class TestBigDecimal < Test::Unit::TestCase
assert_equal(false, BigDecimal.new("NaN") > n1)
end
def test_cmp_float_nan
assert_equal(nil, BigDecimal.new("1") <=> Float::NAN)
end
def test_cmp_float_pos_inf
assert_equal(-1, BigDecimal.new("1") <=> Float::INFINITY)
end
def test_cmp_float_neg_inf
assert_equal(+1, BigDecimal.new("1") <=> -Float::INFINITY)
end
def test_cmp_failing_coercion
n1 = BigDecimal.new("1")
assert_equal(nil, n1 <=> nil)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-06-10"
#define RUBY_PATCHLEVEL 329
#define RUBY_PATCHLEVEL 330
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 6