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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 974d4aa5f9..48c2c856d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 20 12:51:39 2009  wanabe  <s.wanabe@gmail.com>
+
+	* lib/matrix.rb (Matrix#rank): revert a part of r20859 to avoid
+	  infinite loop.  [Bug #1020]
+
 Sun Jul 19 17:32:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (io_read): should taint the result.   [ruby-dev:38826]
diff --git a/lib/matrix.rb b/lib/matrix.rb
index ec03c730fa..c948836fa7 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
 
diff --git a/version.h b/version.h
index 59540f3536..afb8dfe455 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 248
+#define RUBY_PATCHLEVEL 249
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1