From 2f32af52c4a03ed483690bab660b65a8237abedd Mon Sep 17 00:00:00 2001 From: aamine Date: Tue, 17 Oct 2006 13:03:24 +0000 Subject: [PATCH] * lib/erb.rb: String#each was removed, use #each_line instead. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/erb.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0103156e0e..660ed9f8e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 17 22:03:08 2006 Minero Aoki + + * lib/erb.rb: String#each was removed, use #each_line instead. + Tue Oct 17 08:04:31 2006 Yukihiro Matsumoto * string.c (rb_str_lines): now takes optional argument for the diff --git a/lib/erb.rb b/lib/erb.rb index b714aa1ea6..02c96db83d 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -304,11 +304,11 @@ class ERB def scan(&block) @stag = nil if @percent - @src.each do |line| + @src.each_line do |line| percent_line(line, &block) end else - @src.each do |line| + @src.each_line do |line| @scan_line.call(line, &block) end end @@ -392,7 +392,7 @@ class ERB class SimpleScanner < Scanner # :nodoc: def scan - @src.each do |line| + @src.each_line do |line| line.split(SplitRegexp).each do |token| next if token.empty? yield(token)