ruby-changes:12582
From: yugui <ko1@a...>
Date: Mon, 27 Jul 2009 00:33:03 +0900 (JST)
Subject: [ruby-changes:12582] Ruby:r24291 (ruby_1_9_1): merges r24211 from trunk into ruby_1_9_1.
yugui 2009-07-27 00:32:44 +0900 (Mon, 27 Jul 2009) New Revision: 24291 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24291 Log: 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] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/lib/matrix.rb branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 24290) +++ ruby_1_9_1/ChangeLog (revision 24291) @@ -1,3 +1,8 @@ +Mon Jul 20 12:51:39 2009 wanabe <s.wanabe@g...> + + * 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@r...> * io.c (io_read): should taint the result. [ruby-dev:38826] Index: ruby_1_9_1/lib/matrix.rb =================================================================== --- ruby_1_9_1/lib/matrix.rb (revision 24290) +++ ruby_1_9_1/lib/matrix.rb (revision 24291) @@ -771,7 +771,7 @@ end rank = 0 k = 0 - loop do + begin if (akk = a[k][k]) == 0 i = k exists = true @@ -813,8 +813,7 @@ end end rank += 1 - break unless (k += 1) <= a_column_size - 1 - end + end while (k += 1) <= a_column_size - 1 return rank end Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 24290) +++ ruby_1_9_1/version.h (revision 24291) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/