* lib/date.rb (once): Use Object#object_id instead of Symbol#to_i;

  backported from trunk besides the caching.

* lib/erb.rb (ERB::Compiler::TrimScanner#scan): Use
  String#each_line instead of String#each.

* rubytest.rb: Ditto.


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

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/date.rb b/lib/date.rb
index 19991d60b4..4323c6f2f6 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1005,10 +1005,10 @@ class Date
     def once(*ids) # :nodoc:
       for id in ids
 	module_eval <<-"end;"
-	  alias_method :__#{id.to_i}__, :#{id.to_s}
-	  private :__#{id.to_i}__
+	  alias_method :__#{id.object_id}__, :#{id.to_s}
+	  private :__#{id.object_id}__
 	  def #{id.to_s}(*args, &block)
-	    (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0]
+	    (@__#{id.object_id}__ ||= [__#{id.object_id}__(*args, &block)])[0]
 	  end
 	end;
       end
diff --git a/lib/erb.rb b/lib/erb.rb
index f1661f98cb..1f6e9781c3 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -304,7 +304,7 @@ class ERB
       def scan(&block)
 	@stag = nil
 	if @percent
-	  @src.each do |line|
+	  @src.each_line do |line|
 	    percent_line(line, &block)
 	  end
 	else