diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-21 08:33:05 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-21 08:33:05 +0000 |
| commit | 3c118f0f0453cf37609a36c58ece5c47671528af (patch) | |
| tree | 40ae632aaca22bdf352ac91343c946f12fa63c31 | |
| parent | d1a70bebcf8df159f71ca94e88dd8b50932a91d6 (diff) | |
* enumerator.c (enumerator_ptr), lib/generator.rb:
Enumerable::Enumerator is renamed to Enumerator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enumerator.c | 2 | ||||
| -rw-r--r-- | lib/generator.rb | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Aug 21 17:30:32 2008 Akinori MUSHA <knu@iDaemons.org> + + * enumerator.c (enumerator_ptr), lib/generator.rb: + Enumerable::Enumerator is renamed to Enumerator. + Thu Aug 21 06:12:56 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept diff --git a/enumerator.c b/enumerator.c index 78556d6148..c094a99be5 100644 --- a/enumerator.c +++ b/enumerator.c @@ -52,7 +52,7 @@ enumerator_ptr(obj) Data_Get_Struct(obj, struct enumerator, ptr); if (RDATA(obj)->dmark != enumerator_mark) { rb_raise(rb_eTypeError, - "wrong argument type %s (expected Enumerable::Enumerator)", + "wrong argument type %s (expected Enumerator)", rb_obj_classname(obj)); } if (!ptr || ptr->obj == Qundef) { diff --git a/lib/generator.rb b/lib/generator.rb index dbdd0f40a9..5c8a50ac2e 100644 --- a/lib/generator.rb +++ b/lib/generator.rb @@ -165,7 +165,7 @@ class Generator end end -class Enumerable::Enumerator +class Enumerator def __generator @generator ||= Generator.new(self) end |