diff --git a/ChangeLog b/ChangeLog index 18c900f469..bd60a6d531 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 8 00:09:13 2008 Tadayoshi Funaba + + * lib/date.rb (today,now): should produce own instances. + [ruby-talk:317020] + Mon Oct 6 15:26:19 2008 Nobuyoshi Nakada * gc.c (gc_mark_children): ignores T_ZOMBIE. diff --git a/lib/date.rb b/lib/date.rb index 90a4a01ca3..19991d60b4 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1660,12 +1660,23 @@ class Date # Create a new Date object representing today. # # +sg+ specifies the Day of Calendar Reform. - def self.today(sg=ITALY) Time.now.__send__(:to_date) .new_start(sg) end + def self.today(sg=ITALY) + t = Time.now + jd = civil_to_jd(t.year, t.mon, t.mday, sg) + new!(jd_to_ajd(jd, 0, 0), 0, sg) + end # Create a new DateTime object representing the current time. # # +sg+ specifies the Day of Calendar Reform. - def self.now (sg=ITALY) Time.now.__send__(:to_datetime).new_start(sg) end + def self.now(sg=ITALY) + t = Time.now + jd = civil_to_jd(t.year, t.mon, t.mday, sg) + fr = time_to_day_fraction(t.hour, t.min, [t.sec, 59].min) + + Rational(t.usec, 86400_000_000) + of = Rational(t.utc_offset, 86400) + new!(jd_to_ajd(jd, fr, of), of, sg) + end private_class_method :now