summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-11 01:33:32 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-11 01:33:32 +0000
commit0e8d7f89e6c88b38d135219f24193d6aae4b8cb7 (patch)
treebeb5d1ab5d51729da332cbe6cee379371e864273
parent3c402604dbcad8573fdcdeda4d84406a66740a7a (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_refinement.rb2
-rw-r--r--vm_method.c16
3 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index becf916b4a..196042523c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 80f44ab706..ecc7153649 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -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
diff --git a/vm_method.c b/vm_method.c
index 1364e5a4a5..8dda2916e8 100644
--- a/vm_method.c
+++ b/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);
}
}
}