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

[Bug #18998] Honor #to_str next to #to_int in Kernel#Integer

Browse source
This commit is contained in:
Nobuyoshi Nakada 2022-10-20 14:07:35 +09:00
parent 4f1e0bfacd
commit 7563604fb8
Notes: git 2022-10-20 06:35:52 +00:00 
Merged: https://github.com/ruby/ruby/pull/6598
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
object.c
View file

@ -3138,6 +3138,9 @@ rb_convert_to_integer(VALUE val, int base, int raise_exception)
tmp = rb_protect(rb_check_to_int, val, NULL);
if (RB_INTEGER_TYPE_P(tmp)) return tmp;
rb_set_errinfo(Qnil);
if (!NIL_P(tmp = rb_check_string_type(val))) {
return rb_str_convert_to_inum(tmp, base, TRUE, raise_exception);
}
if (!raise_exception) {
VALUE result = rb_protect(rb_check_to_i, val, NULL);

7
test/ruby/test_integer.rb
View file

@ -247,6 +247,13 @@ class TestInteger < Test::Unit::TestCase
end;
end
def test_Integer_when_to_str
def (obj = Object.new).to_str
"0x10"
end
assert_equal(16, Integer(obj))
end
def test_int_p
assert_not_predicate(1.0, :integer?)
assert_predicate(1, :integer?)