com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/lib/ parse_date.c ext/date/lib/parse_date.re
| From: | Stanislav Malyshev | Date: | Wed, 14 May 2014 00:02:09 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/date/lib/ parse_date.c ext/date/lib/parse_date.re | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78330@lists.php.net to get a copy of this message | ||
Commit: a03a1ab88cd2c62f04c77acf16bcab757552fd35
Author: Stanislav Malyshev <stas@php.net> Tue, 13 May 2014 17:02:09 -0700
Parents: e3a48b3a43eb486ae969729616acfe994977b7be dc92e81922405646f4e7f124d96643243088e0a6
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a03a1ab88cd2c62f04c77acf16bcab757552fd35
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
Bugs:
https://bugs.php.net/67253
https://bugs.php.net/67252
https://bugs.php.net/67251
https://bugs.php.net/67250
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 fd67d8b,d7db06f..348482c --- 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 Thu Feb 6 07:35:53 2014 */ -/* Generated by re2c 0.13.5 on Tue May 13 16:52:44 2014 */ ++/* Generated by re2c 0.13.5 on Tue May 13 17:01:57 2014 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@@ -837,11 -875,11 +840,11 @@@ static int scan(Scanner *s, timelib_tz_ std: s->tok = cursor; s->len = 0; - #line 963 "ext/date/lib/parse_date.re" -#line 1001 "ext/date/lib/parse_date.re" ++#line 966 "ext/date/lib/parse_date.re" - #line 845 "ext/date/lib/parse_date.c" -#line 883 "ext/date/lib/parse_date.c" ++#line 848 "ext/date/lib/parse_date.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@@ -961,7 -999,7 +964,7 @@@ } yy2: YYDEBUG(2, *YYCURSOR); - #line 1049 "ext/date/lib/parse_date.re" -#line 1087 "ext/date/lib/parse_date.re" ++#line 1052 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("firstdayof | lastdayof"); TIMELIB_INIT; @@@ -977,7 -1015,7 +980,7 @@@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 981 "ext/date/lib/parse_date.c" -#line 1019 "ext/date/lib/parse_date.c" ++#line 984 "ext/date/lib/parse_date.c" yy3: YYDEBUG(3, *YYCURSOR); ++YYCURSOR; @@@ -1000,7 -1038,7 +1003,7 @@@ } yy4: YYDEBUG(4, *YYCURSOR); - #line 1643 "ext/date/lib/parse_date.re" -#line 1681 "ext/date/lib/parse_date.re" ++#line 1646 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("tzcorrection | tz"); @@@ -1013,7 -1051,7 +1016,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } - #line 1017 "ext/date/lib/parse_date.c" -#line 1055 "ext/date/lib/parse_date.c" ++#line 1020 "ext/date/lib/parse_date.c" yy5: YYDEBUG(5, *YYCURSOR); yych = *++YYCURSOR; @@@ -1324,12 -1362,12 +1327,12 @@@ yy12 if (yych <= '9') goto yy1385; yy13: YYDEBUG(13, *YYCURSOR); - #line 1738 "ext/date/lib/parse_date.re" -#line 1776 "ext/date/lib/parse_date.re" ++#line 1741 "ext/date/lib/parse_date.re" { add_error(s, "Unexpected character"); goto std; } - #line 1333 "ext/date/lib/parse_date.c" -#line 1371 "ext/date/lib/parse_date.c" ++#line 1336 "ext/date/lib/parse_date.c" yy14: YYDEBUG(14, *YYCURSOR); yych = *++YYCURSOR; @@@ -2386,11 -2424,11 +2389,11 @@@ yy49 if (yych <= '9') goto yy55; yy50: YYDEBUG(50, *YYCURSOR); - #line 1727 "ext/date/lib/parse_date.re" -#line 1765 "ext/date/lib/parse_date.re" ++#line 1730 "ext/date/lib/parse_date.re" { goto std; } - #line 2394 "ext/date/lib/parse_date.c" -#line 2432 "ext/date/lib/parse_date.c" ++#line 2397 "ext/date/lib/parse_date.c" yy51: YYDEBUG(51, *YYCURSOR); yych = *++YYCURSOR; @@@ -2399,12 -2437,12 +2402,12 @@@ yy52 YYDEBUG(52, *YYCURSOR); ++YYCURSOR; YYDEBUG(53, *YYCURSOR); - #line 1732 "ext/date/lib/parse_date.re" -#line 1770 "ext/date/lib/parse_date.re" ++#line 1735 "ext/date/lib/parse_date.re" { s->pos = cursor; s->line++; goto std; } - #line 2408 "ext/date/lib/parse_date.c" -#line 2446 "ext/date/lib/parse_date.c" ++#line 2411 "ext/date/lib/parse_date.c" yy54: YYDEBUG(54, *YYCURSOR); yych = *++YYCURSOR; @@@ -2791,7 -2829,7 +2794,7 @@@ yy72 if (yych == 's') goto yy74; yy73: YYDEBUG(73, *YYCURSOR); - #line 1711 "ext/date/lib/parse_date.re" -#line 1749 "ext/date/lib/parse_date.re" ++#line 1714 "ext/date/lib/parse_date.re" { timelib_ull i; DEBUG_OUTPUT("relative"); @@@ -2806,7 -2844,7 +2809,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 2810 "ext/date/lib/parse_date.c" -#line 2848 "ext/date/lib/parse_date.c" ++#line 2813 "ext/date/lib/parse_date.c" yy74: YYDEBUG(74, *YYCURSOR); yych = *++YYCURSOR; @@@ -3568,7 -3606,7 +3571,7 @@@ yy166 } yy167: YYDEBUG(167, *YYCURSOR); - #line 1574 "ext/date/lib/parse_date.re" -#line 1612 "ext/date/lib/parse_date.re" ++#line 1577 "ext/date/lib/parse_date.re" { const timelib_relunit* relunit; DEBUG_OUTPUT("daytext"); @@@ -3585,7 -3623,7 +3588,7 @@@ TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } - #line 3589 "ext/date/lib/parse_date.c" -#line 3627 "ext/date/lib/parse_date.c" ++#line 3592 "ext/date/lib/parse_date.c" yy168: YYDEBUG(168, *YYCURSOR); yych = *++YYCURSOR; @@@ -4105,7 -4143,7 +4108,7 @@@ yy193 } yy194: YYDEBUG(194, *YYCURSOR); - #line 1633 "ext/date/lib/parse_date.re" -#line 1671 "ext/date/lib/parse_date.re" ++#line 1636 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("monthtext"); TIMELIB_INIT; @@@ -4114,7 -4152,7 +4117,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4118 "ext/date/lib/parse_date.c" -#line 4156 "ext/date/lib/parse_date.c" ++#line 4121 "ext/date/lib/parse_date.c" yy195: YYDEBUG(195, *YYCURSOR); ++YYCURSOR; @@@ -4165,7 -4203,7 +4168,7 @@@ yy198 } yy199: YYDEBUG(199, *YYCURSOR); - #line 1379 "ext/date/lib/parse_date.re" -#line 1417 "ext/date/lib/parse_date.re" ++#line 1382 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datetextual | datenoyear"); @@@ -4178,7 -4216,7 +4181,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4182 "ext/date/lib/parse_date.c" -#line 4220 "ext/date/lib/parse_date.c" ++#line 4185 "ext/date/lib/parse_date.c" yy200: YYDEBUG(200, *YYCURSOR); yyaccept = 6; @@@ -4447,7 -4485,7 +4450,7 @@@ yy222 } yy223: YYDEBUG(223, *YYCURSOR); - #line 1681 "ext/date/lib/parse_date.re" -#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"); @@@ -4476,7 -4514,7 +4479,7 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 4480 "ext/date/lib/parse_date.c" -#line 4518 "ext/date/lib/parse_date.c" ++#line 4483 "ext/date/lib/parse_date.c" yy224: YYDEBUG(224, *YYCURSOR); yyaccept = 7; @@@ -5174,7 -5212,7 +5177,7 @@@ yy278 YYDEBUG(278, *YYCURSOR); ++YYCURSOR; YYDEBUG(279, *YYCURSOR); - #line 1657 "ext/date/lib/parse_date.re" -#line 1695 "ext/date/lib/parse_date.re" ++#line 1660 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); TIMELIB_INIT; @@@ -5197,7 -5235,7 +5200,7 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 5201 "ext/date/lib/parse_date.c" -#line 5239 "ext/date/lib/parse_date.c" ++#line 5204 "ext/date/lib/parse_date.c" yy280: YYDEBUG(280, *YYCURSOR); yych = *++YYCURSOR; @@@ -5375,7 -5413,7 +5378,7 @@@ yy294 ++YYCURSOR; yy295: YYDEBUG(295, *YYCURSOR); - #line 1351 "ext/date/lib/parse_date.re" -#line 1389 "ext/date/lib/parse_date.re" ++#line 1354 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenoday"); @@@ -5388,7 -5426,7 +5391,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 5392 "ext/date/lib/parse_date.c" -#line 5430 "ext/date/lib/parse_date.c" ++#line 5395 "ext/date/lib/parse_date.c" yy296: YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; @@@ -6608,7 -6646,7 +6611,7 @@@ yy362 if (yych <= '9') goto yy365; yy364: YYDEBUG(364, *YYCURSOR); - #line 1495 "ext/date/lib/parse_date.re" -#line 1533 "ext/date/lib/parse_date.re" ++#line 1498 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextshort"); @@@ -6621,7 -6659,7 +6624,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 6625 "ext/date/lib/parse_date.c" -#line 6663 "ext/date/lib/parse_date.c" ++#line 6628 "ext/date/lib/parse_date.c" yy365: YYDEBUG(365, *YYCURSOR); yych = *++YYCURSOR; @@@ -7259,7 -7297,7 +7262,7 @@@ yy392 } yy393: YYDEBUG(393, *YYCURSOR); - #line 1553 "ext/date/lib/parse_date.re" -#line 1591 "ext/date/lib/parse_date.re" ++#line 1556 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@@ -7279,7 -7317,7 +7282,7 @@@ TIMELIB_DEINIT; return TIMELIB_AGO; } - #line 7283 "ext/date/lib/parse_date.c" -#line 7321 "ext/date/lib/parse_date.c" ++#line 7286 "ext/date/lib/parse_date.c" yy394: YYDEBUG(394, *YYCURSOR); yyaccept = 5; @@@ -9029,7 -9067,7 +9032,7 @@@ yy454 ++YYCURSOR; yy455: YYDEBUG(455, *YYCURSOR); - #line 1256 "ext/date/lib/parse_date.re" -#line 1294 "ext/date/lib/parse_date.re" ++#line 1259 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@@ -9040,7 -9078,7 +9043,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 9044 "ext/date/lib/parse_date.c" -#line 9082 "ext/date/lib/parse_date.c" ++#line 9047 "ext/date/lib/parse_date.c" yy456: YYDEBUG(456, *YYCURSOR); yyaccept = 0; @@@ -9600,7 -9638,7 +9603,7 @@@ yy475 } yy476: YYDEBUG(476, *YYCURSOR); - #line 1393 "ext/date/lib/parse_date.re" -#line 1431 "ext/date/lib/parse_date.re" ++#line 1396 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@@ -9611,7 -9649,7 +9614,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 9615 "ext/date/lib/parse_date.c" -#line 9653 "ext/date/lib/parse_date.c" ++#line 9618 "ext/date/lib/parse_date.c" yy477: YYDEBUG(477, *YYCURSOR); yyaccept = 10; @@@ -9752,7 -9790,7 +9755,7 @@@ yy488 YYDEBUG(488, *YYCURSOR); ++YYCURSOR; YYDEBUG(489, *YYCURSOR); - #line 1111 "ext/date/lib/parse_date.re" -#line 1149 "ext/date/lib/parse_date.re" ++#line 1114 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); TIMELIB_INIT; @@@ -9768,7 -9806,7 +9771,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME12; } - #line 9772 "ext/date/lib/parse_date.c" -#line 9810 "ext/date/lib/parse_date.c" ++#line 9775 "ext/date/lib/parse_date.c" yy490: YYDEBUG(490, *YYCURSOR); yyaccept = 11; @@@ -9781,7 -9819,7 +9784,7 @@@ } yy491: YYDEBUG(491, *YYCURSOR); - #line 1148 "ext/date/lib/parse_date.re" -#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"); @@@ -9806,7 -9844,7 +9809,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 9810 "ext/date/lib/parse_date.c" -#line 9848 "ext/date/lib/parse_date.c" ++#line 9813 "ext/date/lib/parse_date.c" yy492: YYDEBUG(492, *YYCURSOR); yyaccept = 11; @@@ -10116,7 -10154,7 +10119,7 @@@ yy523 YYDEBUG(523, *YYCURSOR); ++YYCURSOR; YYDEBUG(524, *YYCURSOR); - #line 1128 "ext/date/lib/parse_date.re" -#line 1166 "ext/date/lib/parse_date.re" ++#line 1131 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("mssqltime"); TIMELIB_INIT; @@@ -10135,7 -10173,7 +10138,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 10139 "ext/date/lib/parse_date.c" -#line 10177 "ext/date/lib/parse_date.c" ++#line 10142 "ext/date/lib/parse_date.c" yy525: YYDEBUG(525, *YYCURSOR); yyaccept = 11; @@@ -10241,7 -10279,7 +10244,7 @@@ yy534 if (yych <= '9') goto yy541; yy535: YYDEBUG(535, *YYCURSOR); - #line 1310 "ext/date/lib/parse_date.re" -#line 1348 "ext/date/lib/parse_date.re" ++#line 1313 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datefull"); @@@ -10255,7 -10293,7 +10258,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } - #line 10259 "ext/date/lib/parse_date.c" -#line 10297 "ext/date/lib/parse_date.c" ++#line 10262 "ext/date/lib/parse_date.c" yy536: YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; @@@ -10992,7 -11030,7 +10995,7 @@@ yy605 YYDEBUG(606, *YYCURSOR); ++YYCURSOR; YYDEBUG(607, *YYCURSOR); - #line 1325 "ext/date/lib/parse_date.re" -#line 1363 "ext/date/lib/parse_date.re" ++#line 1328 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YYYY"); TIMELIB_INIT; @@@ -11003,7 -11041,7 +11006,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11007 "ext/date/lib/parse_date.c" -#line 11045 "ext/date/lib/parse_date.c" ++#line 11010 "ext/date/lib/parse_date.c" yy608: YYDEBUG(608, *YYCURSOR); yyaccept = 11; @@@ -11039,7 -11077,7 +11042,7 @@@ yy611 if (yych <= '9') goto yy605; yy612: YYDEBUG(612, *YYCURSOR); - #line 1337 "ext/date/lib/parse_date.re" -#line 1375 "ext/date/lib/parse_date.re" ++#line 1340 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pointed date YY"); @@@ -11052,7 -11090,7 +11055,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11056 "ext/date/lib/parse_date.c" -#line 11094 "ext/date/lib/parse_date.c" ++#line 11059 "ext/date/lib/parse_date.c" yy613: YYDEBUG(613, *YYCURSOR); yyaccept = 11; @@@ -11693,7 -11731,7 +11696,7 @@@ yy656 } yy657: YYDEBUG(657, *YYCURSOR); - #line 1296 "ext/date/lib/parse_date.re" -#line 1334 "ext/date/lib/parse_date.re" ++#line 1299 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshort"); @@@ -11706,7 -11744,7 +11709,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 11710 "ext/date/lib/parse_date.c" -#line 11748 "ext/date/lib/parse_date.c" ++#line 11713 "ext/date/lib/parse_date.c" yy658: YYDEBUG(658, *YYCURSOR); yyaccept = 13; @@@ -11812,7 -11850,7 +11815,7 @@@ yy666 } yy667: YYDEBUG(667, *YYCURSOR); - #line 1240 "ext/date/lib/parse_date.re" -#line 1278 "ext/date/lib/parse_date.re" ++#line 1243 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("americanshort | american"); @@@ -11827,7 -11865,7 +11830,7 @@@ TIMELIB_DEINIT; return TIMELIB_AMERICAN; } - #line 11831 "ext/date/lib/parse_date.c" -#line 11869 "ext/date/lib/parse_date.c" ++#line 11834 "ext/date/lib/parse_date.c" yy668: YYDEBUG(668, *YYCURSOR); yyaccept = 14; @@@ -12060,7 -12098,7 +12063,7 @@@ yy700 if (yych <= ':') goto yy704; yy701: YYDEBUG(701, *YYCURSOR); - #line 1523 "ext/date/lib/parse_date.re" -#line 1561 "ext/date/lib/parse_date.re" ++#line 1526 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("clf"); @@@ -12080,7 -12118,7 +12083,7 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12084 "ext/date/lib/parse_date.c" -#line 12122 "ext/date/lib/parse_date.c" ++#line 12087 "ext/date/lib/parse_date.c" yy702: YYDEBUG(702, *YYCURSOR); yych = *++YYCURSOR; @@@ -12632,7 -12670,7 +12635,7 @@@ yy763 } yy764: YYDEBUG(764, *YYCURSOR); - #line 1268 "ext/date/lib/parse_date.re" -#line 1306 "ext/date/lib/parse_date.re" ++#line 1271 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("iso8601date2"); @@@ -12645,7 -12683,7 +12648,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 12649 "ext/date/lib/parse_date.c" -#line 12687 "ext/date/lib/parse_date.c" ++#line 12652 "ext/date/lib/parse_date.c" yy765: YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; @@@ -12684,7 -12722,7 +12687,7 @@@ yy771 YYDEBUG(771, *YYCURSOR); ++YYCURSOR; YYDEBUG(772, *YYCURSOR); - #line 1509 "ext/date/lib/parse_date.re" -#line 1547 "ext/date/lib/parse_date.re" ++#line 1512 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextreverse"); @@@ -12697,7 -12735,7 +12700,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 12701 "ext/date/lib/parse_date.c" -#line 12739 "ext/date/lib/parse_date.c" ++#line 12704 "ext/date/lib/parse_date.c" yy773: YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; @@@ -12835,7 -12873,7 +12838,7 @@@ yy783 } yy784: YYDEBUG(784, *YYCURSOR); - #line 1544 "ext/date/lib/parse_date.re" -#line 1582 "ext/date/lib/parse_date.re" ++#line 1547 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@@ -12843,7 -12881,7 +12846,7 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12847 "ext/date/lib/parse_date.c" -#line 12885 "ext/date/lib/parse_date.c" ++#line 12850 "ext/date/lib/parse_date.c" yy785: YYDEBUG(785, *YYCURSOR); yych = *++YYCURSOR; @@@ -12994,7 -13032,7 +12997,7 @@@ yy793 } yy794: YYDEBUG(794, *YYCURSOR); - #line 1365 "ext/date/lib/parse_date.re" -#line 1403 "ext/date/lib/parse_date.re" ++#line 1368 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenodayrev"); @@@ -13007,7 -13045,7 +13010,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 13011 "ext/date/lib/parse_date.c" -#line 13049 "ext/date/lib/parse_date.c" ++#line 13014 "ext/date/lib/parse_date.c" yy795: YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; @@@ -13222,7 -13260,7 +13225,7 @@@ yy814 if (yych <= '7') goto yy817; yy815: YYDEBUG(815, *YYCURSOR); - #line 1476 "ext/date/lib/parse_date.re" -#line 1514 "ext/date/lib/parse_date.re" ++#line 1479 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@@ -13240,7 -13278,7 +13243,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13244 "ext/date/lib/parse_date.c" -#line 13282 "ext/date/lib/parse_date.c" ++#line 13247 "ext/date/lib/parse_date.c" yy816: YYDEBUG(816, *YYCURSOR); yych = *++YYCURSOR; @@@ -13250,7 -13288,7 +13253,7 @@@ yy817 YYDEBUG(817, *YYCURSOR); ++YYCURSOR; YYDEBUG(818, *YYCURSOR); - #line 1457 "ext/date/lib/parse_date.re" -#line 1495 "ext/date/lib/parse_date.re" ++#line 1460 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweekday"); @@@ -13268,7 -13306,7 +13271,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13272 "ext/date/lib/parse_date.c" -#line 13310 "ext/date/lib/parse_date.c" ++#line 13275 "ext/date/lib/parse_date.c" yy819: YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; @@@ -13332,7 -13370,7 +13335,7 @@@ yy821 } yy822: YYDEBUG(822, *YYCURSOR); - #line 1443 "ext/date/lib/parse_date.re" -#line 1481 "ext/date/lib/parse_date.re" ++#line 1446 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgydotd"); @@@ -13345,7 -13383,7 +13348,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } - #line 13349 "ext/date/lib/parse_date.c" -#line 13387 "ext/date/lib/parse_date.c" ++#line 13352 "ext/date/lib/parse_date.c" yy823: YYDEBUG(823, *YYCURSOR); yych = *++YYCURSOR; @@@ -13448,7 -13486,7 +13451,7 @@@ yy842 ++YYCURSOR; yy843: YYDEBUG(843, *YYCURSOR); - #line 1417 "ext/date/lib/parse_date.re" -#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"); @@@ -13473,7 -13511,7 +13476,7 @@@ TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } - #line 13477 "ext/date/lib/parse_date.c" -#line 13515 "ext/date/lib/parse_date.c" ++#line 13480 "ext/date/lib/parse_date.c" yy844: YYDEBUG(844, *YYCURSOR); yych = *++YYCURSOR; @@@ -13735,7 -13773,7 +13738,7 @@@ yy848 } yy849: YYDEBUG(849, *YYCURSOR); - #line 1405 "ext/date/lib/parse_date.re" -#line 1443 "ext/date/lib/parse_date.re" ++#line 1408 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@@ -13746,7 -13784,7 +13749,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } - #line 13750 "ext/date/lib/parse_date.c" -#line 13788 "ext/date/lib/parse_date.c" ++#line 13753 "ext/date/lib/parse_date.c" yy850: YYDEBUG(850, *YYCURSOR); yych = *++YYCURSOR; @@@ -14666,7 -14704,7 +14669,7 @@@ yy973 if (yych <= '9') goto yy996; yy974: YYDEBUG(974, *YYCURSOR); - #line 1282 "ext/date/lib/parse_date.re" -#line 1320 "ext/date/lib/parse_date.re" ++#line 1285 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshorter"); @@@ -14679,7 -14717,7 +14682,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 14683 "ext/date/lib/parse_date.c" -#line 14721 "ext/date/lib/parse_date.c" ++#line 14686 "ext/date/lib/parse_date.c" yy975: YYDEBUG(975, *YYCURSOR); yyaccept = 22; @@@ -15688,7 -15726,7 +15691,7 @@@ yy1066 } yy1068: YYDEBUG(1068, *YYCURSOR); - #line 1174 "ext/date/lib/parse_date.re" -#line 1212 "ext/date/lib/parse_date.re" ++#line 1177 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@@ -15710,7 -15748,7 +15713,7 @@@ TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } - #line 15714 "ext/date/lib/parse_date.c" -#line 15752 "ext/date/lib/parse_date.c" ++#line 15717 "ext/date/lib/parse_date.c" yy1069: YYDEBUG(1069, *YYCURSOR); yych = *++YYCURSOR; @@@ -15802,7 -15840,7 +15805,7 @@@ yy1075 } yy1076: YYDEBUG(1076, *YYCURSOR); - #line 1220 "ext/date/lib/parse_date.re" -#line 1258 "ext/date/lib/parse_date.re" ++#line 1223 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@@ -15821,7 -15859,7 +15824,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } - #line 15825 "ext/date/lib/parse_date.c" -#line 15863 "ext/date/lib/parse_date.c" ++#line 15828 "ext/date/lib/parse_date.c" yy1077: YYDEBUG(1077, *YYCURSOR); yyaccept = 25; @@@ -16719,7 -16757,7 +16722,7 @@@ yy1117 } yy1118: YYDEBUG(1118, *YYCURSOR); - #line 1616 "ext/date/lib/parse_date.re" -#line 1654 "ext/date/lib/parse_date.re" ++#line 1619 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16735,7 -16773,7 +16738,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16739 "ext/date/lib/parse_date.c" -#line 16777 "ext/date/lib/parse_date.c" ++#line 16742 "ext/date/lib/parse_date.c" yy1119: YYDEBUG(1119, *YYCURSOR); ++YYCURSOR; @@@ -16786,7 -16824,7 +16789,7 @@@ yy1126 YYDEBUG(1126, *YYCURSOR); ++YYCURSOR; YYDEBUG(1127, *YYCURSOR); - #line 1089 "ext/date/lib/parse_date.re" -#line 1127 "ext/date/lib/parse_date.re" ++#line 1092 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16807,7 -16845,7 +16810,7 @@@ TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } - #line 16811 "ext/date/lib/parse_date.c" -#line 16849 "ext/date/lib/parse_date.c" ++#line 16814 "ext/date/lib/parse_date.c" yy1128: YYDEBUG(1128, *YYCURSOR); yyaccept = 26; @@@ -16915,7 -16953,7 +16918,7 @@@ yy1141 } yy1142: YYDEBUG(1142, *YYCURSOR); - #line 1592 "ext/date/lib/parse_date.re" -#line 1630 "ext/date/lib/parse_date.re" ++#line 1595 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16938,7 -16976,7 +16941,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16942 "ext/date/lib/parse_date.c" -#line 16980 "ext/date/lib/parse_date.c" ++#line 16945 "ext/date/lib/parse_date.c" yy1143: YYDEBUG(1143, *YYCURSOR); yych = *++YYCURSOR; @@@ -19615,7 -19653,7 +19618,7 @@@ yy1294 goto yy1298; yy1295: YYDEBUG(1295, *YYCURSOR); - #line 1066 "ext/date/lib/parse_date.re" -#line 1104 "ext/date/lib/parse_date.re" ++#line 1069 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@@ -19637,7 -19675,7 +19640,7 @@@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 19641 "ext/date/lib/parse_date.c" -#line 19679 "ext/date/lib/parse_date.c" ++#line 19644 "ext/date/lib/parse_date.c" yy1296: YYDEBUG(1296, *YYCURSOR); yyaccept = 28; @@@ -21328,7 -21366,7 +21331,7 @@@ yy1385 if (yych <= '9') goto yy1385; yy1387: YYDEBUG(1387, *YYCURSOR); - #line 1023 "ext/date/lib/parse_date.re" -#line 1061 "ext/date/lib/parse_date.re" ++#line 1026 "ext/date/lib/parse_date.re" { timelib_ull i; @@@ -21353,7 -21391,7 +21356,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21357 "ext/date/lib/parse_date.c" -#line 21395 "ext/date/lib/parse_date.c" ++#line 21360 "ext/date/lib/parse_date.c" yy1388: YYDEBUG(1388, *YYCURSOR); yych = *++YYCURSOR; @@@ -21789,7 -21827,7 +21792,7 @@@ yy1416 ++YYCURSOR; yy1417: YYDEBUG(1417, *YYCURSOR); - #line 1011 "ext/date/lib/parse_date.re" -#line 1049 "ext/date/lib/parse_date.re" ++#line 1014 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("tomorrow"); TIMELIB_INIT; @@@ -21800,7 -21838,7 +21803,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21804 "ext/date/lib/parse_date.c" -#line 21842 "ext/date/lib/parse_date.c" ++#line 21807 "ext/date/lib/parse_date.c" yy1418: YYDEBUG(1418, *YYCURSOR); yych = *++YYCURSOR; @@@ -21835,7 -21873,7 +21838,7 @@@ yy1419 } yy1420: YYDEBUG(1420, *YYCURSOR); - #line 1001 "ext/date/lib/parse_date.re" -#line 1039 "ext/date/lib/parse_date.re" ++#line 1004 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("midnight | today"); TIMELIB_INIT; @@@ -21844,7 -21882,7 +21847,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21848 "ext/date/lib/parse_date.c" -#line 21886 "ext/date/lib/parse_date.c" ++#line 21851 "ext/date/lib/parse_date.c" yy1421: YYDEBUG(1421, *YYCURSOR); yych = *++YYCURSOR; @@@ -23856,7 -23894,7 +23859,7 @@@ yy1499 } yy1500: YYDEBUG(1500, *YYCURSOR); - #line 980 "ext/date/lib/parse_date.re" -#line 1018 "ext/date/lib/parse_date.re" ++#line 983 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("now"); TIMELIB_INIT; @@@ -23864,7 -23902,7 +23867,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 23868 "ext/date/lib/parse_date.c" -#line 23906 "ext/date/lib/parse_date.c" ++#line 23871 "ext/date/lib/parse_date.c" yy1501: YYDEBUG(1501, *YYCURSOR); yych = *++YYCURSOR; @@@ -24003,7 -24041,7 +24006,7 @@@ yy1507 } yy1508: YYDEBUG(1508, *YYCURSOR); - #line 989 "ext/date/lib/parse_date.re" -#line 1027 "ext/date/lib/parse_date.re" ++#line 992 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("noon"); TIMELIB_INIT; @@@ -24014,7 -24052,7 +24017,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24018 "ext/date/lib/parse_date.c" -#line 24056 "ext/date/lib/parse_date.c" ++#line 24021 "ext/date/lib/parse_date.c" yy1509: YYDEBUG(1509, *YYCURSOR); yyaccept = 0; @@@ -24547,7 -24585,7 +24550,7 @@@ yy1530 ++YYCURSOR; yy1531: YYDEBUG(1531, *YYCURSOR); - #line 968 "ext/date/lib/parse_date.re" -#line 1006 "ext/date/lib/parse_date.re" ++#line 971 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("yesterday"); TIMELIB_INIT; @@@ -24558,7 -24596,7 +24561,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24562 "ext/date/lib/parse_date.c" -#line 24600 "ext/date/lib/parse_date.c" ++#line 24565 "ext/date/lib/parse_date.c" yy1532: YYDEBUG(1532, *YYCURSOR); yyaccept = 0; @@@ -24731,7 -24769,7 +24734,7 @@@ yy1537 goto yy1531; } } - #line 1742 "ext/date/lib/parse_date.re" -#line 1780 "ext/date/lib/parse_date.re" ++#line 1745 "ext/date/lib/parse_date.re" }
diff --cc ext/date/lib/parse_date.c index fd67d8b,d7db06f..348482c --- 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 Thu Feb 6 07:35:53 2014 */ -/* Generated by re2c 0.13.5 on Tue May 13 16:52:44 2014 */ ++/* Generated by re2c 0.13.5 on Tue May 13 17:01:57 2014 */ #line 1 "ext/date/lib/parse_date.re" /* +----------------------------------------------------------------------+ @@@ -837,11 -875,11 +840,11 @@@ static int scan(Scanner *s, timelib_tz_ std: s->tok = cursor; s->len = 0; - #line 963 "ext/date/lib/parse_date.re" -#line 1001 "ext/date/lib/parse_date.re" ++#line 966 "ext/date/lib/parse_date.re" - #line 845 "ext/date/lib/parse_date.c" -#line 883 "ext/date/lib/parse_date.c" ++#line 848 "ext/date/lib/parse_date.c" { YYCTYPE yych; unsigned int yyaccept = 0; @@@ -961,7 -999,7 +964,7 @@@ } yy2: YYDEBUG(2, *YYCURSOR); - #line 1049 "ext/date/lib/parse_date.re" -#line 1087 "ext/date/lib/parse_date.re" ++#line 1052 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("firstdayof | lastdayof"); TIMELIB_INIT; @@@ -977,7 -1015,7 +980,7 @@@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 981 "ext/date/lib/parse_date.c" -#line 1019 "ext/date/lib/parse_date.c" ++#line 984 "ext/date/lib/parse_date.c" yy3: YYDEBUG(3, *YYCURSOR); ++YYCURSOR; @@@ -1000,7 -1038,7 +1003,7 @@@ } yy4: YYDEBUG(4, *YYCURSOR); - #line 1643 "ext/date/lib/parse_date.re" -#line 1681 "ext/date/lib/parse_date.re" ++#line 1646 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("tzcorrection | tz"); @@@ -1013,7 -1051,7 +1016,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } - #line 1017 "ext/date/lib/parse_date.c" -#line 1055 "ext/date/lib/parse_date.c" ++#line 1020 "ext/date/lib/parse_date.c" yy5: YYDEBUG(5, *YYCURSOR); yych = *++YYCURSOR; @@@ -1324,12 -1362,12 +1327,12 @@@ yy12 if (yych <= '9') goto yy1385; yy13: YYDEBUG(13, *YYCURSOR); - #line 1738 "ext/date/lib/parse_date.re" -#line 1776 "ext/date/lib/parse_date.re" ++#line 1741 "ext/date/lib/parse_date.re" { add_error(s, "Unexpected character"); goto std; } - #line 1333 "ext/date/lib/parse_date.c" -#line 1371 "ext/date/lib/parse_date.c" ++#line 1336 "ext/date/lib/parse_date.c" yy14: YYDEBUG(14, *YYCURSOR); yych = *++YYCURSOR; @@@ -2386,11 -2424,11 +2389,11 @@@ yy49 if (yych <= '9') goto yy55; yy50: YYDEBUG(50, *YYCURSOR); - #line 1727 "ext/date/lib/parse_date.re" -#line 1765 "ext/date/lib/parse_date.re" ++#line 1730 "ext/date/lib/parse_date.re" { goto std; } - #line 2394 "ext/date/lib/parse_date.c" -#line 2432 "ext/date/lib/parse_date.c" ++#line 2397 "ext/date/lib/parse_date.c" yy51: YYDEBUG(51, *YYCURSOR); yych = *++YYCURSOR; @@@ -2399,12 -2437,12 +2402,12 @@@ yy52 YYDEBUG(52, *YYCURSOR); ++YYCURSOR; YYDEBUG(53, *YYCURSOR); - #line 1732 "ext/date/lib/parse_date.re" -#line 1770 "ext/date/lib/parse_date.re" ++#line 1735 "ext/date/lib/parse_date.re" { s->pos = cursor; s->line++; goto std; } - #line 2408 "ext/date/lib/parse_date.c" -#line 2446 "ext/date/lib/parse_date.c" ++#line 2411 "ext/date/lib/parse_date.c" yy54: YYDEBUG(54, *YYCURSOR); yych = *++YYCURSOR; @@@ -2791,7 -2829,7 +2794,7 @@@ yy72 if (yych == 's') goto yy74; yy73: YYDEBUG(73, *YYCURSOR); - #line 1711 "ext/date/lib/parse_date.re" -#line 1749 "ext/date/lib/parse_date.re" ++#line 1714 "ext/date/lib/parse_date.re" { timelib_ull i; DEBUG_OUTPUT("relative"); @@@ -2806,7 -2844,7 +2809,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 2810 "ext/date/lib/parse_date.c" -#line 2848 "ext/date/lib/parse_date.c" ++#line 2813 "ext/date/lib/parse_date.c" yy74: YYDEBUG(74, *YYCURSOR); yych = *++YYCURSOR; @@@ -3568,7 -3606,7 +3571,7 @@@ yy166 } yy167: YYDEBUG(167, *YYCURSOR); - #line 1574 "ext/date/lib/parse_date.re" -#line 1612 "ext/date/lib/parse_date.re" ++#line 1577 "ext/date/lib/parse_date.re" { const timelib_relunit* relunit; DEBUG_OUTPUT("daytext"); @@@ -3585,7 -3623,7 +3588,7 @@@ TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } - #line 3589 "ext/date/lib/parse_date.c" -#line 3627 "ext/date/lib/parse_date.c" ++#line 3592 "ext/date/lib/parse_date.c" yy168: YYDEBUG(168, *YYCURSOR); yych = *++YYCURSOR; @@@ -4105,7 -4143,7 +4108,7 @@@ yy193 } yy194: YYDEBUG(194, *YYCURSOR); - #line 1633 "ext/date/lib/parse_date.re" -#line 1671 "ext/date/lib/parse_date.re" ++#line 1636 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("monthtext"); TIMELIB_INIT; @@@ -4114,7 -4152,7 +4117,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4118 "ext/date/lib/parse_date.c" -#line 4156 "ext/date/lib/parse_date.c" ++#line 4121 "ext/date/lib/parse_date.c" yy195: YYDEBUG(195, *YYCURSOR); ++YYCURSOR; @@@ -4165,7 -4203,7 +4168,7 @@@ yy198 } yy199: YYDEBUG(199, *YYCURSOR); - #line 1379 "ext/date/lib/parse_date.re" -#line 1417 "ext/date/lib/parse_date.re" ++#line 1382 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datetextual | datenoyear"); @@@ -4178,7 -4216,7 +4181,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 4182 "ext/date/lib/parse_date.c" -#line 4220 "ext/date/lib/parse_date.c" ++#line 4185 "ext/date/lib/parse_date.c" yy200: YYDEBUG(200, *YYCURSOR); yyaccept = 6; @@@ -4447,7 -4485,7 +4450,7 @@@ yy222 } yy223: YYDEBUG(223, *YYCURSOR); - #line 1681 "ext/date/lib/parse_date.re" -#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"); @@@ -4476,7 -4514,7 +4479,7 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 4480 "ext/date/lib/parse_date.c" -#line 4518 "ext/date/lib/parse_date.c" ++#line 4483 "ext/date/lib/parse_date.c" yy224: YYDEBUG(224, *YYCURSOR); yyaccept = 7; @@@ -5174,7 -5212,7 +5177,7 @@@ yy278 YYDEBUG(278, *YYCURSOR); ++YYCURSOR; YYDEBUG(279, *YYCURSOR); - #line 1657 "ext/date/lib/parse_date.re" -#line 1695 "ext/date/lib/parse_date.re" ++#line 1660 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); TIMELIB_INIT; @@@ -5197,7 -5235,7 +5200,7 @@@ TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 5201 "ext/date/lib/parse_date.c" -#line 5239 "ext/date/lib/parse_date.c" ++#line 5204 "ext/date/lib/parse_date.c" yy280: YYDEBUG(280, *YYCURSOR); yych = *++YYCURSOR; @@@ -5375,7 -5413,7 +5378,7 @@@ yy294 ++YYCURSOR; yy295: YYDEBUG(295, *YYCURSOR); - #line 1351 "ext/date/lib/parse_date.re" -#line 1389 "ext/date/lib/parse_date.re" ++#line 1354 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenoday"); @@@ -5388,7 -5426,7 +5391,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 5392 "ext/date/lib/parse_date.c" -#line 5430 "ext/date/lib/parse_date.c" ++#line 5395 "ext/date/lib/parse_date.c" yy296: YYDEBUG(296, *YYCURSOR); yych = *++YYCURSOR; @@@ -6608,7 -6646,7 +6611,7 @@@ yy362 if (yych <= '9') goto yy365; yy364: YYDEBUG(364, *YYCURSOR); - #line 1495 "ext/date/lib/parse_date.re" -#line 1533 "ext/date/lib/parse_date.re" ++#line 1498 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextshort"); @@@ -6621,7 -6659,7 +6624,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 6625 "ext/date/lib/parse_date.c" -#line 6663 "ext/date/lib/parse_date.c" ++#line 6628 "ext/date/lib/parse_date.c" yy365: YYDEBUG(365, *YYCURSOR); yych = *++YYCURSOR; @@@ -7259,7 -7297,7 +7262,7 @@@ yy392 } yy393: YYDEBUG(393, *YYCURSOR); - #line 1553 "ext/date/lib/parse_date.re" -#line 1591 "ext/date/lib/parse_date.re" ++#line 1556 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("ago"); TIMELIB_INIT; @@@ -7279,7 -7317,7 +7282,7 @@@ TIMELIB_DEINIT; return TIMELIB_AGO; } - #line 7283 "ext/date/lib/parse_date.c" -#line 7321 "ext/date/lib/parse_date.c" ++#line 7286 "ext/date/lib/parse_date.c" yy394: YYDEBUG(394, *YYCURSOR); yyaccept = 5; @@@ -9029,7 -9067,7 +9032,7 @@@ yy454 ++YYCURSOR; yy455: YYDEBUG(455, *YYCURSOR); - #line 1256 "ext/date/lib/parse_date.re" -#line 1294 "ext/date/lib/parse_date.re" ++#line 1259 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("iso8601date4 | iso8601date2 | iso8601dateslash | dateslash"); TIMELIB_INIT; @@@ -9040,7 -9078,7 +9043,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 9044 "ext/date/lib/parse_date.c" -#line 9082 "ext/date/lib/parse_date.c" ++#line 9047 "ext/date/lib/parse_date.c" yy456: YYDEBUG(456, *YYCURSOR); yyaccept = 0; @@@ -9600,7 -9638,7 +9603,7 @@@ yy475 } yy476: YYDEBUG(476, *YYCURSOR); - #line 1393 "ext/date/lib/parse_date.re" -#line 1431 "ext/date/lib/parse_date.re" ++#line 1396 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; @@@ -9611,7 -9649,7 +9614,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 9615 "ext/date/lib/parse_date.c" -#line 9653 "ext/date/lib/parse_date.c" ++#line 9618 "ext/date/lib/parse_date.c" yy477: YYDEBUG(477, *YYCURSOR); yyaccept = 10; @@@ -9752,7 -9790,7 +9755,7 @@@ yy488 YYDEBUG(488, *YYCURSOR); ++YYCURSOR; YYDEBUG(489, *YYCURSOR); - #line 1111 "ext/date/lib/parse_date.re" -#line 1149 "ext/date/lib/parse_date.re" ++#line 1114 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("timetiny12 | timeshort12 | timelong12"); TIMELIB_INIT; @@@ -9768,7 -9806,7 +9771,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME12; } - #line 9772 "ext/date/lib/parse_date.c" -#line 9810 "ext/date/lib/parse_date.c" ++#line 9775 "ext/date/lib/parse_date.c" yy490: YYDEBUG(490, *YYCURSOR); yyaccept = 11; @@@ -9781,7 -9819,7 +9784,7 @@@ } yy491: YYDEBUG(491, *YYCURSOR); - #line 1148 "ext/date/lib/parse_date.re" -#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"); @@@ -9806,7 -9844,7 +9809,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 9810 "ext/date/lib/parse_date.c" -#line 9848 "ext/date/lib/parse_date.c" ++#line 9813 "ext/date/lib/parse_date.c" yy492: YYDEBUG(492, *YYCURSOR); yyaccept = 11; @@@ -10116,7 -10154,7 +10119,7 @@@ yy523 YYDEBUG(523, *YYCURSOR); ++YYCURSOR; YYDEBUG(524, *YYCURSOR); - #line 1128 "ext/date/lib/parse_date.re" -#line 1166 "ext/date/lib/parse_date.re" ++#line 1131 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("mssqltime"); TIMELIB_INIT; @@@ -10135,7 -10173,7 +10138,7 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 10139 "ext/date/lib/parse_date.c" -#line 10177 "ext/date/lib/parse_date.c" ++#line 10142 "ext/date/lib/parse_date.c" yy525: YYDEBUG(525, *YYCURSOR); yyaccept = 11; @@@ -10241,7 -10279,7 +10244,7 @@@ yy534 if (yych <= '9') goto yy541; yy535: YYDEBUG(535, *YYCURSOR); - #line 1310 "ext/date/lib/parse_date.re" -#line 1348 "ext/date/lib/parse_date.re" ++#line 1313 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datefull"); @@@ -10255,7 -10293,7 +10258,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } - #line 10259 "ext/date/lib/parse_date.c" -#line 10297 "ext/date/lib/parse_date.c" ++#line 10262 "ext/date/lib/parse_date.c" yy536: YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; @@@ -10992,7 -11030,7 +10995,7 @@@ yy605 YYDEBUG(606, *YYCURSOR); ++YYCURSOR; YYDEBUG(607, *YYCURSOR); - #line 1325 "ext/date/lib/parse_date.re" -#line 1363 "ext/date/lib/parse_date.re" ++#line 1328 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("pointed date YYYY"); TIMELIB_INIT; @@@ -11003,7 -11041,7 +11006,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11007 "ext/date/lib/parse_date.c" -#line 11045 "ext/date/lib/parse_date.c" ++#line 11010 "ext/date/lib/parse_date.c" yy608: YYDEBUG(608, *YYCURSOR); yyaccept = 11; @@@ -11039,7 -11077,7 +11042,7 @@@ yy611 if (yych <= '9') goto yy605; yy612: YYDEBUG(612, *YYCURSOR); - #line 1337 "ext/date/lib/parse_date.re" -#line 1375 "ext/date/lib/parse_date.re" ++#line 1340 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pointed date YY"); @@@ -11052,7 -11090,7 +11055,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 11056 "ext/date/lib/parse_date.c" -#line 11094 "ext/date/lib/parse_date.c" ++#line 11059 "ext/date/lib/parse_date.c" yy613: YYDEBUG(613, *YYCURSOR); yyaccept = 11; @@@ -11693,7 -11731,7 +11696,7 @@@ yy656 } yy657: YYDEBUG(657, *YYCURSOR); - #line 1296 "ext/date/lib/parse_date.re" -#line 1334 "ext/date/lib/parse_date.re" ++#line 1299 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshort"); @@@ -11706,7 -11744,7 +11709,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 11710 "ext/date/lib/parse_date.c" -#line 11748 "ext/date/lib/parse_date.c" ++#line 11713 "ext/date/lib/parse_date.c" yy658: YYDEBUG(658, *YYCURSOR); yyaccept = 13; @@@ -11812,7 -11850,7 +11815,7 @@@ yy666 } yy667: YYDEBUG(667, *YYCURSOR); - #line 1240 "ext/date/lib/parse_date.re" -#line 1278 "ext/date/lib/parse_date.re" ++#line 1243 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("americanshort | american"); @@@ -11827,7 -11865,7 +11830,7 @@@ TIMELIB_DEINIT; return TIMELIB_AMERICAN; } - #line 11831 "ext/date/lib/parse_date.c" -#line 11869 "ext/date/lib/parse_date.c" ++#line 11834 "ext/date/lib/parse_date.c" yy668: YYDEBUG(668, *YYCURSOR); yyaccept = 14; @@@ -12060,7 -12098,7 +12063,7 @@@ yy700 if (yych <= ':') goto yy704; yy701: YYDEBUG(701, *YYCURSOR); - #line 1523 "ext/date/lib/parse_date.re" -#line 1561 "ext/date/lib/parse_date.re" ++#line 1526 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("clf"); @@@ -12080,7 -12118,7 +12083,7 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12084 "ext/date/lib/parse_date.c" -#line 12122 "ext/date/lib/parse_date.c" ++#line 12087 "ext/date/lib/parse_date.c" yy702: YYDEBUG(702, *YYCURSOR); yych = *++YYCURSOR; @@@ -12632,7 -12670,7 +12635,7 @@@ yy763 } yy764: YYDEBUG(764, *YYCURSOR); - #line 1268 "ext/date/lib/parse_date.re" -#line 1306 "ext/date/lib/parse_date.re" ++#line 1271 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("iso8601date2"); @@@ -12645,7 -12683,7 +12648,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 12649 "ext/date/lib/parse_date.c" -#line 12687 "ext/date/lib/parse_date.c" ++#line 12652 "ext/date/lib/parse_date.c" yy765: YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; @@@ -12684,7 -12722,7 +12687,7 @@@ yy771 YYDEBUG(771, *YYCURSOR); ++YYCURSOR; YYDEBUG(772, *YYCURSOR); - #line 1509 "ext/date/lib/parse_date.re" -#line 1547 "ext/date/lib/parse_date.re" ++#line 1512 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgtextreverse"); @@@ -12697,7 -12735,7 +12700,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 12701 "ext/date/lib/parse_date.c" -#line 12739 "ext/date/lib/parse_date.c" ++#line 12704 "ext/date/lib/parse_date.c" yy773: YYDEBUG(773, *YYCURSOR); yych = *++YYCURSOR; @@@ -12835,7 -12873,7 +12838,7 @@@ yy783 } yy784: YYDEBUG(784, *YYCURSOR); - #line 1544 "ext/date/lib/parse_date.re" -#line 1582 "ext/date/lib/parse_date.re" ++#line 1547 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("year4"); TIMELIB_INIT; @@@ -12843,7 -12881,7 +12846,7 @@@ TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12847 "ext/date/lib/parse_date.c" -#line 12885 "ext/date/lib/parse_date.c" ++#line 12850 "ext/date/lib/parse_date.c" yy785: YYDEBUG(785, *YYCURSOR); yych = *++YYCURSOR; @@@ -12994,7 -13032,7 +12997,7 @@@ yy793 } yy794: YYDEBUG(794, *YYCURSOR); - #line 1365 "ext/date/lib/parse_date.re" -#line 1403 "ext/date/lib/parse_date.re" ++#line 1368 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("datenodayrev"); @@@ -13007,7 -13045,7 +13010,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 13011 "ext/date/lib/parse_date.c" -#line 13049 "ext/date/lib/parse_date.c" ++#line 13014 "ext/date/lib/parse_date.c" yy795: YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; @@@ -13222,7 -13260,7 +13225,7 @@@ yy814 if (yych <= '7') goto yy817; yy815: YYDEBUG(815, *YYCURSOR); - #line 1476 "ext/date/lib/parse_date.re" -#line 1514 "ext/date/lib/parse_date.re" ++#line 1479 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweek"); @@@ -13240,7 -13278,7 +13243,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13244 "ext/date/lib/parse_date.c" -#line 13282 "ext/date/lib/parse_date.c" ++#line 13247 "ext/date/lib/parse_date.c" yy816: YYDEBUG(816, *YYCURSOR); yych = *++YYCURSOR; @@@ -13250,7 -13288,7 +13253,7 @@@ yy817 YYDEBUG(817, *YYCURSOR); ++YYCURSOR; YYDEBUG(818, *YYCURSOR); - #line 1457 "ext/date/lib/parse_date.re" -#line 1495 "ext/date/lib/parse_date.re" ++#line 1460 "ext/date/lib/parse_date.re" { timelib_sll w, d; DEBUG_OUTPUT("isoweekday"); @@@ -13268,7 -13306,7 +13271,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 13272 "ext/date/lib/parse_date.c" -#line 13310 "ext/date/lib/parse_date.c" ++#line 13275 "ext/date/lib/parse_date.c" yy819: YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; @@@ -13332,7 -13370,7 +13335,7 @@@ yy821 } yy822: YYDEBUG(822, *YYCURSOR); - #line 1443 "ext/date/lib/parse_date.re" -#line 1481 "ext/date/lib/parse_date.re" ++#line 1446 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("pgydotd"); @@@ -13345,7 -13383,7 +13348,7 @@@ TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } - #line 13349 "ext/date/lib/parse_date.c" -#line 13387 "ext/date/lib/parse_date.c" ++#line 13352 "ext/date/lib/parse_date.c" yy823: YYDEBUG(823, *YYCURSOR); yych = *++YYCURSOR; @@@ -13448,7 -13486,7 +13451,7 @@@ yy842 ++YYCURSOR; yy843: YYDEBUG(843, *YYCURSOR); - #line 1417 "ext/date/lib/parse_date.re" -#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"); @@@ -13473,7 -13511,7 +13476,7 @@@ TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } - #line 13477 "ext/date/lib/parse_date.c" -#line 13515 "ext/date/lib/parse_date.c" ++#line 13480 "ext/date/lib/parse_date.c" yy844: YYDEBUG(844, *YYCURSOR); yych = *++YYCURSOR; @@@ -13735,7 -13773,7 +13738,7 @@@ yy848 } yy849: YYDEBUG(849, *YYCURSOR); - #line 1405 "ext/date/lib/parse_date.re" -#line 1443 "ext/date/lib/parse_date.re" ++#line 1408 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; @@@ -13746,7 -13784,7 +13749,7 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } - #line 13750 "ext/date/lib/parse_date.c" -#line 13788 "ext/date/lib/parse_date.c" ++#line 13753 "ext/date/lib/parse_date.c" yy850: YYDEBUG(850, *YYCURSOR); yych = *++YYCURSOR; @@@ -14666,7 -14704,7 +14669,7 @@@ yy973 if (yych <= '9') goto yy996; yy974: YYDEBUG(974, *YYCURSOR); - #line 1282 "ext/date/lib/parse_date.re" -#line 1320 "ext/date/lib/parse_date.re" ++#line 1285 "ext/date/lib/parse_date.re" { int length = 0; DEBUG_OUTPUT("gnudateshorter"); @@@ -14679,7 -14717,7 +14682,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 14683 "ext/date/lib/parse_date.c" -#line 14721 "ext/date/lib/parse_date.c" ++#line 14686 "ext/date/lib/parse_date.c" yy975: YYDEBUG(975, *YYCURSOR); yyaccept = 22; @@@ -15688,7 -15726,7 +15691,7 @@@ yy1066 } yy1068: YYDEBUG(1068, *YYCURSOR); - #line 1174 "ext/date/lib/parse_date.re" -#line 1212 "ext/date/lib/parse_date.re" ++#line 1177 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("gnunocolon"); TIMELIB_INIT; @@@ -15710,7 -15748,7 +15713,7 @@@ TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } - #line 15714 "ext/date/lib/parse_date.c" -#line 15752 "ext/date/lib/parse_date.c" ++#line 15717 "ext/date/lib/parse_date.c" yy1069: YYDEBUG(1069, *YYCURSOR); yych = *++YYCURSOR; @@@ -15802,7 -15840,7 +15805,7 @@@ yy1075 } yy1076: YYDEBUG(1076, *YYCURSOR); - #line 1220 "ext/date/lib/parse_date.re" -#line 1258 "ext/date/lib/parse_date.re" ++#line 1223 "ext/date/lib/parse_date.re" { int tz_not_found; DEBUG_OUTPUT("iso8601nocolon"); @@@ -15821,7 -15859,7 +15824,7 @@@ TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } - #line 15825 "ext/date/lib/parse_date.c" -#line 15863 "ext/date/lib/parse_date.c" ++#line 15828 "ext/date/lib/parse_date.c" yy1077: YYDEBUG(1077, *YYCURSOR); yyaccept = 25; @@@ -16719,7 -16757,7 +16722,7 @@@ yy1117 } yy1118: YYDEBUG(1118, *YYCURSOR); - #line 1616 "ext/date/lib/parse_date.re" -#line 1654 "ext/date/lib/parse_date.re" ++#line 1619 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16735,7 -16773,7 +16738,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16739 "ext/date/lib/parse_date.c" -#line 16777 "ext/date/lib/parse_date.c" ++#line 16742 "ext/date/lib/parse_date.c" yy1119: YYDEBUG(1119, *YYCURSOR); ++YYCURSOR; @@@ -16786,7 -16824,7 +16789,7 @@@ yy1126 YYDEBUG(1126, *YYCURSOR); ++YYCURSOR; YYDEBUG(1127, *YYCURSOR); - #line 1089 "ext/date/lib/parse_date.re" -#line 1127 "ext/date/lib/parse_date.re" ++#line 1092 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16807,7 -16845,7 +16810,7 @@@ TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } - #line 16811 "ext/date/lib/parse_date.c" -#line 16849 "ext/date/lib/parse_date.c" ++#line 16814 "ext/date/lib/parse_date.c" yy1128: YYDEBUG(1128, *YYCURSOR); yyaccept = 26; @@@ -16915,7 -16953,7 +16918,7 @@@ yy1141 } yy1142: YYDEBUG(1142, *YYCURSOR); - #line 1592 "ext/date/lib/parse_date.re" -#line 1630 "ext/date/lib/parse_date.re" ++#line 1595 "ext/date/lib/parse_date.re" { timelib_sll i; int behavior = 0; @@@ -16938,7 -16976,7 +16941,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 16942 "ext/date/lib/parse_date.c" -#line 16980 "ext/date/lib/parse_date.c" ++#line 16945 "ext/date/lib/parse_date.c" yy1143: YYDEBUG(1143, *YYCURSOR); yych = *++YYCURSOR; @@@ -19615,7 -19653,7 +19618,7 @@@ yy1294 goto yy1298; yy1295: YYDEBUG(1295, *YYCURSOR); - #line 1066 "ext/date/lib/parse_date.re" -#line 1104 "ext/date/lib/parse_date.re" ++#line 1069 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("backof | frontof"); TIMELIB_INIT; @@@ -19637,7 -19675,7 +19640,7 @@@ TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 19641 "ext/date/lib/parse_date.c" -#line 19679 "ext/date/lib/parse_date.c" ++#line 19644 "ext/date/lib/parse_date.c" yy1296: YYDEBUG(1296, *YYCURSOR); yyaccept = 28; @@@ -21328,7 -21366,7 +21331,7 @@@ yy1385 if (yych <= '9') goto yy1385; yy1387: YYDEBUG(1387, *YYCURSOR); - #line 1023 "ext/date/lib/parse_date.re" -#line 1061 "ext/date/lib/parse_date.re" ++#line 1026 "ext/date/lib/parse_date.re" { timelib_ull i; @@@ -21353,7 -21391,7 +21356,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21357 "ext/date/lib/parse_date.c" -#line 21395 "ext/date/lib/parse_date.c" ++#line 21360 "ext/date/lib/parse_date.c" yy1388: YYDEBUG(1388, *YYCURSOR); yych = *++YYCURSOR; @@@ -21789,7 -21827,7 +21792,7 @@@ yy1416 ++YYCURSOR; yy1417: YYDEBUG(1417, *YYCURSOR); - #line 1011 "ext/date/lib/parse_date.re" -#line 1049 "ext/date/lib/parse_date.re" ++#line 1014 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("tomorrow"); TIMELIB_INIT; @@@ -21800,7 -21838,7 +21803,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21804 "ext/date/lib/parse_date.c" -#line 21842 "ext/date/lib/parse_date.c" ++#line 21807 "ext/date/lib/parse_date.c" yy1418: YYDEBUG(1418, *YYCURSOR); yych = *++YYCURSOR; @@@ -21835,7 -21873,7 +21838,7 @@@ yy1419 } yy1420: YYDEBUG(1420, *YYCURSOR); - #line 1001 "ext/date/lib/parse_date.re" -#line 1039 "ext/date/lib/parse_date.re" ++#line 1004 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("midnight | today"); TIMELIB_INIT; @@@ -21844,7 -21882,7 +21847,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 21848 "ext/date/lib/parse_date.c" -#line 21886 "ext/date/lib/parse_date.c" ++#line 21851 "ext/date/lib/parse_date.c" yy1421: YYDEBUG(1421, *YYCURSOR); yych = *++YYCURSOR; @@@ -23856,7 -23894,7 +23859,7 @@@ yy1499 } yy1500: YYDEBUG(1500, *YYCURSOR); - #line 980 "ext/date/lib/parse_date.re" -#line 1018 "ext/date/lib/parse_date.re" ++#line 983 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("now"); TIMELIB_INIT; @@@ -23864,7 -23902,7 +23867,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 23868 "ext/date/lib/parse_date.c" -#line 23906 "ext/date/lib/parse_date.c" ++#line 23871 "ext/date/lib/parse_date.c" yy1501: YYDEBUG(1501, *YYCURSOR); yych = *++YYCURSOR; @@@ -24003,7 -24041,7 +24006,7 @@@ yy1507 } yy1508: YYDEBUG(1508, *YYCURSOR); - #line 989 "ext/date/lib/parse_date.re" -#line 1027 "ext/date/lib/parse_date.re" ++#line 992 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("noon"); TIMELIB_INIT; @@@ -24014,7 -24052,7 +24017,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24018 "ext/date/lib/parse_date.c" -#line 24056 "ext/date/lib/parse_date.c" ++#line 24021 "ext/date/lib/parse_date.c" yy1509: YYDEBUG(1509, *YYCURSOR); yyaccept = 0; @@@ -24547,7 -24585,7 +24550,7 @@@ yy1530 ++YYCURSOR; yy1531: YYDEBUG(1531, *YYCURSOR); - #line 968 "ext/date/lib/parse_date.re" -#line 1006 "ext/date/lib/parse_date.re" ++#line 971 "ext/date/lib/parse_date.re" { DEBUG_OUTPUT("yesterday"); TIMELIB_INIT; @@@ -24558,7 -24596,7 +24561,7 @@@ TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 24562 "ext/date/lib/parse_date.c" -#line 24600 "ext/date/lib/parse_date.c" ++#line 24565 "ext/date/lib/parse_date.c" yy1532: YYDEBUG(1532, *YYCURSOR); yyaccept = 0; @@@ -24731,7 -24769,7 +24734,7 @@@ yy1537 goto yy1531; } } - #line 1742 "ext/date/lib/parse_date.re" -#line 1780 "ext/date/lib/parse_date.re" ++#line 1745 "ext/date/lib/parse_date.re" }