shugo	2016-09-08 16:49:02 +0900 (Thu, 08 Sep 2016)

  New Revision: 56109

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56109

  Log:
    * eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
      Module.used_modules.  [Feature #7418] [ruby-core:49805]

  Modified files:
    trunk/ChangeLog
    trunk/eval.c
    trunk/test/ruby/test_refinement.rb
Index: test/ruby/test_refinement.rb
===================================================================
--- test/ruby/test_refinement.rb	(revision 56108)
+++ test/ruby/test_refinement.rb	(revision 56109)
@@ -1651,27 +1651,27 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/test/ruby/test_refinement.rb#L1651
 
     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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 56108)
+++ ChangeLog	(revision 56109)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Sep  8 16:47:03 2016  Shugo Maeda  <shugo@r...>
+
+	* 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@r...>
 
 	* ext/psych/psych.gemspec, lib/rdoc/rdoc.gemspec: Use file list instead of
Index: eval.c
===================================================================
--- eval.c	(revision 56108)
+++ eval.c	(revision 56109)
@@ -1312,7 +1312,7 @@ mod_using(VALUE self, VALUE module) https://github.com/ruby/ruby/blob/trunk/eval.c#L1312
 }
 
 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, V https://github.com/ruby/ruby/blob/trunk/eval.c#L1325
 
 /*
  *  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, V https://github.com/ruby/ruby/blob/trunk/eval.c#L1342
  *
  *     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) https://github.com/ruby/ruby/blob/trunk/eval.c#L1698
     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");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/