com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/lib/ parse_date.c ext/date/lib/parse_date.re

Commit: c2f2d5c8fc804bfc4ab315c4f54e6257b5c2bc57 Author: Peter Cowburn <petercowburn@gmail.com> Thu, 31 Jul 2014 14:33:55 +0100 Parents: b96224625c966a1e32411876a1120f770ada1380 bff84d7c18a21c5a3c531684375674fc7ffd3746 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c2f2d5c8fc804bfc4ab315c4f54e6257b5c2bc57 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Bug #51096 - Remove unnecessary ? for first/last day of Conflicts: ext/date/lib/parse_date.c Bugs: https://bugs.php.net/51096 Changed paths: MM ext/date/lib/parse_date.c MM ext/date/lib/parse_date.re

diff --cc ext/date/lib/parse_date.c index 6174756,a2f339a..015da88 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@@ -1,4 -1,4 +1,4 @@@ - /* Generated by re2c 0.13.5 on Tue May 13 17:01:57 2014 */ -/* Generated by re2c 0.13.5 on Thu Jul 31 14:20:45 2014 */ ++/* Generated by re2c 0.13.5 on Thu Jul 31 14:33:37 2014 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@@ -994,16 -1010,16 +975,16 @@@ yy2 } } else { if (yych <= 'd') { - if (yych <= 'Z') goto yy141; - if (yych >= 'a') goto yy146; + if (yych <= 'Z') goto yy140; + if (yych >= 'a') goto yy145; } else { if (yych <= 'e') goto yy1532; - if (yych <= 'z') goto yy146; + if (yych <= 'z') goto yy145; } } - yy4: - YYDEBUG(4, *YYCURSOR); + yy3: + YYDEBUG(3, *YYCURSOR); -#line 1681 "ext/date/lib/parse_date.re" +#line 1646 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("tzcorrection | tz"); @@@ -1016,9 -1032,9 +997,9 @@@ TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } - #line 1020 "ext/date/lib/parse_date.c" - yy5: - YYDEBUG(5, *YYCURSOR); -#line 1036 "ext/date/lib/parse_date.c" ++#line 1001 "ext/date/lib/parse_date.c" + yy4: + YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'E') { if (yych <= ')') { @@@ -1323,18 -1339,18 +1304,18 @@@ yy11 yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if (yych == '-') goto yy1384; - if (yych <= '/') goto yy13; + if (yych <= '/') goto yy12; if (yych <= '9') goto yy1385; - yy13: - YYDEBUG(13, *YYCURSOR); + yy12: + YYDEBUG(12, *YYCURSOR); -#line 1776 "ext/date/lib/parse_date.re" +#line 1741 "ext/date/lib/parse_date.re" { add_error(s, "Unexpected character"); goto std; } - #line 1336 "ext/date/lib/parse_date.c" - yy14: - YYDEBUG(14, *YYCURSOR); -#line 1352 "ext/date/lib/parse_date.c" ++#line 1317 "ext/date/lib/parse_date.c" + yy13: + YYDEBUG(13, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'R') { if (yych <= 'E') { @@@ -2371,49 -2399,37 +2364,37 @@@ yy48 yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 4) { - goto yy58; + goto yy57; } - if (yych <= '/') goto yy50; - if (yych <= '9') goto yy55; - yy50: - YYDEBUG(50, *YYCURSOR); + if (yych <= '/') goto yy49; + if (yych <= '9') goto yy54; + yy49: + YYDEBUG(49, *YYCURSOR); -#line 1765 "ext/date/lib/parse_date.re" +#line 1730 "ext/date/lib/parse_date.re" { goto std; } - #line 2397 "ext/date/lib/parse_date.c" -#line 2413 "ext/date/lib/parse_date.c" ++#line 2378 "ext/date/lib/parse_date.c" + yy50: + YYDEBUG(50, *YYCURSOR); + yych = *++YYCURSOR; + goto yy49; yy51: YYDEBUG(51, *YYCURSOR); - yych = *++YYCURSOR; - goto yy50; - yy52: - YYDEBUG(52, *YYCURSOR); ++YYCURSOR; - YYDEBUG(53, *YYCURSOR); + YYDEBUG(52, *YYCURSOR); -#line 1770 "ext/date/lib/parse_date.re" +#line 1735 "ext/date/lib/parse_date.re" { s->pos = cursor; s->line++; goto std; } - #line 2411 "ext/date/lib/parse_date.c" -#line 2427 "ext/date/lib/parse_date.c" ++#line 2392 "ext/date/lib/parse_date.c" + yy53: + YYDEBUG(53, *YYCURSOR); + yych = *++YYCURSOR; + goto yy12; yy54: YYDEBUG(54, *YYCURSOR); - yych = *++YYCURSOR; - goto yy13; - yy55: - YYDEBUG(55, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 11) YYFILL(11); yych = *YYCURSOR; @@@ -2778,23 -2800,17 +2765,17 @@@ yy69 yy70: YYDEBUG(70, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'U') goto yy78; - if (yych == 'u') goto yy78; - goto yy57; + if (yych == 'E') goto yy71; + if (yych != 'e') goto yy56; yy71: YYDEBUG(71, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'E') goto yy72; - if (yych != 'e') goto yy57; - yy72: - YYDEBUG(72, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); - if (yych == 'S') goto yy74; - if (yych == 's') goto yy74; - yy73: - YYDEBUG(73, *YYCURSOR); + if (yych == 'S') goto yy73; + if (yych == 's') goto yy73; + yy72: + YYDEBUG(72, *YYCURSOR); -#line 1749 "ext/date/lib/parse_date.re" +#line 1714 "ext/date/lib/parse_date.re" { timelib_ull i; DEBUG_OUTPUT("relative"); @@@ -2809,7 -2825,12 +2790,12 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 2813 "ext/date/lib/parse_date.c" -#line 2829 "ext/date/lib/parse_date.c" ++#line 2794 "ext/date/lib/parse_date.c" + yy73: + YYDEBUG(73, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'D') goto yy74; + if (yych != 'd') goto yy56; yy74: YYDEBUG(74, *YYCURSOR); yych = *++YYCURSOR; @@@ -3562,16 -3578,16 +3543,16 @@@ yy165 } } else { if (yych <= 'm') { - if (yych <= 'Z') goto yy143; - if (yych >= 'a') goto yy143; + if (yych <= 'Z') goto yy142; + if (yych >= 'a') goto yy142; } else { - if (yych <= 'n') goto yy174; - if (yych <= 'z') goto yy143; + if (yych <= 'n') goto yy173; + if (yych <= 'z') goto yy142; } } - yy167: - YYDEBUG(167, *YYCURSOR); + yy166: + YYDEBUG(166, *YYCURSOR); -#line 1612 "ext/date/lib/parse_date.re" +#line 1577 "ext/date/lib/parse_date.re" { const timelib_relunit* relunit; DEBUG_OUTPUT("daytext"); @@@ -3588,9 -3604,9 +3569,9 @@@ TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } - #line 3592 "ext/date/lib/parse_date.c" - yy168: - YYDEBUG(168, *YYCURSOR); -#line 3608 "ext/date/lib/parse_date.c" ++#line 3573 "ext/date/lib/parse_date.c" + yy167: + YYDEBUG(167, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'K') { if (yych <= ')') { @@@ -4106,9 -4122,9 +4087,9 @@@ yy192 } } } - yy194: - YYDEBUG(194, *YYCURSOR); + yy193: + YYDEBUG(193, *YYCURSOR); -#line 1671 "ext/date/lib/parse_date.re" +#line 1636 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("monthtext"); TIMELIB_INIT; @@@ -4117,9 -4133,9 +4098,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4121 "ext/date/lib/parse_date.c" - yy195: - YYDEBUG(195, *YYCURSOR); -#line 4137 "ext/date/lib/parse_date.c" ++#line 4102 "ext/date/lib/parse_date.c" + yy194: + YYDEBUG(194, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21); yych = *YYCURSOR; @@@ -4157,18 -4173,18 +4138,18 @@@ yy197 } } else { if (yych <= 'r') { - if (yych <= 'n') goto yy212; - if (yych <= 'q') goto yy216; - goto yy213; + if (yych <= 'n') goto yy211; + if (yych <= 'q') goto yy215; + goto yy212; } else { - if (yych <= 's') goto yy211; - if (yych <= 't') goto yy214; - goto yy216; + if (yych <= 's') goto yy210; + if (yych <= 't') goto yy213; + goto yy215; } } - yy199: - YYDEBUG(199, *YYCURSOR); + yy198: + YYDEBUG(198, *YYCURSOR); -#line 1417 "ext/date/lib/parse_date.re" +#line 1382 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datetextual | datenoyear"); @@@ -4181,9 -4197,9 +4162,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4185 "ext/date/lib/parse_date.c" - yy200: - YYDEBUG(200, *YYCURSOR); -#line 4201 "ext/date/lib/parse_date.c" ++#line 4166 "ext/date/lib/parse_date.c" + yy199: + YYDEBUG(199, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { @@@ -4436,21 -4459,14 +4424,14 @@@ yy221 yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy225; + if (yych == '.') goto yy224; } else { - if (yych <= '9') goto yy224; - if (yych <= ':') goto yy225; + if (yych <= '9') goto yy223; + if (yych <= ':') goto yy224; } - yy223: - YYDEBUG(223, *YYCURSOR); + yy222: + YYDEBUG(222, *YYCURSOR); -#line 1719 "ext/date/lib/parse_date.re" +#line 1684 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); @@@ -4479,13 -4495,21 +4460,21 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 4483 "ext/date/lib/parse_date.c" - yy224: - YYDEBUG(224, *YYCURSOR); -#line 4499 "ext/date/lib/parse_date.c" ++#line 4464 "ext/date/lib/parse_date.c" + yy223: + YYDEBUG(223, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy225; - if (yych != ':') goto yy223; + if (yych == '.') goto yy224; + if (yych != ':') goto yy222; + yy224: + YYDEBUG(224, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy56; + if (yych <= '5') goto yy225; + if (yych <= '6') goto yy226; + if (yych <= '9') goto yy227; + goto yy56; yy225: YYDEBUG(225, *YYCURSOR); yych = *++YYCURSOR; @@@ -5156,28 -5172,28 +5137,28 @@@ yy275 } } else { if (yych <= '@') { - if (yych != '.') goto yy223; + if (yych != '.') goto yy222; } else { - if (yych <= 'Z') goto yy238; - if (yych <= '`') goto yy223; - if (yych <= 'z') goto yy238; - goto yy223; + if (yych <= 'Z') goto yy237; + if (yych <= '`') goto yy222; + if (yych <= 'z') goto yy237; + goto yy222; } } - yy277: - YYDEBUG(277, *YYCURSOR); + yy276: + YYDEBUG(276, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy278; - if (yych <= 0x08) goto yy57; + if (yych <= 0x00) goto yy277; + if (yych <= 0x08) goto yy56; } else { - if (yych != ' ') goto yy57; + if (yych != ' ') goto yy56; } - yy278: - YYDEBUG(278, *YYCURSOR); + yy277: + YYDEBUG(277, *YYCURSOR); ++YYCURSOR; - YYDEBUG(279, *YYCURSOR); + YYDEBUG(278, *YYCURSOR); -#line 1695 "ext/date/lib/parse_date.re" +#line 1660 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); TIMELIB_INIT; @@@ -5200,21 -5216,21 +5181,21 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 5204 "ext/date/lib/parse_date.c" - yy280: - YYDEBUG(280, *YYCURSOR); -#line 5220 "ext/date/lib/parse_date.c" ++#line 5185 "ext/date/lib/parse_date.c" + yy279: + YYDEBUG(279, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy278; - if (yych == '\t') goto yy278; - goto yy57; + if (yych <= 0x00) goto yy277; + if (yych == '\t') goto yy277; + goto yy56; } else { - if (yych <= ' ') goto yy278; - if (yych == '.') goto yy277; - goto yy57; + if (yych <= ' ') goto yy277; + if (yych == '.') goto yy276; + goto yy56; } - yy281: - YYDEBUG(281, *YYCURSOR); + yy280: + YYDEBUG(280, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '-') { @@@ -5361,24 -5377,24 +5342,24 @@@ yy291 yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy264; - goto yy199; + if (yych == '.') goto yy263; + goto yy198; } else { - if (yych <= '9') goto yy289; - if (yych <= ':') goto yy264; - goto yy199; + if (yych <= '9') goto yy288; + if (yych <= ':') goto yy263; + goto yy198; } + yy292: + YYDEBUG(292, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy56; + if (yych >= ':') goto yy56; yy293: YYDEBUG(293, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= ':') goto yy57; + ++YYCURSOR; yy294: YYDEBUG(294, *YYCURSOR); - ++YYCURSOR; - yy295: - YYDEBUG(295, *YYCURSOR); -#line 1389 "ext/date/lib/parse_date.re" +#line 1354 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenoday"); @@@ -5391,31 -5407,31 +5372,31 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 5395 "ext/date/lib/parse_date.c" - yy296: - YYDEBUG(296, *YYCURSOR); -#line 5411 "ext/date/lib/parse_date.c" ++#line 5376 "ext/date/lib/parse_date.c" + yy295: + YYDEBUG(295, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy221; - goto yy57; + if (yych == '.') goto yy220; + goto yy56; } else { - if (yych <= '9') goto yy294; - if (yych <= ':') goto yy221; - goto yy57; + if (yych <= '9') goto yy293; + if (yych <= ':') goto yy220; + goto yy56; } - yy297: - YYDEBUG(297, *YYCURSOR); + yy296: + YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '/') { - if (yych == '.') goto yy264; - goto yy57; + if (yych == '.') goto yy263; + goto yy56; } else { - if (yych <= '9') goto yy294; - if (yych <= ':') goto yy264; - goto yy57; + if (yych <= '9') goto yy293; + if (yych <= ':') goto yy263; + goto yy56; } - yy298: - YYDEBUG(298, *YYCURSOR); + yy297: + YYDEBUG(297, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@@ -6590,28 -6606,28 +6571,28 @@@ yy360 } } else { if (yych <= 'q') { - if (yych <= ':') goto yy264; - if (yych == 'n') goto yy212; - goto yy216; + if (yych <= ':') goto yy263; + if (yych == 'n') goto yy211; + goto yy215; } else { - if (yych <= 'r') goto yy213; - if (yych <= 's') goto yy211; - if (yych <= 't') goto yy214; - goto yy216; + if (yych <= 'r') goto yy212; + if (yych <= 's') goto yy210; + if (yych <= 't') goto yy213; + goto yy215; } } - yy362: - YYDEBUG(362, *YYCURSOR); + yy361: + YYDEBUG(361, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= ':') goto yy57; - YYDEBUG(363, *YYCURSOR); + if (yych <= '/') goto yy56; + if (yych >= ':') goto yy56; + YYDEBUG(362, *YYCURSOR); ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy364; - if (yych <= '9') goto yy365; - yy364: - YYDEBUG(364, *YYCURSOR); + if ((yych = *YYCURSOR) <= '/') goto yy363; + if (yych <= '9') goto yy364; + yy363: + YYDEBUG(363, *YYCURSOR); -#line 1533 "ext/date/lib/parse_date.re" +#line 1498 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextshort"); @@@ -6624,21 -6640,21 +6605,21 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 6628 "ext/date/lib/parse_date.c" - yy365: -#line 6644 "ext/date/lib/parse_date.c" ++#line 6609 "ext/date/lib/parse_date.c" + yy364: + YYDEBUG(364, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy363; + if (yych >= ':') goto yy363; YYDEBUG(365, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy364; - if (yych >= ':') goto yy364; + if (yych <= '/') goto yy363; + if (yych >= ':') goto yy363; YYDEBUG(366, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy364; - if (yych >= ':') goto yy364; + goto yy363; + yy367: YYDEBUG(367, *YYCURSOR); - yych = *++YYCURSOR; - goto yy364; - yy368: - YYDEBUG(368, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@@ -7241,28 -7257,28 +7222,28 @@@ yy390 } } else { if (yych <= 'n') { - if (yych <= 'Z') goto yy142; - if (yych <= '`') goto yy4; - goto yy142; + if (yych <= 'Z') goto yy141; + if (yych <= '`') goto yy3; + goto yy141; } else { - if (yych <= 'o') goto yy392; - if (yych <= 'z') goto yy142; - goto yy4; + if (yych <= 'o') goto yy391; + if (yych <= 'z') goto yy141; + goto yy3; } } - yy392: - YYDEBUG(392, *YYCURSOR); + yy391: + YYDEBUG(391, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= '@') { - if (yych == ')') goto yy140; + if (yych == ')') goto yy139; } else { - if (yych <= 'Z') goto yy143; - if (yych <= '`') goto yy393; - if (yych <= 'z') goto yy143; + if (yych <= 'Z') goto yy142; + if (yych <= '`') goto yy392; + if (yych <= 'z') goto yy142; } - yy393: - YYDEBUG(393, *YYCURSOR); + yy392: + YYDEBUG(392, *YYCURSOR); -#line 1591 "ext/date/lib/parse_date.re" +#line 1556 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@@ -7282,9 -7298,9 +7263,9 @@@ TIMELIB_DEINIT; return TIMELIB_AGO; } - #line 7286 "ext/date/lib/parse_date.c" - yy394: - YYDEBUG(394, *YYCURSOR); -#line 7302 "ext/date/lib/parse_date.c" ++#line 7267 "ext/date/lib/parse_date.c" + yy393: + YYDEBUG(393, *YYCURSOR); yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@@ -9019,20 -9041,14 +9006,14 @@@ yy451 yy452: YYDEBUG(452, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '9') goto yy454; - goto yy57; + if (yych <= '/') goto yy56; + if (yych >= '2') goto yy56; yy453: YYDEBUG(453, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= '2') goto yy57; + ++YYCURSOR; yy454: YYDEBUG(454, *YYCURSOR); - ++YYCURSOR; - yy455: - YYDEBUG(455, *YYCURSOR); -#line 1294 "ext/date/lib/parse_date.re" +#line 1259 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@@ -9043,9 -9059,9 +9024,9 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 9047 "ext/date/lib/parse_date.c" - yy456: - YYDEBUG(456, *YYCURSOR); -#line 9063 "ext/date/lib/parse_date.c" ++#line 9028 "ext/date/lib/parse_date.c" + yy455: + YYDEBUG(455, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@@ -9594,16 -9610,16 +9575,16 @@@ yy474 } } else { if (yych <= 'U') { - if (yych <= '9') goto yy534; - if (yych == 'I') goto yy567; + if (yych <= '9') goto yy533; + if (yych == 'I') goto yy566; } else { - if (yych == 'W') goto yy476; - if (yych <= 'X') goto yy540; + if (yych == 'W') goto yy475; + if (yych <= 'X') goto yy539; } } - yy476: - YYDEBUG(476, *YYCURSOR); + yy475: + YYDEBUG(475, *YYCURSOR); -#line 1431 "ext/date/lib/parse_date.re" +#line 1396 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@@ -9614,9 -9630,9 +9595,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 9618 "ext/date/lib/parse_date.c" - yy477: - YYDEBUG(477, *YYCURSOR); -#line 9634 "ext/date/lib/parse_date.c" ++#line 9599 "ext/date/lib/parse_date.c" + yy476: + YYDEBUG(476, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { @@@ -9730,32 -9751,27 +9716,27 @@@ yy484 yy485: YYDEBUG(485, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy486; - if (yych != 'm') goto yy57; - yy486: - YYDEBUG(486, *YYCURSOR); - yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy488; - if (yych == '\t') goto yy488; - goto yy57; + if (yych <= 0x00) goto yy487; + if (yych == '\t') goto yy487; + goto yy56; } else { - if (yych <= ' ') goto yy488; - if (yych != '.') goto yy57; + if (yych <= ' ') goto yy487; + if (yych != '.') goto yy56; } - YYDEBUG(487, *YYCURSOR); + YYDEBUG(486, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy488; - if (yych <= 0x08) goto yy57; + if (yych <= 0x00) goto yy487; + if (yych <= 0x08) goto yy56; } else { - if (yych != ' ') goto yy57; + if (yych != ' ') goto yy56; } - yy488: - YYDEBUG(488, *YYCURSOR); + yy487: + YYDEBUG(487, *YYCURSOR); ++YYCURSOR; - YYDEBUG(489, *YYCURSOR); + YYDEBUG(488, *YYCURSOR); -#line 1149 "ext/date/lib/parse_date.re" +#line 1114 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); TIMELIB_INIT; @@@ -9771,20 -9787,20 +9752,20 @@@ TIMELIB_DEINIT; return TIMELIB_TIME12; } - #line 9775 "ext/date/lib/parse_date.c" - yy490: - YYDEBUG(490, *YYCURSOR); -#line 9791 "ext/date/lib/parse_date.c" ++#line 9756 "ext/date/lib/parse_date.c" + yy489: + YYDEBUG(489, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy493; + if (yych == '.') goto yy492; } else { - if (yych <= '9') goto yy507; - if (yych <= ':') goto yy493; + if (yych <= '9') goto yy506; + if (yych <= ':') goto yy492; } - yy491: - YYDEBUG(491, *YYCURSOR); + yy490: + YYDEBUG(490, *YYCURSOR); -#line 1186 "ext/date/lib/parse_date.re" +#line 1151 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long"); @@@ -9809,21 -9825,29 +9790,29 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 9813 "ext/date/lib/parse_date.c" - yy492: - YYDEBUG(492, *YYCURSOR); -#line 9829 "ext/date/lib/parse_date.c" ++#line 9794 "ext/date/lib/parse_date.c" + yy491: + YYDEBUG(491, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy493; - if (yych != ':') goto yy491; + if (yych == '.') goto yy492; + if (yych != ':') goto yy490; + yy492: + YYDEBUG(492, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy56; + if (yych <= '5') goto yy493; + if (yych <= '6') goto yy494; + if (yych <= '9') goto yy495; + goto yy56; yy493: YYDEBUG(493, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '5') goto yy494; - if (yych <= '6') goto yy495; - if (yych <= '9') goto yy496; - goto yy57; + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '.') goto yy496; + if (yych <= '/') goto yy490; + if (yych <= '9') goto yy499; + goto yy490; yy494: YYDEBUG(494, *YYCURSOR); yyaccept = 11; @@@ -10076,50 -10092,50 +10057,50 @@@ yy516 } } else { if (yych <= 'a') { - if (yych <= 'P') goto yy519; - if (yych <= '`') goto yy57; + if (yych <= 'P') goto yy518; + if (yych <= '`') goto yy56; } else { - if (yych != 'p') goto yy57; + if (yych != 'p') goto yy56; } } - yy519: - YYDEBUG(519, *YYCURSOR); + yy518: + YYDEBUG(518, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'L') { - if (yych != '.') goto yy57; + if (yych != '.') goto yy56; } else { - if (yych <= 'M') goto yy521; - if (yych == 'm') goto yy521; - goto yy57; + if (yych <= 'M') goto yy520; + if (yych == 'm') goto yy520; + goto yy56; } - YYDEBUG(520, *YYCURSOR); + YYDEBUG(519, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy521; - if (yych != 'm') goto yy57; - yy521: - YYDEBUG(521, *YYCURSOR); + if (yych == 'M') goto yy520; + if (yych != 'm') goto yy56; + yy520: + YYDEBUG(520, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 0x1F) { - if (yych <= 0x00) goto yy523; - if (yych == '\t') goto yy523; - goto yy57; + if (yych <= 0x00) goto yy522; + if (yych == '\t') goto yy522; + goto yy56; } else { - if (yych <= ' ') goto yy523; - if (yych != '.') goto yy57; + if (yych <= ' ') goto yy522; + if (yych != '.') goto yy56; } - YYDEBUG(522, *YYCURSOR); + YYDEBUG(521, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '\t') { - if (yych <= 0x00) goto yy523; - if (yych <= 0x08) goto yy57; + if (yych <= 0x00) goto yy522; + if (yych <= 0x08) goto yy56; } else { - if (yych != ' ') goto yy57; + if (yych != ' ') goto yy56; } - yy523: - YYDEBUG(523, *YYCURSOR); + yy522: + YYDEBUG(522, *YYCURSOR); ++YYCURSOR; - YYDEBUG(524, *YYCURSOR); + YYDEBUG(523, *YYCURSOR); -#line 1166 "ext/date/lib/parse_date.re" +#line 1131 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("mssqltime"); TIMELIB_INIT; @@@ -10138,9 -10154,9 +10119,9 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 10142 "ext/date/lib/parse_date.c" - yy525: - YYDEBUG(525, *YYCURSOR); -#line 10158 "ext/date/lib/parse_date.c" ++#line 10123 "ext/date/lib/parse_date.c" + yy524: + YYDEBUG(524, *YYCURSOR); yyaccept = 11; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); @@@ -10222,29 -10238,29 +10203,29 @@@ yy531 ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; - yy533: - YYDEBUG(533, *YYCURSOR); + yy532: + YYDEBUG(532, *YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy532; - if (yych <= 0x1F) goto yy57; - goto yy532; + if (yych == '\t') goto yy531; + if (yych <= 0x1F) goto yy56; + goto yy531; } else { if (yych <= '.') { - if (yych <= ',') goto yy57; - goto yy532; + if (yych <= ',') goto yy56; + goto yy531; } else { - if (yych <= '/') goto yy57; - if (yych >= ':') goto yy57; + if (yych <= '/') goto yy56; + if (yych >= ':') goto yy56; } } + yy533: + YYDEBUG(533, *YYCURSOR); + ++YYCURSOR; + if ((yych = *YYCURSOR) <= '/') goto yy534; + if (yych <= '9') goto yy540; yy534: YYDEBUG(534, *YYCURSOR); - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy535; - if (yych <= '9') goto yy541; - yy535: - YYDEBUG(535, *YYCURSOR); -#line 1348 "ext/date/lib/parse_date.re" +#line 1313 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datefull"); @@@ -10258,7 -10274,12 +10239,12 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } - #line 10262 "ext/date/lib/parse_date.c" -#line 10278 "ext/date/lib/parse_date.c" ++#line 10243 "ext/date/lib/parse_date.c" + yy535: + YYDEBUG(535, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'M') goto yy536; + if (yych != 'm') goto yy56; yy536: YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; @@@ -10985,17 -11006,12 +10971,12 @@@ yy603 yy604: YYDEBUG(604, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= ':') goto yy57; - yy605: + if (yych <= '/') goto yy56; + if (yych >= ':') goto yy56; YYDEBUG(605, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= ':') goto yy57; - YYDEBUG(606, *YYCURSOR); ++YYCURSOR; - YYDEBUG(607, *YYCURSOR); + YYDEBUG(606, *YYCURSOR); -#line 1363 "ext/date/lib/parse_date.re" +#line 1328 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YYYY"); TIMELIB_INIT; @@@ -11006,7 -11022,15 +10987,15 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11010 "ext/date/lib/parse_date.c" -#line 11026 "ext/date/lib/parse_date.c" ++#line 10991 "ext/date/lib/parse_date.c" + yy607: + YYDEBUG(607, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '.') goto yy496; + if (yych <= '/') goto yy490; + if (yych <= '9') goto yy612; + goto yy490; yy608: YYDEBUG(608, *YYCURSOR); yyaccept = 11; @@@ -11019,30 -11047,18 +11012,18 @@@ yy609 YYDEBUG(609, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy497; - goto yy491; - } else { - if (yych <= '0') goto yy613; - if (yych <= '9') goto yy611; - goto yy491; - } + if (yych == '.') goto yy496; + if (yych <= '/') goto yy490; + if (yych >= ':') goto yy490; yy610: YYDEBUG(610, *YYCURSOR); - yyaccept = 11; + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy497; - if (yych <= '/') goto yy491; - if (yych >= ':') goto yy491; + if (yych <= '/') goto yy611; + if (yych <= '9') goto yy604; yy611: YYDEBUG(611, *YYCURSOR); - yyaccept = 12; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy612; - if (yych <= '9') goto yy605; - yy612: - YYDEBUG(612, *YYCURSOR); -#line 1375 "ext/date/lib/parse_date.re" +#line 1340 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pointed date YY"); @@@ -11055,9 -11071,9 +11036,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11059 "ext/date/lib/parse_date.c" - yy613: - YYDEBUG(613, *YYCURSOR); -#line 11075 "ext/date/lib/parse_date.c" ++#line 11040 "ext/date/lib/parse_date.c" + yy612: + YYDEBUG(612, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { @@@ -11675,28 -11699,20 +11664,20 @@@ yy655 yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { - if (yych <= '/') goto yy657; - if (yych <= '9') goto yy665; - if (yych >= 'n') goto yy661; + if (yych <= '/') goto yy656; + if (yych <= '9') goto yy664; + if (yych >= 'n') goto yy660; } else { if (yych <= 'r') { - if (yych >= 'r') goto yy662; + if (yych >= 'r') goto yy661; } else { - if (yych <= 's') goto yy660; - if (yych <= 't') goto yy663; + if (yych <= 's') goto yy659; + if (yych <= 't') goto yy662; } } - yy657: - YYDEBUG(657, *YYCURSOR); + yy656: + YYDEBUG(656, *YYCURSOR); -#line 1334 "ext/date/lib/parse_date.re" +#line 1299 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshort"); @@@ -11709,9 -11725,9 +11690,9 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 11713 "ext/date/lib/parse_date.c" - yy658: - YYDEBUG(658, *YYCURSOR); -#line 11729 "ext/date/lib/parse_date.c" ++#line 11694 "ext/date/lib/parse_date.c" + yy657: + YYDEBUG(657, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { @@@ -11807,15 -11823,15 +11788,15 @@@ yy665 } } else { if (yych <= 'r') { - if (yych >= 'r') goto yy721; + if (yych >= 'r') goto yy720; } else { - if (yych <= 's') goto yy719; - if (yych <= 't') goto yy722; + if (yych <= 's') goto yy718; + if (yych <= 't') goto yy721; } } - yy667: - YYDEBUG(667, *YYCURSOR); + yy666: + YYDEBUG(666, *YYCURSOR); -#line 1278 "ext/date/lib/parse_date.re" +#line 1243 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("americanshort | american"); @@@ -11830,9 -11846,9 +11811,9 @@@ TIMELIB_DEINIT; return TIMELIB_AMERICAN; } - #line 11834 "ext/date/lib/parse_date.c" - yy668: - YYDEBUG(668, *YYCURSOR); -#line 11850 "ext/date/lib/parse_date.c" ++#line 11815 "ext/date/lib/parse_date.c" + yy667: + YYDEBUG(667, *YYCURSOR); yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { @@@ -12037,33 -12053,33 +12018,33 @@@ yy695 } } else { if (yych <= '-') { - if (yych == ',') goto yy57; - goto yy699; + if (yych == ',') goto yy56; + goto yy698; } else { - if (yych != 'G') goto yy57; + if (yych != 'G') goto yy56; } } + YYDEBUG(697, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'M') goto yy706; + goto yy56; + yy698: YYDEBUG(698, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'M') goto yy707; - goto yy57; + if (yych <= '/') goto yy56; + if (yych <= '1') goto yy699; + if (yych <= '2') goto yy701; + if (yych <= '9') goto yy702; + goto yy56; yy699: YYDEBUG(699, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '1') goto yy700; - if (yych <= '2') goto yy702; - if (yych <= '9') goto yy703; - goto yy57; + ++YYCURSOR; + if ((yych = *YYCURSOR) <= '/') goto yy700; + if (yych <= '9') goto yy702; + if (yych <= ':') goto yy703; yy700: YYDEBUG(700, *YYCURSOR); - ++YYCURSOR; - if ((yych = *YYCURSOR) <= '/') goto yy701; - if (yych <= '9') goto yy703; - if (yych <= ':') goto yy704; - yy701: - YYDEBUG(701, *YYCURSOR); -#line 1561 "ext/date/lib/parse_date.re" +#line 1526 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("clf"); @@@ -12083,18 -12099,25 +12064,25 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12087 "ext/date/lib/parse_date.c" - yy702: - YYDEBUG(702, *YYCURSOR); -#line 12103 "ext/date/lib/parse_date.c" ++#line 12068 "ext/date/lib/parse_date.c" + yy701: + YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '5') { - if (yych <= '/') goto yy701; - if (yych >= '5') goto yy705; + if (yych <= '/') goto yy700; + if (yych >= '5') goto yy704; } else { - if (yych <= '9') goto yy706; - if (yych <= ':') goto yy704; - goto yy701; + if (yych <= '9') goto yy705; + if (yych <= ':') goto yy703; + goto yy700; } + yy702: + YYDEBUG(702, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy700; + if (yych <= '5') goto yy704; + if (yych <= '9') goto yy705; + if (yych >= ';') goto yy700; yy703: YYDEBUG(703, *YYCURSOR); yych = *++YYCURSOR; @@@ -12627,15 -12643,15 +12608,15 @@@ yy762 yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'q') { - if (yych == 'n') goto yy661; + if (yych == 'n') goto yy660; } else { - if (yych <= 'r') goto yy662; - if (yych <= 's') goto yy660; - if (yych <= 't') goto yy663; + if (yych <= 'r') goto yy661; + if (yych <= 's') goto yy659; + if (yych <= 't') goto yy662; } - yy764: - YYDEBUG(764, *YYCURSOR); + yy763: + YYDEBUG(763, *YYCURSOR); -#line 1306 "ext/date/lib/parse_date.re" +#line 1271 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("iso8601date2"); @@@ -12648,7 -12664,12 +12629,12 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 12652 "ext/date/lib/parse_date.c" -#line 12668 "ext/date/lib/parse_date.c" ++#line 12633 "ext/date/lib/parse_date.c" + yy764: + YYDEBUG(764, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'C') goto yy765; + if (yych != 'c') goto yy56; yy765: YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; @@@ -12675,19 -12697,13 +12662,13 @@@ yy768 yy769: YYDEBUG(769, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '9') goto yy771; - goto yy57; + if (yych <= '/') goto yy56; + if (yych >= '2') goto yy56; yy770: YYDEBUG(770, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= '2') goto yy57; - yy771: - YYDEBUG(771, *YYCURSOR); ++YYCURSOR; - YYDEBUG(772, *YYCURSOR); + YYDEBUG(771, *YYCURSOR); -#line 1547 "ext/date/lib/parse_date.re" +#line 1512 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextreverse"); @@@ -12700,7 -12716,13 +12681,13 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 12704 "ext/date/lib/parse_date.c" -#line 12720 "ext/date/lib/parse_date.c" ++#line 12685 "ext/date/lib/parse_date.c" + yy772: + YYDEBUG(772, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'V') goto yy765; + if (yych == 'v') goto yy765; + goto yy56; yy773: YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; @@@ -12831,14 -12847,14 +12812,14 @@@ yy782 case '6': case '7': case '8': - case '9': goto yy55; - case ':': goto yy807; - case 'W': goto yy810; - default: goto yy784; + case '9': goto yy54; + case ':': goto yy806; + case 'W': goto yy809; + default: goto yy783; } - yy784: - YYDEBUG(784, *YYCURSOR); + yy783: + YYDEBUG(783, *YYCURSOR); -#line 1582 "ext/date/lib/parse_date.re" +#line 1547 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@@ -12846,9 -12862,9 +12827,9 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12850 "ext/date/lib/parse_date.c" - yy785: - YYDEBUG(785, *YYCURSOR); -#line 12866 "ext/date/lib/parse_date.c" ++#line 12831 "ext/date/lib/parse_date.c" + yy784: + YYDEBUG(784, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch (yych) { @@@ -12946,58 -12962,58 +12927,58 @@@ yy790 YYDEBUG(-1, yych); switch (yych) { case '\t': - case ' ': goto yy790; + case ' ': goto yy789; case '-': - case '.': goto yy938; + case '.': goto yy937; case 'A': - case 'a': goto yy800; + case 'a': goto yy799; case 'D': - case 'd': goto yy804; + case 'd': goto yy803; case 'F': - case 'f': goto yy798; + case 'f': goto yy797; case 'H': - case 'h': goto yy64; - case 'I': goto yy793; + case 'h': goto yy63; + case 'I': goto yy792; case 'J': - case 'j': goto yy797; + case 'j': goto yy796; case 'M': - case 'm': goto yy799; + case 'm': goto yy798; case 'N': - case 'n': goto yy803; + case 'n': goto yy802; case 'O': - case 'o': goto yy802; + case 'o': goto yy801; case 'S': - case 's': goto yy801; + case 's': goto yy800; case 'T': - case 't': goto yy69; - case 'V': goto yy795; + case 't': goto yy68; + case 'V': goto yy794; case 'W': - case 'w': goto yy68; - case 'X': goto yy796; + case 'w': goto yy67; + case 'X': goto yy795; case 'Y': - case 'y': goto yy67; - default: goto yy57; + case 'y': goto yy66; + default: goto yy56; } + yy791: + YYDEBUG(791, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy938; + if (yych <= '0') goto yy930; + if (yych <= '2') goto yy931; + if (yych <= '3') goto yy932; + goto yy938; yy792: YYDEBUG(792, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy939; - if (yych <= '0') goto yy931; - if (yych <= '2') goto yy932; - if (yych <= '3') goto yy933; - goto yy939; - yy793: - YYDEBUG(793, *YYCURSOR); ++YYCURSOR; if ((yych = *YYCURSOR) <= 'U') { - if (yych == 'I') goto yy930; + if (yych == 'I') goto yy929; } else { - if (yych == 'W') goto yy794; - if (yych <= 'X') goto yy884; + if (yych == 'W') goto yy793; + if (yych <= 'X') goto yy883; } - yy794: - YYDEBUG(794, *YYCURSOR); + yy793: + YYDEBUG(793, *YYCURSOR); -#line 1403 "ext/date/lib/parse_date.re" +#line 1368 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenodayrev"); @@@ -13010,7 -13026,12 +12991,12 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 13014 "ext/date/lib/parse_date.c" -#line 13030 "ext/date/lib/parse_date.c" ++#line 12995 "ext/date/lib/parse_date.c" + yy794: + YYDEBUG(794, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'I') goto yy927; + goto yy793; yy795: YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; @@@ -13208,24 -13230,18 +13195,18 @@@ yy811 yy812: YYDEBUG(812, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '9') goto yy814; - goto yy57; + if (yych <= '/') goto yy56; + if (yych >= '4') goto yy56; yy813: YYDEBUG(813, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= '4') goto yy57; - yy814: - YYDEBUG(814, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy816; - if (yych <= '/') goto yy815; - if (yych <= '7') goto yy817; - yy815: - YYDEBUG(815, *YYCURSOR); + if (yych == '-') goto yy815; + if (yych <= '/') goto yy814; + if (yych <= '7') goto yy816; + yy814: + YYDEBUG(814, *YYCURSOR); -#line 1514 "ext/date/lib/parse_date.re" +#line 1479 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@@ -13243,17 -13259,17 +13224,17 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13247 "ext/date/lib/parse_date.c" -#line 13263 "ext/date/lib/parse_date.c" ++#line 13228 "ext/date/lib/parse_date.c" + yy815: + YYDEBUG(815, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy56; + if (yych >= '8') goto yy56; yy816: YYDEBUG(816, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych >= '8') goto yy57; - yy817: - YYDEBUG(817, *YYCURSOR); ++YYCURSOR; - YYDEBUG(818, *YYCURSOR); + YYDEBUG(817, *YYCURSOR); -#line 1495 "ext/date/lib/parse_date.re" +#line 1460 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweekday"); @@@ -13271,7 -13287,13 +13252,13 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13275 "ext/date/lib/parse_date.c" -#line 13291 "ext/date/lib/parse_date.c" ++#line 13256 "ext/date/lib/parse_date.c" + yy818: + YYDEBUG(818, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy60; + if (yych <= '9') goto yy820; + goto yy60; yy819: YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; @@@ -13333,9 -13349,9 +13314,9 @@@ yy820 } } } - yy822: - YYDEBUG(822, *YYCURSOR); + yy821: + YYDEBUG(821, *YYCURSOR); -#line 1481 "ext/date/lib/parse_date.re" +#line 1446 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgydotd"); @@@ -13348,7 -13364,13 +13329,13 @@@ TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } - #line 13352 "ext/date/lib/parse_date.c" -#line 13368 "ext/date/lib/parse_date.c" ++#line 13333 "ext/date/lib/parse_date.c" + yy822: + YYDEBUG(822, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy60; + if (yych <= '9') goto yy820; + goto yy60; yy823: YYDEBUG(823, *YYCURSOR); yych = *++YYCURSOR; @@@ -13439,19 -13461,13 +13426,13 @@@ yy839 yy840: YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '9') goto yy842; - goto yy57; + if (yych != '0') goto yy56; yy841: YYDEBUG(841, *YYCURSOR); - yych = *++YYCURSOR; - if (yych != '0') goto yy57; + ++YYCURSOR; yy842: YYDEBUG(842, *YYCURSOR); - ++YYCURSOR; - yy843: - YYDEBUG(843, *YYCURSOR); -#line 1455 "ext/date/lib/parse_date.re" +#line 1420 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx | exif"); @@@ -13476,20 -13492,20 +13457,20 @@@ TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } - #line 13480 "ext/date/lib/parse_date.c" - yy844: - YYDEBUG(844, *YYCURSOR); -#line 13496 "ext/date/lib/parse_date.c" ++#line 13461 "ext/date/lib/parse_date.c" + yy843: + YYDEBUG(843, *YYCURSOR); yych = *++YYCURSOR; if (yych <= '2') { - if (yych <= '/') goto yy61; - if (yych >= '1') goto yy846; + if (yych <= '/') goto yy60; + if (yych >= '1') goto yy845; } else { - if (yych <= '3') goto yy847; - if (yych <= '9') goto yy821; - goto yy61; + if (yych <= '3') goto yy846; + if (yych <= '9') goto yy820; + goto yy60; } - yy845: - YYDEBUG(845, *YYCURSOR); + yy844: + YYDEBUG(844, *YYCURSOR); yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@@ -13736,9 -13752,9 +13717,9 @@@ yy847 } } } - yy849: - YYDEBUG(849, *YYCURSOR); + yy848: + YYDEBUG(848, *YYCURSOR); -#line 1443 "ext/date/lib/parse_date.re" +#line 1408 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@@ -13749,9 -13765,9 +13730,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } - #line 13753 "ext/date/lib/parse_date.c" - yy850: - YYDEBUG(850, *YYCURSOR); -#line 13769 "ext/date/lib/parse_date.c" ++#line 13734 "ext/date/lib/parse_date.c" + yy849: + YYDEBUG(849, *YYCURSOR); yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { @@@ -14649,27 -14671,21 +14636,21 @@@ yy970 yy971: YYDEBUG(971, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'E') goto yy1025; - if (yych == 'e') goto yy1025; - goto yy57; + if (yych <= '/') goto yy56; + if (yych <= '0') goto yy810; + if (yych <= '4') goto yy811; + if (yych <= '5') goto yy812; + goto yy56; yy972: YYDEBUG(972, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '0') goto yy811; - if (yych <= '4') goto yy812; - if (yych <= '5') goto yy813; - goto yy57; - yy973: - YYDEBUG(973, *YYCURSOR); yyaccept = 22; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy977; - if (yych <= '/') goto yy974; - if (yych <= '9') goto yy996; - yy974: - YYDEBUG(974, *YYCURSOR); + if (yych == '-') goto yy976; + if (yych <= '/') goto yy973; + if (yych <= '9') goto yy995; + yy973: + YYDEBUG(973, *YYCURSOR); -#line 1320 "ext/date/lib/parse_date.re" +#line 1285 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshorter"); @@@ -14682,7 -14698,15 +14663,15 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 14686 "ext/date/lib/parse_date.c" -#line 14702 "ext/date/lib/parse_date.c" ++#line 14667 "ext/date/lib/parse_date.c" + yy974: + YYDEBUG(974, *YYCURSOR); + yyaccept = 22; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == '-') goto yy976; + if (yych <= '/') goto yy973; + if (yych <= '2') goto yy995; + goto yy973; yy975: YYDEBUG(975, *YYCURSOR); yyaccept = 22; @@@ -15671,27 -15687,27 +15652,27 @@@ yy1065 case 's': case 't': case 'w': - case 'y': goto yy791; - case '-': goto yy788; - case '.': goto yy792; - case '/': goto yy789; - case '0': goto yy1069; - case '1': goto yy1070; - case '2': goto yy1071; - case '3': goto yy1072; + case 'y': goto yy790; + case '-': goto yy787; + case '.': goto yy791; + case '/': goto yy788; + case '0': goto yy1068; + case '1': goto yy1069; + case '2': goto yy1070; + case '3': goto yy1071; case '4': - case '5': goto yy1073; - case '6': goto yy1074; + case '5': goto yy1072; + case '6': goto yy1073; case '7': case '8': - case '9': goto yy55; - case ':': goto yy807; - case 'W': goto yy810; - default: goto yy1068; + case '9': goto yy54; + case ':': goto yy806; + case 'W': goto yy809; + default: goto yy1067; } - yy1068: - YYDEBUG(1068, *YYCURSOR); + yy1067: + YYDEBUG(1067, *YYCURSOR); -#line 1212 "ext/date/lib/parse_date.re" +#line 1177 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@@ -15713,7 -15729,14 +15694,14 @@@ TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } - #line 15717 "ext/date/lib/parse_date.c" -#line 15733 "ext/date/lib/parse_date.c" ++#line 15698 "ext/date/lib/parse_date.c" + yy1068: + YYDEBUG(1068, *YYCURSOR); + yych = *++YYCURSOR; + if (yych <= '/') goto yy60; + if (yych <= '0') goto yy1080; + if (yych <= '9') goto yy1081; + goto yy60; yy1069: YYDEBUG(1069, *YYCURSOR); yych = *++YYCURSOR; @@@ -15803,9 -15819,9 +15784,9 @@@ yy1074 } } } - yy1076: - YYDEBUG(1076, *YYCURSOR); + yy1075: + YYDEBUG(1075, *YYCURSOR); -#line 1258 "ext/date/lib/parse_date.re" +#line 1223 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@@ -15824,9 -15840,9 +15805,9 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } - #line 15828 "ext/date/lib/parse_date.c" - yy1077: - YYDEBUG(1077, *YYCURSOR); -#line 15844 "ext/date/lib/parse_date.c" ++#line 15809 "ext/date/lib/parse_date.c" + yy1076: + YYDEBUG(1076, *YYCURSOR); yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@@ -16706,23 -16727,18 +16692,18 @@@ yy1116 yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1119; - if (yych >= ' ') goto yy1119; + if (yych == '\t') goto yy1118; + if (yych >= ' ') goto yy1118; } else { if (yych <= 'S') { - if (yych >= 'S') goto yy1121; + if (yych >= 'S') goto yy1120; } else { - if (yych == 's') goto yy1121; + if (yych == 's') goto yy1120; } } - yy1118: - YYDEBUG(1118, *YYCURSOR); + yy1117: + YYDEBUG(1117, *YYCURSOR); -#line 1654 "ext/date/lib/parse_date.re" +#line 1619 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16738,9 -16754,9 +16719,9 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16742 "ext/date/lib/parse_date.c" - yy1119: - YYDEBUG(1119, *YYCURSOR); -#line 16758 "ext/date/lib/parse_date.c" ++#line 16723 "ext/date/lib/parse_date.c" + yy1118: + YYDEBUG(1118, *YYCURSOR); ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; @@@ -16766,30 -16787,25 +16752,25 @@@ yy1121 yy1122: YYDEBUG(1122, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'A') goto yy1123; - if (yych != 'a') goto yy57; + if (yych == 'Y') goto yy1123; + if (yych != 'y') goto yy56; yy1123: YYDEBUG(1123, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'Y') goto yy1124; - if (yych != 'y') goto yy57; - yy1124: - YYDEBUG(1124, *YYCURSOR); yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '\t') goto yy1119; - if (yych == ' ') goto yy1119; - goto yy1118; + if (yych == '\t') goto yy1118; + if (yych == ' ') goto yy1118; + goto yy1117; + yy1124: + YYDEBUG(1124, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'F') goto yy1125; + if (yych != 'f') goto yy56; yy1125: YYDEBUG(1125, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'F') goto yy1126; - if (yych != 'f') goto yy57; - yy1126: - YYDEBUG(1126, *YYCURSOR); ++YYCURSOR; - YYDEBUG(1127, *YYCURSOR); + YYDEBUG(1126, *YYCURSOR); -#line 1127 "ext/date/lib/parse_date.re" +#line 1092 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16810,9 -16826,9 +16791,9 @@@ TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } - #line 16814 "ext/date/lib/parse_date.c" - yy1128: - YYDEBUG(1128, *YYCURSOR); -#line 16830 "ext/date/lib/parse_date.c" ++#line 16795 "ext/date/lib/parse_date.c" + yy1127: + YYDEBUG(1127, *YYCURSOR); yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { @@@ -16901,24 -16923,18 +16888,18 @@@ yy1140 yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'S') { - if (yych == 'D') goto yy1144; - if (yych >= 'S') goto yy1143; + if (yych == 'D') goto yy1143; + if (yych >= 'S') goto yy1142; } else { if (yych <= 'd') { - if (yych >= 'd') goto yy1144; + if (yych >= 'd') goto yy1143; } else { - if (yych == 's') goto yy1143; + if (yych == 's') goto yy1142; } } - yy1142: - YYDEBUG(1142, *YYCURSOR); + yy1141: + YYDEBUG(1141, *YYCURSOR); -#line 1630 "ext/date/lib/parse_date.re" +#line 1595 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16941,7 -16957,11 +16922,11 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16945 "ext/date/lib/parse_date.c" -#line 16961 "ext/date/lib/parse_date.c" ++#line 16926 "ext/date/lib/parse_date.c" + yy1142: + YYDEBUG(1142, *YYCURSOR); + yych = *++YYCURSOR; + goto yy1117; yy1143: YYDEBUG(1143, *YYCURSOR); yych = *++YYCURSOR; @@@ -19596,29 -19617,24 +19582,24 @@@ yy1290 yy1291: YYDEBUG(1291, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'F') goto yy1292; - if (yych != 'f') goto yy57; - yy1292: + if (yych != ' ') goto yy56; YYDEBUG(1292, *YYCURSOR); yych = *++YYCURSOR; - if (yych != ' ') goto yy57; + if (yych <= '/') goto yy56; + if (yych <= '1') goto yy1293; + if (yych <= '2') goto yy1295; + if (yych <= '9') goto yy1296; + goto yy56; + yy1293: YYDEBUG(1293, *YYCURSOR); - yych = *++YYCURSOR; - if (yych <= '/') goto yy57; - if (yych <= '1') goto yy1294; - if (yych <= '2') goto yy1296; - if (yych <= '9') goto yy1297; - goto yy57; - yy1294: - YYDEBUG(1294, *YYCURSOR); yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1298; - if (yych <= '9') goto yy1297; - goto yy1298; - yy1295: - YYDEBUG(1295, *YYCURSOR); + if (yych <= '/') goto yy1297; + if (yych <= '9') goto yy1296; + goto yy1297; + yy1294: + YYDEBUG(1294, *YYCURSOR); -#line 1104 "ext/date/lib/parse_date.re" +#line 1069 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@@ -19640,15 -19656,15 +19621,15 @@@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 19644 "ext/date/lib/parse_date.c" - yy1296: - YYDEBUG(1296, *YYCURSOR); -#line 19660 "ext/date/lib/parse_date.c" ++#line 19625 "ext/date/lib/parse_date.c" + yy1295: + YYDEBUG(1295, *YYCURSOR); yyaccept = 28; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1298; - if (yych >= '5') goto yy1298; - yy1297: - YYDEBUG(1297, *YYCURSOR); + if (yych <= '/') goto yy1297; + if (yych >= '5') goto yy1297; + yy1296: + YYDEBUG(1296, *YYCURSOR); yyaccept = 28; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); @@@ -19877,30 -19898,42 +19863,42 @@@ yy1312 yyaccept = 26; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { - if (yych != ' ') goto yy1118; + if (yych != ' ') goto yy1117; } else { - if (yych <= 'S') goto yy1143; - if (yych == 's') goto yy1143; - goto yy1118; + if (yych <= 'S') goto yy1142; + if (yych == 's') goto yy1142; + goto yy1117; } + YYDEBUG(1313, *YYCURSOR); + yych = *++YYCURSOR; + if (yych == 'O') goto yy1314; + if (yych != 'o') goto yy56; + yy1314: YYDEBUG(1314, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy1315; - if (yych != 'o') goto yy57; + if (yych == 'F') goto yy1315; + if (yych != 'f') goto yy56; yy1315: YYDEBUG(1315, *YYCURSOR); - yych = *++YYCURSOR; - if (yych == 'F') goto yy1316; - if (yych != 'f') goto yy57; - yy1316: + ++YYCURSOR; YYDEBUG(1316, *YYCURSOR); - yych = *++YYCURSOR; - goto yy2; -#line 1087 "ext/date/lib/parse_date.re" ++#line 1052 "ext/date/lib/parse_date.re" + { + DEBUG_OUTPUT("firstdayof | lastdayof"); + TIMELIB_INIT; + TIMELIB_HAVE_RELATIVE(); + + /* skip "last day of" or "first day of" */ + if (*ptr == 'l') { + s->time->relative.first_last_day_of = 2; + } else { + s->time->relative.first_last_day_of = 1; + } + + TIMELIB_DEINIT; + return TIMELIB_LF_DAY_OF_MONTH; + } -#line 19937 "ext/date/lib/parse_date.c" ++#line 19902 "ext/date/lib/parse_date.c" yy1317: YYDEBUG(1317, *YYCURSOR); yyaccept = 0; @@@ -21356,7 -21389,7 +21354,7 @@@ yy1387 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21360 "ext/date/lib/parse_date.c" -#line 21393 "ext/date/lib/parse_date.c" ++#line 21358 "ext/date/lib/parse_date.c" yy1388: YYDEBUG(1388, *YYCURSOR); yych = *++YYCURSOR; @@@ -21803,7 -21836,7 +21801,7 @@@ yy1417 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21807 "ext/date/lib/parse_date.c" -#line 21840 "ext/date/lib/parse_date.c" ++#line 21805 "ext/date/lib/parse_date.c" yy1418: YYDEBUG(1418, *YYCURSOR); yych = *++YYCURSOR; @@@ -21847,7 -21880,7 +21845,7 @@@ yy1420 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21851 "ext/date/lib/parse_date.c" -#line 21884 "ext/date/lib/parse_date.c" ++#line 21849 "ext/date/lib/parse_date.c" yy1421: YYDEBUG(1421, *YYCURSOR); yych = *++YYCURSOR; @@@ -23867,7 -23900,7 +23865,7 @@@ yy1500 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 23871 "ext/date/lib/parse_date.c" -#line 23904 "ext/date/lib/parse_date.c" ++#line 23869 "ext/date/lib/parse_date.c" yy1501: YYDEBUG(1501, *YYCURSOR); yych = *++YYCURSOR; @@@ -24017,7 -24050,7 +24015,7 @@@ yy1508 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24021 "ext/date/lib/parse_date.c" -#line 24054 "ext/date/lib/parse_date.c" ++#line 24019 "ext/date/lib/parse_date.c" yy1509: YYDEBUG(1509, *YYCURSOR); yyaccept = 0; @@@ -24561,7 -24594,7 +24559,7 @@@ yy1531 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24565 "ext/date/lib/parse_date.c" -#line 24598 "ext/date/lib/parse_date.c" ++#line 24563 "ext/date/lib/parse_date.c" yy1532: YYDEBUG(1532, *YYCURSOR); yyaccept = 0;