admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3932 from ken-mu/timegm

Browse Source 
mruby-time: Fix mruby specific timegm() cannot return minus
This commit is contained in:
Yukihiro "Matz" Matsumoto
2018-01-21 21:10:01 +09:00
committed by GitHub
parent e5fb21b6d2 d398cd47d7
commit f8ab3c1eeb
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-time/src/time.c
+8 -2
View File
@@ -138,8 +138,14 @@ timegm(struct tm *tm)
int i;
unsigned int *nday = (unsigned int*) ndays[is_leapyear(tm->tm_year+1900)];
for (i = 70; i < tm->tm_year; ++i)
r += is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
static const int epoch_year = 70;
if(tm->tm_year >= epoch_year) {
for (i = epoch_year; i < tm->tm_year; ++i)
r += is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
} else {
for (i = tm->tm_year; i < epoch_year; ++i)
r -= is_leapyear(i+1900) ? 366*24*60*60 : 365*24*60*60;
}
for (i = 0; i < tm->tm_mon; ++i)
r += nday[i] * 24 * 60 * 60;
r += (tm->tm_mday - 1) * 24 * 60 * 60;
mrbgems/mruby-time/test/time.rb
+8
View File
@@ -226,3 +226,11 @@ assert('2000 times 500us make a second') do
end
t.usec == 0
end
assert('Time.new with Dec 31 23:59:59 1969 raise ArgumentError') do
assert_raise(ArgumentError) {Time.new(1969, 12, 31, 23, 59, 59)}
end
assert('Time.gm with Dec 31 23:59:59 1969 raise ArgumentError') do
assert_raise(ArgumentError) {Time.gm(1969, 12, 31, 23, 59, 59)}
end