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

ruby-changes:14299

From: marcandre <ko1@a...>
Date: Sat, 19 Dec 2009 11:07:15 +0900 (JST)
Subject: [ruby-changes:14299] Ruby:r26125 (trunk): * lib/matrix.rb (each2,collect2,map2): Fix enumerator

marcandre	2009-12-19 11:07:00 +0900 (Sat, 19 Dec 2009)

  New Revision: 26125

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26125

  Log:
    * lib/matrix.rb (each2,collect2,map2): Fix enumerator [ruby-core:27225]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26124)
+++ ChangeLog	(revision 26125)
@@ -1,3 +1,8 @@
+Sat Dec 19 11:06:48 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/matrix.rb (each2,collect2,map2): Fix enumerator
+	  [ruby-core:27225]
+
 Sat Dec 19 09:58:05 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_eval.c (check_funcall): reset method_missing_reason before
Index: lib/matrix.rb
===================================================================
--- lib/matrix.rb	(revision 26124)
+++ lib/matrix.rb	(revision 26125)
@@ -1147,7 +1147,7 @@
   #
   def each2(v) # :yield: e1, e2
     Vector.Raise ErrDimensionMismatch if size != v.size
-    return to_enum(:each2) unless block_given?
+    return to_enum(:each2, v) unless block_given?
     size.times do |i|
       yield @elements[i], v[i]
     end
@@ -1159,7 +1159,7 @@
   #
   def collect2(v) # :yield: e1, e2
     Vector.Raise ErrDimensionMismatch if size != v.size
-    return to_enum(:collect2) unless block_given?
+    return to_enum(:collect2, v) unless block_given?
     (0 ... size).collect do |i|
       yield @elements[i], v[i]
     end
@@ -1290,7 +1290,7 @@
   # Like Vector#collect2, but returns a Vector instead of an Array.
   #
   def map2(v, &block) # :yield: e1, e2
-    return to_enum(:map2) unless block_given?
+    return to_enum(:map2, v) unless block_given?
     els = collect2(v, &block)
     Vector.elements(els, false)
   end

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

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