From 6b3733ed8ad36a8a396b8966b3871ceafede525e Mon Sep 17 00:00:00 2001 From: knu Date: Thu, 14 Aug 2008 03:44:49 +0000 Subject: [PATCH] * enumerator.c (Init_Enumerator): Define ::Enumerator as alias for Enumerable::Enumerator for forward compatibility. * lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use enum_for instead of hardcoding Enumerable::Enumerator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ enumerator.c | 1 + lib/rinda/tuplespace.rb | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9bf394cc4c..16993513d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Aug 14 12:43:09 2008 Akinori MUSHA + + * enumerator.c (Init_Enumerator): Define ::Enumerator as alias for + Enumerable::Enumerator for forward compatibility. + + * lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use + enum_for instead of hardcoding Enumerable::Enumerator. + Wed Aug 13 18:18:16 2008 Akinori MUSHA * hash.c (rb_hash_set_default_proc): Add Hash#default_proc=; diff --git a/enumerator.c b/enumerator.c index f95d931b62..b311ed6af3 100644 --- a/enumerator.c +++ b/enumerator.c @@ -432,6 +432,7 @@ Init_Enumerator() rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "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); diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index b0409dde3b..6ca30a7b4b 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -315,7 +315,7 @@ module Rinda def initialize # :nodoc: @hash = {} - @enum = Enumerable::Enumerator.new(self, :each_entry) + @enum = enum_for(:each_entry) end ##