diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-14 14:22:11 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-14 14:22:11 +0000 |
commit | 6e918be6b182ac121412bdd53c78ec1b54b14593 (patch) | |
tree | ec2f7c5a884c4f259f7b4971e9ce5664952d35aa /lib/date.rb | |
parent | 91c9ac216a7db83890e5e6ff7e90d50ce9fd1e35 (diff) |
* gc.c, parse.y, lib/cgi.rb, lib/date.rb: last minute backports from HEAD.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/date.rb')
-rw-r--r-- | lib/date.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/date.rb b/lib/date.rb index b50e987852..b8c15a420a 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -711,7 +711,13 @@ class Date alias_method :__#{id.to_i}__, :#{id.to_s} private :__#{id.to_i}__ def #{id.to_s}(*args, &block) - (@__#{id.to_i}__ ||= [__#{id.to_i}__(*args, &block)])[0] + if @__#{id.to_i}__ + @__#{id.to_i}__ + elsif ! self.frozen? + @__#{id.to_i}__ ||= __#{id.to_i}__(*args, &block) + else + __#{id.to_i}__(*args, &block) + end end end; end |