merges r24211 from trunk into ruby_1_9_1.

--
* lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
  infinite loop.  [Bug #1020]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/matrix.rb b/lib/matrix.rb
index ec03c730f..c948836fa 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -771,7 +771,7 @@ class Matrix
     end
     rank = 0
     k = 0
-    loop do
+    begin
       if (akk = a[k][k]) == 0
         i = k
         exists = true
@@ -813,8 +813,7 @@ class Matrix
         end
       end
       rank += 1
-      break unless (k += 1) <= a_column_size - 1
-    end
+    end while (k += 1) <= a_column_size - 1
     return rank
   end