From 959022a6762e8266274766332bafdf948bc84ab3 Mon Sep 17 00:00:00 2001 From: marcandre Date: Sat, 19 Dec 2009 02:07:00 +0000 Subject: * lib/matrix.rb (each2,collect2,map2): Fix enumerator [ruby-core:27225] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/matrix.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8245005bf..ecf17f29f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 19 11:06:48 2009 Marc-Andre Lafortune + + * lib/matrix.rb (each2,collect2,map2): Fix enumerator + [ruby-core:27225] + Sat Dec 19 09:58:05 2009 Nobuyoshi Nakada * vm_eval.c (check_funcall): reset method_missing_reason before diff --git a/lib/matrix.rb b/lib/matrix.rb index 3c75751e3..e0095e929 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -1147,7 +1147,7 @@ class Vector # 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 @@ class Vector # 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 @@ class Vector # 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 -- cgit