[前][次][番号順一覧][スレッド一覧]

ruby-changes:4675

From: ko1@a...
Date: Wed, 23 Apr 2008 11:59:09 +0900 (JST)
Subject: [ruby-changes:4675] knu - Ruby:r16169 (trunk): * lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return

knu	2008-04-23 11:58:46 +0900 (Wed, 23 Apr 2008)

  New Revision: 16169

  Modified files:
    trunk/ChangeLog
    trunk/lib/set.rb

  Log:
    * lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
      an enumerator if no block is given.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16169&r2=16168&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/set.rb?r1=16169&r2=16168&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16168)
+++ ChangeLog	(revision 16169)
@@ -1,3 +1,8 @@
+Wed Apr 23 11:49:54 2008  Akinori MUSHA  <knu@i...>
+
+	* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
+	  an enumerator if no block is given.
+
 Wed Apr 23 00:36:03 2008  Yusuke Endoh  <mame@t...>
 
 	* test/openssl/test_ssl.rb (start_server): add timeout to server.join.
Index: lib/set.rb
===================================================================
--- lib/set.rb	(revision 16168)
+++ lib/set.rb	(revision 16169)
@@ -2,7 +2,7 @@
 #--
 # set.rb - defines the Set class
 #++
-# Copyright (c) 2002 Akinori MUSHA <knu@i...>
+# Copyright (c) 2002-2008 Akinori MUSHA <knu@i...>
 #
 # Documentation by Akinori MUSHA and Gavin Sinclair. 
 #
@@ -204,8 +204,10 @@
   end
 
   # Calls the given block once for each element in the set, passing
-  # the element as parameter.
+  # the element as parameter.  Returns an enumerator if no block is
+  # given.
   def each
+    block_given? or return enum_for(__method__)
     @hash.each_key { |o| yield(o) }
     self
   end
@@ -511,6 +513,7 @@
 	  end
 
 	  def each
+	    block_given? or return enum_for(__method__)
 	    to_a.each { |o| yield(o) }
 	  end
 
@@ -925,9 +928,8 @@
     ary = [1,3,5,7,10,20]
     set = Set.new(ary)
 
-    assert_raises(LocalJumpError) {
-      set.each
-    }
+    e = set.each
+    assert_instance_of(Enumerable::Enumerator, e)
 
     assert_nothing_raised {
       set.each { |o|

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

[前][次][番号順一覧][スレッド一覧]