ruby-changes:9312
From: knu <ko1@a...>
Date: Wed, 17 Dec 2008 20:07:46 +0900 (JST)
Subject: [ruby-changes:9312] Ruby:r20850 (ruby_1_8): * lib/date.rb (once): Use Object#object_id instead of Symbol#to_i;
knu 2008-12-17 20:07:32 +0900 (Wed, 17 Dec 2008) New Revision: 20850 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20850 Log: * 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. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/lib/date.rb branches/ruby_1_8/lib/erb.rb branches/ruby_1_8/rubytest.rb Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 20849) +++ ruby_1_8/ChangeLog (revision 20850) @@ -1,3 +1,13 @@ +Wed Dec 17 20:06:32 2008 Akinori MUSHA <knu@i...> + + * 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. + Wed Dec 17 19:53:48 2008 Akinori MUSHA <knu@i...> * object.c (rb_any_to_a): Always use "... is deprecated" for a Index: ruby_1_8/lib/erb.rb =================================================================== --- ruby_1_8/lib/erb.rb (revision 20849) +++ ruby_1_8/lib/erb.rb (revision 20850) @@ -304,7 +304,7 @@ def scan(&block) @stag = nil if @percent - @src.each do |line| + @src.each_line do |line| percent_line(line, &block) end else Index: ruby_1_8/lib/date.rb =================================================================== --- ruby_1_8/lib/date.rb (revision 20849) +++ ruby_1_8/lib/date.rb (revision 20850) @@ -1005,10 +1005,10 @@ 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 Index: ruby_1_8/rubytest.rb =================================================================== --- ruby_1_8/rubytest.rb (revision 20849) +++ ruby_1_8/rubytest.rb (revision 20850) @@ -37,7 +37,7 @@ error = '' srcdir = File.dirname(__FILE__) -`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each do |line| +`#{ruby} -I#{srcdir}/lib #{srcdir}/sample/test.rb`.each_line do |line| if line =~ /^end of test/ print "test succeeded\n" exit 0 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/