kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* bignum.c (rb_big2ull): fix 32bit platform breakage. we must

Browse source 
not assume sizeof(VALUE) == sizeof(LONG_LONG).
* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
  fix false assumption on 32bit platform.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2011-11-14 05:56:09 +00:00
parent 302220a8a5
commit ed681d3a82
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Nov 14 14:54:17 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* bignum.c (rb_big2ull): fix 32bit platform breakage. we must
not assume sizeof(VALUE) == sizeof(LONG_LONG).
* test/-ext-/num2int/test_num2int.rb (class TestNum2int):
fix false assumption on 32bit platform.
Mon Nov 14 14:52:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Mon Nov 14 14:52:54 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort() * numeric.c (rb_fix2ushort): fix typo. use num rb_num2ushort()

4
bignum.c
View file

@ -1258,10 +1258,10 @@ rb_big2ull(VALUE x)
unsigned LONG_LONG num = big2ull(x, "unsigned long long"); unsigned LONG_LONG num = big2ull(x, "unsigned long long");
if (!RBIGNUM_SIGN(x)) { if (!RBIGNUM_SIGN(x)) {
VALUE v = (VALUE)(-(SIGNED_VALUE)num); LONG_LONG v = -num;
/* FIXNUM_MIN-1 .. LLONG_MIN mapped into 0xbfffffffffffffff .. LONG_MAX+1 */ /* FIXNUM_MIN-1 .. LLONG_MIN mapped into 0xbfffffffffffffff .. LONG_MAX+1 */
if (v <= LLONG_MAX) if ((unsigned LONG_LONG)v <= LLONG_MAX)
rb_raise(rb_eRangeError, "bignum out of range of unsigned long long"); rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
return v; return v;
} }

10
test/-ext-/num2int/test_num2int.rb
View file

@ -23,12 +23,10 @@ class TestNum2int < Test::Unit::TestCase
LONG_MIN = -9223372036854775808 LONG_MIN = -9223372036854775808
ULONG_MAX = 18446744073709551615 ULONG_MAX = 18446744073709551615
end end
ULONG_HALF = ULONG_MAX - LONG_MAX
LLONG_MAX = 9223372036854775807 LLONG_MAX = 9223372036854775807
LLONG_MIN = -9223372036854775808 LLONG_MIN = -9223372036854775808
ULLONG_MAX = 18446744073709551615 ULLONG_MAX = 18446744073709551615
ULLONG_HALF = ULLONG_MAX - LLONG_MAX # 0x8000000000000000
FIXNUM_MAX = LONG_MAX/2 FIXNUM_MAX = LONG_MAX/2
FIXNUM_MIN = LONG_MIN/2 FIXNUM_MIN = LONG_MIN/2
@ -151,10 +149,10 @@ class TestNum2int < Test::Unit::TestCase
assert_raise(RangeError) do assert_raise(RangeError) do
Num2int.print_num2ulong(ULONG_MAX+1) Num2int.print_num2ulong(ULONG_MAX+1)
end end
assert_output((ULONG_HALF+FIXNUM_MAX+1).to_s) do assert_output((ULONG_MAX-FIXNUM_MAX).to_s) do
Num2int.print_num2ulong(FIXNUM_MIN) Num2int.print_num2ulong(FIXNUM_MIN)
end end
assert_output((ULONG_HALF+FIXNUM_MAX).to_s) do assert_output((ULONG_MAX-FIXNUM_MAX-1).to_s) do
Num2int.print_num2ulong(FIXNUM_MIN-1) Num2int.print_num2ulong(FIXNUM_MIN-1)
end end
assert_output(FIXNUM_MAX.to_s) do assert_output(FIXNUM_MAX.to_s) do
@ -211,10 +209,10 @@ class TestNum2int < Test::Unit::TestCase
assert_raise(RangeError) do assert_raise(RangeError) do
Num2int.print_num2ull(ULLONG_MAX+1) Num2int.print_num2ull(ULLONG_MAX+1)
end end
assert_output((ULLONG_HALF+FIXNUM_MAX+1).to_s) do assert_output((ULLONG_MAX-FIXNUM_MAX).to_s) do
Num2int.print_num2ull(FIXNUM_MIN) Num2int.print_num2ull(FIXNUM_MIN)
end end
assert_output((ULLONG_HALF+FIXNUM_MAX).to_s) do assert_output((ULLONG_MAX-FIXNUM_MAX-1).to_s) do
Num2int.print_num2ull(FIXNUM_MIN-1) Num2int.print_num2ull(FIXNUM_MIN-1)
end end
assert_output(FIXNUM_MAX.to_s) do assert_output(FIXNUM_MAX.to_s) do