archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 99a9c3fe2e: [Backport #17024]

Browse source 
Fixed yday and wday with timezone [Bug #17024]
This commit is contained in:
nagachika 2020-07-23 11:33:11 +09:00
parent 13d2ab0d88
commit 4be9bf1f67
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
spec/ruby/core/time/new_spec.rb
View file

@ -121,7 +121,7 @@ describe "Time.new with a utc_offset argument" do
end end
end end
ruby_version_is "2.6" do ruby_version_is "2.7" do
describe "Time.new with a timezone argument" do describe "Time.new with a timezone argument" do
it "returns a Time in the timezone" do it "returns a Time in the timezone" do
zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60)) zone = TimeSpecs::Timezone.new(offset: (5*3600+30*60))
@ -129,6 +129,10 @@ ruby_version_is "2.6" do
time.zone.should == zone time.zone.should == zone
time.utc_offset.should == 5*3600+30*60 time.utc_offset.should == 5*3600+30*60
ruby_version_is "2.7" do
time.wday.should == 6
time.yday.should == 1
end
end end
it "accepts timezone argument that must have #local_to_utc and #utc_to_local methods" do it "accepts timezone argument that must have #local_to_utc and #utc_to_local methods" do

2
test/ruby/test_time_tz.rb
View file

@ -608,6 +608,8 @@ module TestTimeTZ::WithTZ
assert_equal([2018, 9, 1, 12, 0, 0, tz], [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.zone]) assert_equal([2018, 9, 1, 12, 0, 0, tz], [t.year, t.mon, t.mday, t.hour, t.min, t.sec, t.zone])
h, m = (-utc_offset / 60).divmod(60) h, m = (-utc_offset / 60).divmod(60)
assert_equal(time_class.utc(2018, 9, 1, 12+h, m, 0).to_i, t.to_i) assert_equal(time_class.utc(2018, 9, 1, 12+h, m, 0).to_i, t.to_i)
assert_equal(6, t.wday)
assert_equal(244, t.yday)
end end
def subtest_now(time_class, tz, tzarg, tzname, abbr, utc_offset) def subtest_now(time_class, tz, tzarg, tzname, abbr, utc_offset)

13
time.c
View file

@ -4558,14 +4558,15 @@ time_wday(VALUE time)
GetTimeval(time, tobj); GetTimeval(time, tobj);
MAKE_TM(time, tobj); MAKE_TM(time, tobj);
if (tobj->vtm.wday == VTM_WDAY_INITVAL) {
VALUE zone = tobj->vtm.zone;
if (!NIL_P(zone)) zone_localtime(zone, time);
}
return INT2FIX((int)tobj->vtm.wday); return INT2FIX((int)tobj->vtm.wday);
} }
#define wday_p(n) {\ #define wday_p(n) {\
struct time_object *tobj;\ return (time_wday(time) == INT2FIX(n)) ? Qtrue : Qfalse; \
GetTimeval(time, tobj);\
MAKE_TM(time, tobj);\
return (tobj->vtm.wday == (n)) ? Qtrue : Qfalse;\
} }
/* /*
@ -4697,6 +4698,10 @@ time_yday(VALUE time)
GetTimeval(time, tobj); GetTimeval(time, tobj);
MAKE_TM(time, tobj); MAKE_TM(time, tobj);
if (tobj->vtm.yday == 0) {
VALUE zone = tobj->vtm.zone;
if (!NIL_P(zone)) zone_localtime(zone, time);
}
return INT2FIX(tobj->vtm.yday); return INT2FIX(tobj->vtm.yday);
} }

2
version.h
View file

@ -2,7 +2,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 99 #define RUBY_PATCHLEVEL 100
#define RUBY_RELEASE_YEAR 2020 #define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7