зеркало из https://github.com/github/ruby.git
* vm_method.c: typo fix [fix GH-993][ci skip] Patch by @0x0dea
* test/ruby/test_refinement.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
3c402604db
Коммит
0e8d7f89e6
|
@ -1,3 +1,8 @@
|
|||
Tue Aug 11 10:33:26 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
|
||||
|
||||
* vm_method.c: typo fix [fix GH-993][ci skip] Patch by @0x0dea
|
||||
* test/ruby/test_refinement.rb: ditto.
|
||||
|
||||
Sun Aug 9 14:15:54 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* vm.c (Init_vm_objects, rb_vm_fstring_table): use frozen_strings
|
||||
|
|
|
@ -1467,7 +1467,7 @@ class TestRefinement < Test::Unit::TestCase
|
|||
module M
|
||||
refine C do
|
||||
def foo
|
||||
puts "Refiend C"
|
||||
puts "Refined C"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
16
vm_method.c
16
vm_method.c
|
@ -783,7 +783,7 @@ rb_callable_method_entry(VALUE klass, ID id)
|
|||
static const rb_method_entry_t *resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr);
|
||||
|
||||
static const rb_method_entry_t *
|
||||
method_entry_resolve_refienment(VALUE klass, ID id, int with_refinement, VALUE *defined_class_ptr)
|
||||
method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE *defined_class_ptr)
|
||||
{
|
||||
const rb_method_entry_t *me = method_entry_get(klass, id, defined_class_ptr);
|
||||
|
||||
|
@ -808,33 +808,33 @@ method_entry_resolve_refienment(VALUE klass, ID id, int with_refinement, VALUE *
|
|||
const rb_method_entry_t *
|
||||
rb_method_entry_with_refinements(VALUE klass, ID id)
|
||||
{
|
||||
return method_entry_resolve_refienment(klass, id, TRUE, NULL);
|
||||
return method_entry_resolve_refinement(klass, id, TRUE, NULL);
|
||||
}
|
||||
|
||||
const rb_callable_method_entry_t *
|
||||
rb_callable_method_entry_with_refinements(VALUE klass, ID id)
|
||||
{
|
||||
VALUE defined_class;
|
||||
const rb_method_entry_t *me = method_entry_resolve_refienment(klass, id, TRUE, &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);
|
||||
}
|
||||
|
||||
const rb_method_entry_t *
|
||||
rb_method_entry_without_refinements(VALUE klass, ID id)
|
||||
{
|
||||
return method_entry_resolve_refienment(klass, id, FALSE, NULL);
|
||||
return method_entry_resolve_refinement(klass, id, FALSE, NULL);
|
||||
}
|
||||
|
||||
const rb_callable_method_entry_t *
|
||||
rb_callable_method_entry_without_refinements(VALUE klass, ID id)
|
||||
{
|
||||
VALUE defined_class;
|
||||
const rb_method_entry_t *me = method_entry_resolve_refienment(klass, id, FALSE, &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);
|
||||
}
|
||||
|
||||
static const rb_method_entry_t *
|
||||
refiend_method_original_method_entry(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr)
|
||||
refined_method_original_method_entry(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr)
|
||||
{
|
||||
VALUE super;
|
||||
|
||||
|
@ -861,7 +861,7 @@ resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *de
|
|||
|
||||
refinement = find_refinement(refinements, me->owner);
|
||||
if (NIL_P(refinement)) {
|
||||
return refiend_method_original_method_entry(refinements, me, defined_class_ptr);
|
||||
return refined_method_original_method_entry(refinements, me, defined_class_ptr);
|
||||
}
|
||||
else {
|
||||
tmp_me = method_entry_get(refinement, me->called_id, defined_class_ptr);
|
||||
|
@ -870,7 +870,7 @@ resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *de
|
|||
return tmp_me;
|
||||
}
|
||||
else {
|
||||
return refiend_method_original_method_entry(refinements, me, defined_class_ptr);
|
||||
return refined_method_original_method_entry(refinements, me, defined_class_ptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче