Enable refinements at Object#respond_to?

[Feature #15327] [Fix GH-2020]

From: osyo-manga <manga.osyo@gmail.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-11-22 08:29:02 +00:00
Родитель 633fef6dec
Коммит 16a642c331
4 изменённых файлов: 45 добавлений и 15 удалений

2
NEWS
Просмотреть файл

@ -20,6 +20,8 @@ sufficient information, see the ChangeLog file or Redmine
* refinements takes place at Kernel#public_send. [Feature #15326]
* refinements takes place at Kernel#respond_to?. [Feature #15327]
* +else+ without +rescue+ now causes a syntax error. [EXPERIMENTAL]
* constant names may start with a non-ASCII capital letter. [Feature #13770]

Просмотреть файл

@ -524,21 +524,42 @@ describe "Module#refine" do
}.should raise_error(NameError, /undefined method `foo'/)
end
it "is not honored by Kernel#respond_to?" do
klass = Class.new
refinement = Module.new do
refine klass do
def foo; end
ruby_version_is "" ... "2.6" do
it "is not honored by Kernel#respond_to?" do
klass = Class.new
refinement = Module.new do
refine klass do
def foo; end
end
end
end
result = nil
Module.new do
using refinement
result = klass.new.respond_to?(:foo)
end
result = nil
Module.new do
using refinement
result = klass.new.respond_to?(:foo)
end
result.should == false
result.should == false
end
end
ruby_version_is "2.6" do
it "is honored by Kernel#respond_to?" do
klass = Class.new
refinement = Module.new do
refine klass do
def foo; end
end
end
result = nil
Module.new do
using refinement
result = klass.new.respond_to?(:foo)
end
result.should == true
end
end
end

Просмотреть файл

@ -326,9 +326,9 @@ class TestRefinement < Test::Unit::TestCase
end
end
def test_respond_to_should_not_use_refinements
def test_respond_to_should_use_refinements
assert_equal(false, 1.respond_to?(:foo))
assert_equal(false, eval_using(IntegerFooExt, "1.respond_to?(:foo)"))
assert_equal(true, eval_using(IntegerFooExt, "1.respond_to?(:foo)"))
end
module StringCmpExt

Просмотреть файл

@ -1089,7 +1089,14 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi)
int
rb_method_boundp(VALUE klass, ID id, int ex)
{
const rb_method_entry_t *me = rb_method_entry_without_refinements(klass, id, NULL);
const rb_method_entry_t *me;
if (ex & BOUND_RESPONDS) {
me = method_entry_resolve_refinement(klass, id, TRUE, NULL);
}
else {
me = rb_method_entry_without_refinements(klass, id, NULL);
}
if (me != 0) {
if ((ex & ~BOUND_RESPONDS) &&