From b0eda56826dad0875670ec31cb9ad73ff61a9f5d Mon Sep 17 00:00:00 2001 From: marcandre Date: Fri, 18 Jul 2014 10:04:15 +0000 Subject: * lib/matrix.rb: Avoid using `and`. Patch by gogo tanaka [#10058] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46862 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/matrix.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ade026e8d6..6ff0871e1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 18 19:03:53 2014 Marc-Andre Lafortune + + * lib/matrix.rb: Avoid using `and`. + Patch by gogo tanaka [#10058] + Fri Jul 18 17:41:54 2014 GoGo tanaka * test/matrix/test_matrix.rb: Add tests for Matrix class. diff --git a/lib/matrix.rb b/lib/matrix.rb index 026492b6b8..76bec9228b 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -894,7 +894,7 @@ class Matrix return apply_through_coercion(m, __method__) end - Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count + Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count rows = Array.new(row_count) {|i| Array.new(column_count) {|j| @@ -921,7 +921,7 @@ class Matrix return apply_through_coercion(m, __method__) end - Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count and column_count == m.column_count + Matrix.Raise ErrDimensionMismatch unless row_count == m.row_count && column_count == m.column_count rows = Array.new(row_count) {|i| Array.new(column_count) {|j| -- cgit v1.2.3