summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-17 13:03:24 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-10-17 13:03:24 +0000
commit2f32af52c4a03ed483690bab660b65a8237abedd (patch)
treec27020ddd60aa3612cd36fdb28c6bdca20b5e0f7
parent1fe4c7af5bedf6d517a11bc3c21cbb7cb16d3865 (diff)
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/erb.rb6
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 <aamine@loveruby.net>
+
+ * lib/erb.rb: String#each was removed, use #each_line instead.
+
Tue Oct 17 08:04:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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)