merge revision(s) 58825,58826: [Backport #5339]

	erb.rb: Allow explicit trimming carriage return

	when trim_mode is "-", for Windows environments.

	[ruby-core:39625] [Bug #5339]
	erb.rb: Allow trimming CR in all trim_modes

	to unify a behavior with r58823 and r58825.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 25 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 066878b8b8..e469b6bc9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Jun 30 20:23:31 2017  Takashi Kokubun  <takashikkbn@gmail.com>
+
+	* lib/erb.rb: Allow explicit trimming carriage return when trim_mode is
+	  "-", for Windows environments. [Bug #5339]
+
+	* lib/erb.rb: Allow trimming CR in all trim_modes to unify a behavior
+	  with r58823 and r58825.
+
 Fri Jun 30 20:16:15 2017  Takashi Kokubun  <takashikkbn@gmail.com>
 
 	* lib/erb.rb: Allow trimming carriage return when trim_mode is "<>", for
diff --git a/lib/erb.rb b/lib/erb.rb
index 5f36a8dd11..e89d9c1fd0 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -429,10 +429,10 @@ class ERB
       end
 
       def trim_line1(line)
-        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\n|%>|\n|\z)/m) do |tokens|
+        line.scan(/(.*?)(<%%|%%>|<%=|<%#|<%|%>\r?\n|%>|\n|\z)/m) do |tokens|
           tokens.each do |token|
             next if token.empty?
-            if token == "%>\n"
+            if token == "%>\n" || token == "%>\r\n"
               yield('%>')
               yield(:cr)
             else
@@ -465,12 +465,12 @@ class ERB
       end
 
       def explicit_trim_line(line)
-        line.scan(/(.*?)(^[ \t]*<%\-|<%\-|<%%|%%>|<%=|<%#|<%|-%>\n|-%>|%>|\z)/m) do |tokens|
+        line.scan(/(.*?)(^[ \t]*<%\-|<%\-|<%%|%%>|<%=|<%#|<%|-%>\r?\n|-%>|%>|\z)/m) do |tokens|
           tokens.each do |token|
             next if token.empty?
             if @stag.nil? && /[ \t]*<%-/ =~ token
               yield('<%')
-            elsif @stag && token == "-%>\n"
+            elsif @stag && token == "-%>\n" || token == "-%>\r\n"
               yield('%>')
               yield(:cr)
             elsif @stag && token == '-%>'
@@ -533,7 +533,7 @@ class ERB
               yield('<%')
             elsif elem == '-%>'
               yield('%>')
-              yield(:cr) if scanner.scan(/(\n|\z)/)
+              yield(:cr) if scanner.scan(/(\r?\n|\z)/)
             else
               yield(elem)
             end
diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 3cdee60420..e40fb6b59a 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -200,6 +200,17 @@ EOS
   def test_trim_line2_with_carriage_return
     erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '<>')
     assert_equal("line\r\n" * 3, erb.result)
+
+    erb = @erb.new("<% 3.times do %>\r\nline\r\n<% end %>\r\n", nil, '%<>')
+    assert_equal("line\r\n" * 3, erb.result)
+  end
+
+  def test_explicit_trim_line_with_carriage_return
+    erb = @erb.new("<%- 3.times do -%>\r\nline\r\n<%- end -%>\r\n", nil, '-')
+    assert_equal("line\r\n" * 3, erb.result)
+
+    erb = @erb.new("<%- 3.times do -%>\r\nline\r\n<%- end -%>\r\n", nil, '%-')
+    assert_equal("line\r\n" * 3, erb.result)
   end
 
   class Foo; end
diff --git a/version.h b/version.h
index 1bd3ecd3f8..540a039cf5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 322
+#define RUBY_PATCHLEVEL 323
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6