Skip to content

Fix Time#to_datetime before calendar reform #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobu merged 1 commit into from
Aug 8, 2022
Merged

Fix Time#to_datetime before calendar reform #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ext/date/date_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8811,7 +8811,7 @@ time_to_datetime(VALUE self)
ret = d_complex_new_internal(cDateTime,
nth, 0,
0, sf,
of, DEFAULT_SG,
of, GREGORIAN,
ry, m, d,
h, min, s,
HAVE_CIVIL | HAVE_TIME);
Expand Down Expand Up @@ -8915,12 +8915,17 @@ date_to_datetime(VALUE self)
static VALUE
datetime_to_time(VALUE self)
{
volatile VALUE dup = dup_obj(self);
get_d1(self);

if (m_julian_p(dat)) {
self = d_lite_gregorian(self);
get_d1a(self);
dat = adat;
}

{
VALUE t;

get_d1(dup);

t = rb_funcall(rb_cTime,
rb_intern("new"),
7,
Expand Down
17 changes: 17 additions & 0 deletions test/date/test_date_conv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ def test_to_time__from_datetime
assert_equal([2004, 9, 19, 1, 2, 3, 456789],
[t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])

d = DateTime.new(1582, 10, 3, 1, 2, 3, 0) + 456789.to_r/86400000000
t = d.to_time.utc
assert_equal([1582, 10, 13, 1, 2, 3, 456789],
[t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.usec])

if Time.allocate.respond_to?(:nsec)
d = DateTime.new(2004, 9, 19, 1, 2, 3, 0) + 456789123.to_r/86400000000000
t = d.to_time.utc
Expand All @@ -100,6 +105,10 @@ def test_to_date__from_time
t = Time.utc(2004, 9, 19, 1, 2, 3, 456789)
d = t.to_date
assert_equal([2004, 9, 19, 0], [d.year, d.mon, d.mday, d.day_fraction])

t = Time.utc(1582, 10, 13, 1, 2, 3, 456789)
d = t.to_date # using ITALY
assert_equal([1582, 10, 3, 0], [d.year, d.mon, d.mday, d.day_fraction])
end

def test_to_date__from_date
Expand Down Expand Up @@ -136,6 +145,14 @@ def test_to_datetime__from_time
[d.year, d.mon, d.mday, d.hour, d.min, d.sec,
d.sec_fraction, d.offset])

t = Time.utc(1582, 10, 13, 1, 2, 3, 456789)
d = t.to_datetime # using ITALY
assert_equal([1582, 10, 3, 1, 2, 3,
456789.to_r/1000000,
0],
[d.year, d.mon, d.mday, d.hour, d.min, d.sec,
d.sec_fraction, d.offset])

t = Time.now
d = t.to_datetime
require 'time'
Expand Down