aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-08 07:49:02 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-08 07:49:02 +0000
commit7510ffea98e284ed93f981f6e0f2aef86630bded (patch)
tree05efd9d9f34982a5ddd24c05751901d944ee8ac1
parent2ca4478b319b4232df856bb0fff5625477b6548d (diff)
downloadruby-7510ffea98e284ed93f981f6e0f2aef86630bded.tar.gz
* eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
Module.used_modules. [Feature #7418] [ruby-core:49805] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c18
-rw-r--r--test/ruby/test_refinement.rb16
3 files changed, 22 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d4cd4a..f89dfc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 8 16:47:03 2016 Shugo Maeda <shugo@ruby-lang.org>
+
+ * eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
+ Module.used_modules. [Feature #7418] [ruby-core:49805]
+
Thu Sep 8 14:21:48 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/psych/psych.gemspec, lib/rdoc/rdoc.gemspec: Use file list instead of
diff --git a/eval.c b/eval.c
index b660957..bad3c83 100644
--- a/eval.c
+++ b/eval.c
@@ -1312,7 +1312,7 @@ mod_using(VALUE self, VALUE module)
}
static int
-used_refinements_i(VALUE _, VALUE mod, VALUE ary)
+used_modules_i(VALUE _, VALUE mod, VALUE ary)
{
ID id_defined_at;
CONST_ID(id_defined_at, "__defined_at__");
@@ -1325,10 +1325,10 @@ used_refinements_i(VALUE _, VALUE mod, VALUE ary)
/*
* call-seq:
- * used_refinements -> array
+ * used_modules -> array
*
- * Returns an array of all active refinements in the current scope. The
- * ordering of modules in the resulting array is not defined.
+ * Returns an array of all modules used in the current scope. The ordering
+ * of modules in the resulting array is not defined.
*
* module A
* refine Object do
@@ -1342,21 +1342,21 @@ used_refinements_i(VALUE _, VALUE mod, VALUE ary)
*
* using A
* using B
- * p Module.used_refinements
+ * p Module.used_modules
*
* <em>produces:</em>
*
* [B, A]
*/
static VALUE
-rb_mod_s_used_refinements(void)
+rb_mod_s_used_modules(void)
{
const rb_cref_t *cref = rb_vm_cref();
VALUE ary = rb_ary_new();
while(cref) {
if(!NIL_P(CREF_REFINEMENTS(cref))) {
- rb_hash_foreach(CREF_REFINEMENTS(cref), used_refinements_i, ary);
+ rb_hash_foreach(CREF_REFINEMENTS(cref), used_modules_i, ary);
}
cref = CREF_NEXT(cref);
}
@@ -1698,8 +1698,8 @@ Init_eval(void)
rb_define_private_method(rb_cModule, "prepend_features", rb_mod_prepend_features, 1);
rb_define_private_method(rb_cModule, "refine", rb_mod_refine, 1);
rb_define_private_method(rb_cModule, "using", mod_using, 1);
- rb_define_singleton_method(rb_cModule, "used_refinements",
- rb_mod_s_used_refinements, 0);
+ rb_define_singleton_method(rb_cModule, "used_modules",
+ rb_mod_s_used_modules, 0);
rb_undef_method(rb_cClass, "refine");
rb_undef_method(rb_cClass, "module_function");
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 5980280..c3c2dbc 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -1651,27 +1651,27 @@ class TestRefinement < Test::Unit::TestCase
module Foo
using RefB
- USED_REFS = Module.used_refinements
+ USED_MODS = Module.used_modules
end
module Bar
using RefC
- USED_REFS = Module.used_refinements
+ USED_MODS = Module.used_modules
end
module Combined
using RefA
using RefB
- USED_REFS = Module.used_refinements
+ USED_MODS = Module.used_modules
end
end
- def test_used_refinements
+ def test_used_modules
ref = VisibleRefinements
- assert_equal [], Module.used_refinements
- assert_equal [ref::RefB], ref::Foo::USED_REFS
- assert_equal [ref::RefC], ref::Bar::USED_REFS
- assert_equal [ref::RefB, ref::RefA], ref::Combined::USED_REFS
+ assert_equal [], Module.used_modules
+ assert_equal [ref::RefB], ref::Foo::USED_MODS
+ assert_equal [ref::RefC], ref::Bar::USED_MODS
+ assert_equal [ref::RefB, ref::RefA], ref::Combined::USED_MODS
end
def test_warn_setconst_in_refinmenet