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

Load as FIXOFF mode if zone is present

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-10-12 02:25:38 +00:00
parent 093398f979
commit 75ac8e866b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/ruby/test_time_tz.rb
View File

@ -546,6 +546,7 @@ module TestTimeTZ::WithTZ
t2 = Marshal.load(Marshal.dump(t)) t2 = Marshal.load(Marshal.dump(t))
assert_equal(t, t2) assert_equal(t, t2)
assert_equal(t.utc_offset, t2.utc_offset) assert_equal(t.utc_offset, t2.utc_offset)
assert_equal(t.utc_offset, (t2+1).utc_offset)
end end
end end

11
time.c
View File

@ -1257,7 +1257,9 @@ gmtimew(wideval_t timew, struct vtm *result)
result->wday = tm.tm_wday; result->wday = tm.tm_wday;
result->yday = tm.tm_yday+1; result->yday = tm.tm_yday+1;
result->isdst = tm.tm_isdst; result->isdst = tm.tm_isdst;
#if 0
result->zone = rb_fstring_usascii("UTC"); result->zone = rb_fstring_usascii("UTC");
#endif
return result; return result;
} }
@ -1716,8 +1718,7 @@ PACKED_STRUCT_UNALIGNED(struct time_object {
#define TZMODE_FIXOFF_P(tobj) ((tobj)->tzmode == TIME_TZMODE_FIXOFF) #define TZMODE_FIXOFF_P(tobj) ((tobj)->tzmode == TIME_TZMODE_FIXOFF)
#define TZMODE_SET_FIXOFF(tobj, off) \ #define TZMODE_SET_FIXOFF(tobj, off) \
((tobj)->tzmode = TIME_TZMODE_FIXOFF, \ ((tobj)->tzmode = TIME_TZMODE_FIXOFF, \
(tobj)->vtm.utc_offset = (off), \ (tobj)->vtm.utc_offset = (off))
(tobj)->vtm.zone = Qnil)
#define TZMODE_COPY(tobj1, tobj2) \ #define TZMODE_COPY(tobj1, tobj2) \
((tobj1)->tzmode = (tobj2)->tzmode, \ ((tobj1)->tzmode = (tobj2)->tzmode, \
@ -1766,6 +1767,7 @@ time_s_alloc(VALUE klass)
tobj->tzmode = TIME_TZMODE_UNINITIALIZED; tobj->tzmode = TIME_TZMODE_UNINITIALIZED;
tobj->tm_got=0; tobj->tm_got=0;
tobj->timew = WINT2FIXWV(0); tobj->timew = WINT2FIXWV(0);
tobj->vtm.zone = Qnil;
return obj; return obj;
} }
@ -3728,7 +3730,7 @@ time_fixoff(VALUE time)
{ {
struct time_object *tobj; struct time_object *tobj;
struct vtm vtm; struct vtm vtm;
VALUE off; VALUE off, zone;
GetTimeval(time, tobj); GetTimeval(time, tobj);
if (TZMODE_FIXOFF_P(tobj)) { if (TZMODE_FIXOFF_P(tobj)) {
@ -3746,7 +3748,9 @@ time_fixoff(VALUE time)
GMTIMEW(tobj->timew, &vtm); GMTIMEW(tobj->timew, &vtm);
zone = tobj->vtm.zone;
tobj->vtm = vtm; tobj->vtm = vtm;
tobj->vtm.zone = zone;
vtm_add_offset(&tobj->vtm, off); vtm_add_offset(&tobj->vtm, off);
tobj->tm_got = 1; tobj->tm_got = 1;
@ -4972,7 +4976,6 @@ end_submicro: ;
time_fixoff(time); time_fixoff(time);
} }
if (!NIL_P(zone)) { if (!NIL_P(zone)) {
if (TZMODE_FIXOFF_P(tobj)) TZMODE_SET_LOCALTIME(tobj);
zone = rb_fstring(zone); zone = rb_fstring(zone);
tobj->vtm.zone = zone; tobj->vtm.zone = zone;
} }