marcandre	2014-07-18 19:04:15 +0900 (Fri, 18 Jul 2014)

  New Revision: 46862

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

  Log:
    * lib/matrix.rb: Avoid using `and`.
      Patch by gogo tanaka [#10058]

  Modified files:
    trunk/ChangeLog
    trunk/lib/matrix.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 46861)
+++ ChangeLog	(revision 46862)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jul 18 19:03:53 2014  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/matrix.rb: Avoid using `and`.
+	  Patch by gogo tanaka [#10058]
+
 Fri Jul 18 17:41:54 2014  GoGo tanaka  <qlli.illb@g...>
 
 	* test/matrix/test_matrix.rb: Add tests for Matrix class.
Index: lib/matrix.rb
===================================================================
--- lib/matrix.rb	(revision 46861)
+++ lib/matrix.rb	(revision 46862)
@@ -894,7 +894,7 @@ class Matrix https://github.com/ruby/ruby/blob/trunk/lib/matrix.rb#L894
       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 https://github.com/ruby/ruby/blob/trunk/lib/matrix.rb#L921
       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|

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