1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

time.c: UTC and Z timezones should be utc

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-01-07 06:59:46 +00:00
parent da1f9199bd
commit 4f9ab3a01a
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/ruby/test_time_tz.rb
View File

@ -254,6 +254,12 @@ class TestTimeTZ < Test::Unit::TestCase
} }
end if has_right_tz end if has_right_tz
def test_utc_names
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "UTC"), :utc?)
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "utc"), :utc?)
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "Z"), :utc?)
end
MON2NUM = { MON2NUM = {
"Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6,
"Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12

39
time.c
View File

@ -40,6 +40,7 @@ static ID id_quo, id_div;
static ID id_nanosecond, id_microsecond, id_millisecond, id_nsec, id_usec; static ID id_nanosecond, id_microsecond, id_millisecond, id_nsec, id_usec;
static ID id_local_to_utc, id_utc_to_local, id_find_timezone; static ID id_local_to_utc, id_utc_to_local, id_find_timezone;
static ID id_year, id_mon, id_mday, id_hour, id_min, id_sec, id_isdst, id_name; static ID id_year, id_mon, id_mday, id_hour, id_min, id_sec, id_isdst, id_name;
#define UTC_ZONE Qundef
#ifndef TM_IS_TIME #ifndef TM_IS_TIME
#define TM_IS_TIME 1 #define TM_IS_TIME 1
@ -2061,6 +2062,18 @@ utc_offset_arg(VALUE arg)
return Qnil; return Qnil;
} }
switch (RSTRING_LEN(tmp)) { switch (RSTRING_LEN(tmp)) {
case 1:
if (s[0] == 'Z') {
return UTC_ZONE;
}
else {
goto invalid_utc_offset;
}
case 3:
if (STRNCASECMP("UTC", s, 3) == 0) {
return UTC_ZONE;
}
goto invalid_utc_offset;
case 9: case 9:
if (s[6] != ':') goto invalid_utc_offset; if (s[6] != ':') goto invalid_utc_offset;
if (!ISDIGIT(s[7]) || !ISDIGIT(s[8])) goto invalid_utc_offset; if (!ISDIGIT(s[7]) || !ISDIGIT(s[8])) goto invalid_utc_offset;
@ -2232,6 +2245,7 @@ time_init_1(int argc, VALUE *argv, VALUE time)
{ {
struct vtm vtm; struct vtm vtm;
VALUE zone = Qnil; VALUE zone = Qnil;
VALUE utc = Qnil;
VALUE v[7]; VALUE v[7];
struct time_object *tobj; struct time_object *tobj;
@ -2272,9 +2286,10 @@ time_init_1(int argc, VALUE *argv, VALUE time)
vtm.isdst = 0; vtm.isdst = 0;
else if (maybe_tzobj_p(arg)) else if (maybe_tzobj_p(arg))
zone = arg; zone = arg;
else if (NIL_P(vtm.utc_offset = utc_offset_arg(arg))) else if (!NIL_P(utc = utc_offset_arg(arg)))
if (NIL_P(zone = find_timezone(time, arg))) vtm.utc_offset = utc == UTC_ZONE ? INT2FIX(0) : utc;
invalid_utc_offset(); else if (NIL_P(zone = find_timezone(time, arg)))
invalid_utc_offset();
} }
validate_vtm(&vtm); validate_vtm(&vtm);
@ -2296,6 +2311,14 @@ time_init_1(int argc, VALUE *argv, VALUE time)
} }
} }
if (utc == UTC_ZONE) {
tobj->timew = timegmw(&vtm);
tobj->vtm = vtm;
tobj->tm_got = 1;
TZMODE_SET_UTC(tobj);
return time;
}
tobj->tzmode = TIME_TZMODE_LOCALTIME; tobj->tzmode = TIME_TZMODE_LOCALTIME;
tobj->tm_got=0; tobj->tm_got=0;
tobj->timew = WINT2FIXWV(0); tobj->timew = WINT2FIXWV(0);
@ -2503,6 +2526,10 @@ rb_time_num_new(VALUE timev, VALUE off)
if (!zone_timelocal(zone, time)) invalid_utc_offset(); if (!zone_timelocal(zone, time)) invalid_utc_offset();
return time; return time;
} }
else if (off == UTC_ZONE) {
return time_gmtime(time);
}
validate_utc_offset(off); validate_utc_offset(off);
time_set_utc_offset(time, off); time_set_utc_offset(time, off);
return time; return time;
@ -3738,6 +3765,9 @@ time_zonelocal(VALUE time, VALUE off)
if (!zone_localtime(zone, time)) invalid_utc_offset(); if (!zone_localtime(zone, time)) invalid_utc_offset();
return time; return time;
} }
else if (off == UTC_ZONE) {
return time_gmtime(time);
}
validate_utc_offset(off); validate_utc_offset(off);
time_set_utc_offset(time, off); time_set_utc_offset(time, off);
@ -3901,6 +3931,9 @@ time_getlocaltime(int argc, VALUE *argv, VALUE time)
if (!zone_localtime(zone, time)) invalid_utc_offset(); if (!zone_localtime(zone, time)) invalid_utc_offset();
return time; return time;
} }
else if (off == UTC_ZONE) {
return time_gmtime(time_dup(time));
}
validate_utc_offset(off); validate_utc_offset(off);
time = time_dup(time); time = time_dup(time);