From 8ec906563ccd3c2ce236e4285ef7f1714d62fc42 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Mon, 31 Aug 2020 12:23:54 +0100 Subject: [PATCH] Update timelib to 2020.02 --- ext/date/lib/parse_date.c | 3 ++- ext/date/lib/parse_date.re | 1 + ext/date/lib/parse_iso_intervals.c | 6 +++--- ext/date/lib/parse_iso_intervals.re | 4 ++-- ext/date/lib/timelib.h | 6 +++--- ext/date/tests/DateTimeZone_getLocation.phpt | 2 +- ext/date/tests/big_year.phpt | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index c9ae9a8332..99c6d11cce 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 2.0.3 on Mon Aug 31 11:54:55 2020 */ +/* Generated by re2c 2.0.3 on Mon Aug 31 12:21:15 2020 */ #line 1 "parse_date.re" /* * The MIT License (MIT) @@ -22456,6 +22456,7 @@ static const timelib_format_specifier default_format_map[] = { {'F', TIMELIB_FORMAT_TEXTUAL_MONTH_FULL}, {'e', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'P', TIMELIB_FORMAT_TIMEZONE_OFFSET}, + {'p', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'T', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'O', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {' ', TIMELIB_FORMAT_WHITESPACE}, diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 67db6fafb0..8d7a8576b8 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -1997,6 +1997,7 @@ static const timelib_format_specifier default_format_map[] = { {'F', TIMELIB_FORMAT_TEXTUAL_MONTH_FULL}, {'e', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'P', TIMELIB_FORMAT_TIMEZONE_OFFSET}, + {'p', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'T', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {'O', TIMELIB_FORMAT_TIMEZONE_OFFSET}, {' ', TIMELIB_FORMAT_WHITESPACE}, diff --git a/ext/date/lib/parse_iso_intervals.c b/ext/date/lib/parse_iso_intervals.c index 7313df7a50..fe17d3d22a 100644 --- a/ext/date/lib/parse_iso_intervals.c +++ b/ext/date/lib/parse_iso_intervals.c @@ -1,4 +1,4 @@ -/* Generated by re2c 2.0.3 on Mon Aug 31 11:54:50 2020 */ +/* Generated by re2c 2.0.3 on Mon Aug 31 12:21:19 2020 */ #line 1 "parse_iso_intervals.re" /* * The MIT License (MIT) @@ -309,8 +309,8 @@ yy10: nr = timelib_get_unsigned_nr(&ptr, 12); switch (*ptr) { case 'Y': s->period->y = nr; break; - case 'W': s->period->d = nr * 7; break; - case 'D': s->period->d = nr; break; + case 'W': s->period->d += nr * 7; break; + case 'D': s->period->d += nr; break; case 'H': s->period->h = nr; break; case 'S': s->period->s = nr; break; case 'M': diff --git a/ext/date/lib/parse_iso_intervals.re b/ext/date/lib/parse_iso_intervals.re index 55680758f0..bd4015a323 100644 --- a/ext/date/lib/parse_iso_intervals.re +++ b/ext/date/lib/parse_iso_intervals.re @@ -260,8 +260,8 @@ isoweek = year4 "-"? "W" weekofyear; nr = timelib_get_unsigned_nr(&ptr, 12); switch (*ptr) { case 'Y': s->period->y = nr; break; - case 'W': s->period->d = nr * 7; break; - case 'D': s->period->d = nr; break; + case 'W': s->period->d += nr * 7; break; + case 'D': s->period->d += nr; break; case 'H': s->period->h = nr; break; case 'S': s->period->s = nr; break; case 'M': diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index 042b813e5d..d6c51a735a 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -322,9 +322,9 @@ typedef struct _timelib_tzdb { # define timelib_free free #endif -#define TIMELIB_VERSION 202001 -#define TIMELIB_EXTENDED_VERSION 20201001 -#define TIMELIB_ASCII_VERSION "2020.01" +#define TIMELIB_VERSION 202002 +#define TIMELIB_EXTENDED_VERSION 20202001 +#define TIMELIB_ASCII_VERSION "2020.02" #define TIMELIB_NONE 0x00 #define TIMELIB_OVERRIDE_TIME 0x01 diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt index 4d89ef6183..25f6dbe4bc 100644 --- a/ext/date/tests/DateTimeZone_getLocation.phpt +++ b/ext/date/tests/DateTimeZone_getLocation.phpt @@ -52,5 +52,5 @@ Array [country_code] => %s [latitude] => %f [longitude] => %f - [comments] => %s + [comments] => %S ) diff --git a/ext/date/tests/big_year.phpt b/ext/date/tests/big_year.phpt index 799361729d..e1bc87fd54 100644 --- a/ext/date/tests/big_year.phpt +++ b/ext/date/tests/big_year.phpt @@ -12,6 +12,6 @@ var_dump(date("r", $t)); echo "OK\n"; ?> ---EXPECT-- +--EXPECTF-- string(%d) "%s, 01 Jan 2922770265 00:00:00 -0500" OK -- 2.40.0