github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Added macros for days in month

This commit is contained in:
Nobuyoshi Nakada 2021-06-26 22:52:30 +09:00
Родитель 1fd8b6f2b9
Коммит bf789af28a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 7CD2805BFA3770C6
1 изменённых файлов: 8 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
time.c
Просмотреть файл

@ -783,6 +783,9 @@ static const int8_t leap_year_days_in_month[] = {
31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
}; };
#define days_in_month_of(leap) ((leap) ? leap_year_days_in_month : common_year_days_in_month)
#define days_in_month_in(y) days_in_month_of(leap_year_p(y))
#define M28(m) \ #define M28(m) \
(m),(m),(m),(m),(m),(m),(m),(m),(m),(m), \ (m),(m),(m),(m),(m),(m),(m),(m),(m),(m), \
(m),(m),(m),(m),(m),(m),(m),(m),(m),(m), \ (m),(m),(m),(m),(m),(m),(m),(m),(m),(m), \
@ -1107,9 +1110,7 @@ gmtime_with_leapsecond(const time_t *timep, struct tm *result)
result->tm_yday = leap_year_p(result->tm_year + 1900) ? 365 : 364; result->tm_yday = leap_year_p(result->tm_year + 1900) ? 365 : 364;
} }
else if (result->tm_mday == 1) { else if (result->tm_mday == 1) {
const int8_t *days_in_month = leap_year_p(result->tm_year + 1900) ? const int8_t *days_in_month = days_in_month_of(result->tm_year + 1900);
leap_year_days_in_month :
common_year_days_in_month;
result->tm_mon--; result->tm_mon--;
result->tm_mday = days_in_month[result->tm_mon]; result->tm_mday = days_in_month[result->tm_mon];
result->tm_yday--; result->tm_yday--;
@ -1128,8 +1129,7 @@ gmtime_with_leapsecond(const time_t *timep, struct tm *result)
result->tm_mday = 1; result->tm_mday = 1;
result->tm_yday = 0; result->tm_yday = 0;
} }
else if (result->tm_mday == (leap ? leap_year_days_in_month : else if (result->tm_mday == days_in_month_of(leap)[result->tm_mon]) {
common_year_days_in_month)[result->tm_mon]) {
result->tm_mon++; result->tm_mon++;
result->tm_mday = 1; result->tm_mday = 1;
result->tm_yday++; result->tm_yday++;
@ -2030,9 +2030,7 @@ vtm_add_offset(struct vtm *vtm, VALUE off, int sign)
vtm->yday = leap_year_v_p(vtm->year) ? 366 : 365; vtm->yday = leap_year_v_p(vtm->year) ? 366 : 365;
} }
else if (vtm->mday == 1) { else if (vtm->mday == 1) {
const int8_t *days_in_month = leap_year_v_p(vtm->year) ? const int8_t *days_in_month = days_in_month_in(vtm->year);
leap_year_days_in_month :
common_year_days_in_month;
vtm->mon--; vtm->mon--;
vtm->mday = days_in_month[vtm->mon-1]; vtm->mday = days_in_month[vtm->mon-1];
vtm->yday--; vtm->yday--;
@ -2051,8 +2049,7 @@ vtm_add_offset(struct vtm *vtm, VALUE off, int sign)
vtm->mday = 1; vtm->mday = 1;
vtm->yday = 1; vtm->yday = 1;
} }
else if (vtm->mday == (leap ? leap_year_days_in_month : else if (vtm->mday == days_in_month_of(leap)[vtm->mon-1]) {
common_year_days_in_month)[vtm->mon-1]) {
vtm->mon++; vtm->mon++;
vtm->mday = 1; vtm->mday = 1;
vtm->yday++; vtm->yday++;
@ -3061,9 +3058,7 @@ find_time_t(struct tm *tptr, int utc_p, time_t *tp)
tm0.tm_min = 0; tm0.tm_min = 0;
tm0.tm_sec = 0; tm0.tm_sec = 0;
} }
else if ((d = (leap_year_p(1900 + tm0.tm_year) ? else if ((d = days_in_month_in(1900 + tm0.tm_year)[tm0.tm_mon]) < tm0.tm_mday) {
leap_year_days_in_month :
common_year_days_in_month)[tm0.tm_mon]) < tm0.tm_mday) {
tm0.tm_mday = d; tm0.tm_mday = d;
tm0.tm_hour = 23; tm0.tm_hour = 23;
tm0.tm_min = 59; tm0.tm_min = 59;