diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-20 15:53:38 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-20 15:53:38 +0000 |
commit | 9e7b5784180e29b258c99fd36639b5221d427287 (patch) | |
tree | e055f4d1e6d183fd14d11d20fd49bd3ce17f09f5 /vm_method.c | |
parent | ab2e7357bd27b5139415bf823c2780bc8273eb83 (diff) |
merge revision(s) 58245,60127: [Backport #13973]
Refactored using Method#owner.
proc.c: super_method of included method
* proc.c (method_super_method): search the next super method along
the included ancestor chain. [ruby-core:83114] [Bug #13973]
* vm_method.c (rb_callable_method_entry_without_refinements):
return the defined class.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
-rw-r--r-- | vm_method.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vm_method.c b/vm_method.c index e0088d0016..a5c83ab0f6 100644 --- a/vm_method.c +++ b/vm_method.c @@ -887,31 +887,31 @@ method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE * } const rb_method_entry_t * -rb_method_entry_with_refinements(VALUE klass, ID id) +rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - return method_entry_resolve_refinement(klass, id, TRUE, NULL); + return method_entry_resolve_refinement(klass, id, TRUE, defined_class_ptr); } const rb_callable_method_entry_t * -rb_callable_method_entry_with_refinements(VALUE klass, ID id) +rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - VALUE defined_class; - const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, &defined_class); - return prepare_callable_method_entry(defined_class, id, me); + VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; + const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, dcp); + return prepare_callable_method_entry(*dcp, id, me); } const rb_method_entry_t * -rb_method_entry_without_refinements(VALUE klass, ID id) +rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - return method_entry_resolve_refinement(klass, id, FALSE, NULL); + return method_entry_resolve_refinement(klass, id, FALSE, defined_class_ptr); } const rb_callable_method_entry_t * -rb_callable_method_entry_without_refinements(VALUE klass, ID id) +rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - VALUE defined_class; - const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, FALSE, &defined_class); - return prepare_callable_method_entry(defined_class, id, me); + VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; + const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, FALSE, dcp); + return prepare_callable_method_entry(*dcp, id, me); } static const rb_method_entry_t * @@ -1091,7 +1091,7 @@ 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); + const rb_method_entry_t *me = rb_method_entry_without_refinements(klass, id, NULL); if (me != 0) { if ((ex & ~BOUND_RESPONDS) && @@ -1331,7 +1331,7 @@ check_definition(VALUE mod, VALUE mid, rb_method_visibility_t visi) const rb_method_entry_t *me; ID id = rb_check_id(&mid); if (!id) return Qfalse; - me = rb_method_entry_without_refinements(mod, id); + me = rb_method_entry_without_refinements(mod, id, NULL); if (me) { if (METHOD_ENTRY_VISI(me) == visi) return Qtrue; } |