1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2009-12-19 02:07:00 +00:00
parent 93278f2387
commit fad1e8c761
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 19 11:06:48 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/matrix.rb (each2,collect2,map2): Fix enumerator
[ruby-core:27225]
Sat Dec 19 09:58:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 19 09:58:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (check_funcall): reset method_missing_reason before * vm_eval.c (check_funcall): reset method_missing_reason before

6
lib/matrix.rb
View File

@ -1147,7 +1147,7 @@ class Vector
# #
def each2(v) # :yield: e1, e2 def each2(v) # :yield: e1, e2
Vector.Raise ErrDimensionMismatch if size != v.size 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| size.times do |i|
yield @elements[i], v[i] yield @elements[i], v[i]
end end
@ -1159,7 +1159,7 @@ class Vector
# #
def collect2(v) # :yield: e1, e2 def collect2(v) # :yield: e1, e2
Vector.Raise ErrDimensionMismatch if size != v.size 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| (0 ... size).collect do |i|
yield @elements[i], v[i] yield @elements[i], v[i]
end end
@ -1290,7 +1290,7 @@ class Vector
# Like Vector#collect2, but returns a Vector instead of an Array. # Like Vector#collect2, but returns a Vector instead of an Array.
# #
def map2(v, &block) # :yield: e1, e2 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) els = collect2(v, &block)
Vector.elements(els, false) Vector.elements(els, false)
end end