* enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to

  just Enumerator and redefine the former as an alias for backward
  compatibility.

* lib/set.rb (TC_Set#test_each),
  test/ruby/test_enumerator.rb (TestEnumerator#test_initialize):
  Enumerable::Enumerator is now called Enumerator.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 23 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 80a2a095da..2ce36c77b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Aug 19 20:32:48 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enumerator.c (Init_Enumerator): Rename Enumerable::Enumerator to
+	  just Enumerator and redefine the former as an alias for backward
+	  compatibility.
+
+	* lib/set.rb (TC_Set#test_each),
+	  test/ruby/test_enumerator.rb (TestEnumerator#test_initialize):
+	  Enumerable::Enumerator is now called Enumerator.
+
 Mon Aug 18 02:25:11 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#eof?): added lacked method.
diff --git a/enumerator.c b/enumerator.c
index b311ed6af3..78556d6148 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -15,7 +15,7 @@
 #include "ruby.h"
 
 /*
- * Document-class: Enumerable::Enumerator
+ * Document-class: Enumerator
  *
  * A class which provides a method `each' to be used as an Enumerable
  * object.
@@ -66,7 +66,7 @@ enumerator_ptr(obj)
  *    obj.to_enum(method = :each, *args)
  *    obj.enum_for(method = :each, *args)
  *
- *  Returns Enumerable::Enumerator.new(self, method, *args).
+ *  Returns Enumerator.new(self, method, *args).
  *
  *  e.g.:
  *
@@ -258,11 +258,11 @@ enumerator_init(enum_obj, obj, meth, argc, argv)
 
 /*
  *  call-seq:
- *    Enumerable::Enumerator.new(obj, method = :each, *args)
+ *    Enumerator.new(obj, method = :each, *args)
  *
- *  Creates a new Enumerable::Enumerator object, which is to be
- *  used as an Enumerable object using the given object's given
- *  method with the given arguments.
+ *  Creates a new Enumerator object, which is to be used as an
+ *  Enumerable object using the given object's given method with the
+ *  given arguments.
  *
  *  Use of this method is discouraged.  Use Kernel#enum_for() instead.
  */
@@ -430,9 +430,8 @@ Init_Enumerator()
     rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
     rb_define_method(rb_mEnumerable, "enum_cons", enum_each_cons, 1);
 
-    rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
+    rb_cEnumerator = rb_define_class("Enumerator", rb_cObject);
     rb_include_module(rb_cEnumerator, rb_mEnumerable);
-    rb_define_global_const("Enumerator", rb_cEnumerator);
 
     rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
     rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
@@ -447,5 +446,7 @@ Init_Enumerator()
 
     sym_each	 	= ID2SYM(rb_intern("each"));
 
-    rb_provide("enumerator.so");	/* for backward compatibility */
+    /* backward compatibility */
+    rb_provide("enumerator.so");
+    rb_define_const(rb_mEnumerable, "Enumerator", rb_cEnumerator);
 }
diff --git a/lib/set.rb b/lib/set.rb
index a8984c4291..c110001d66 100644
--- a/lib/set.rb
+++ b/lib/set.rb
@@ -934,7 +934,7 @@ class TC_Set < Test::Unit::TestCase
     assert_same(set, ret)
 
     e = set.each
-    assert_instance_of(Enumerable::Enumerator, e)
+    assert_instance_of(Enumerator, e)
 
     assert_nothing_raised {
       set.each { |o|
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb
index 2625791129..152390cab2 100644
--- a/test/ruby/test_enumerator.rb
+++ b/test/ruby/test_enumerator.rb
@@ -57,8 +57,8 @@ class TestEnumerator < Test::Unit::TestCase
 
   def test_initialize
     assert_equal([1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).to_a)
-    assert_equal([1, 2, 3], Enumerable::Enumerator.new(@obj, :foo, 1, 2, 3).to_a)
-    assert_raise(ArgumentError) { Enumerable::Enumerator.new }
+    assert_equal([1, 2, 3], Enumerator.new(@obj, :foo, 1, 2, 3).to_a)
+    assert_raise(ArgumentError) { Enumerator.new }
   end
 
   def test_initialize_copy