naruse	2015-01-19 11:45:40 +0900 (Mon, 19 Jan 2015)

  New Revision: 49327

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

  Log:
    merge revision(s) 49223: [Backport #10732]
    
    * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
      CR.  should check if substitution occurred too.
      [ruby-dev:48813] [Bug #10732]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/rdoc/text.rb
    branches/ruby_2_2/test/rdoc/test_rdoc_text.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49326)
+++ ruby_2_2/ChangeLog	(revision 49327)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Jan 19 11:44:52 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
+	  CR.  should check if substitution occurred too.
+	  [ruby-dev:48813] [Bug #10732]
+
 Sun Jan 18 00:59:41 2015  Eric Wong  <e@8...>
 
 	* numeric.c (bit_coerce): use original value for error message
Index: ruby_2_2/lib/rdoc/text.rb
===================================================================
--- ruby_2_2/lib/rdoc/text.rb	(revision 49326)
+++ ruby_2_2/lib/rdoc/text.rb	(revision 49327)
@@ -68,11 +68,11 @@ module RDoc::Text https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/rdoc/text.rb#L68
     expanded = []
 
     text.each_line do |line|
-      line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
+      nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
         r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
         r.force_encoding text.encoding if Object.const_defined? :Encoding
         r
-      end until line !~ /\t/
+      end
 
       expanded << line
     end
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49326)
+++ ruby_2_2/version.h	(revision 49327)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-01-18"
-#define RUBY_PATCHLEVEL 27
+#define RUBY_RELEASE_DATE "2015-01-19"
+#define RUBY_PATCHLEVEL 28
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/rdoc/test_rdoc_text.rb
===================================================================
--- ruby_2_2/test/rdoc/test_rdoc_text.rb	(revision 49326)
+++ ruby_2_2/test/rdoc/test_rdoc_text.rb	(revision 49327)
@@ -56,6 +56,9 @@ class TestRDocText < RDoc::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/rdoc/test_rdoc_text.rb#L56
 
     assert_equal('.               .',
                  expand_tabs(".\t\t."), 'dot tab tab dot')
+
+    assert_equal('a       a',
+                 Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
   end
 
   def test_expand_tabs_encoding

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49223


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