com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/lib/ parse_date.c ext/gd/libgd/gd_gif_in.c ext/wddx/wd dx.c

From: Date: Wed, 05 Jul 2017 02:44:51 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/date/lib/ parse_date.c ext/gd/libgd/gd_gif_in.c ext/wddx/wd dx.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98355@lists.php.net to get a copy of this message
Commit: 0496f5407f884d9040e52cda31c9b7a6447f5fa1 Author: Stanislav Malyshev <stas@php.net> Tue, 4 Jul 2017 19:44:51 -0700 Parents: 3a25a56a92ac1d0d6028a8ecd32ccf03bcd71ade 12107d619b4380efa8543046357af07b7733020d Branches: PHP-7.0 PHP-7.1 master Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=0496f5407f884d9040e52cda31c9b7a6447f5fa1 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Update NEWS Fix bug #74087 Fixed parsing of strange formats with mixed month/day and time strings Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV Fixed bug #74111 Fix #74435: Buffer over-read into uninitialized memory Fix bug #74603 - use correct buffer size Fix bug #74651 - check EVP_SealInit as it can return -1 Update NEWS Fix bug #73807 Bugs: https://bugs.php.net/74087 https://bugs..php.net/74145 https://bugs.php.net/74111 https://bugs.php.net/74435 https://bugs.php.net/74603 https://bugs.php.net/74651 https://bugs.php.net/73807 Changed paths: MM ext/date/lib/parse_date.c MM ext/gd/libgd/gd_gif_in.c MM ext/wddx/wddx.c

diff --cc ext/date/lib/parse_date.c index ce7e58d,e538464..aebd2b2 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@@ -1,4 -1,4 +1,4 @@@ - /* Generated by re2c 0.15.3 on Fri Sep 30 20:30:54 2016 */ -/* Generated by re2c 0.15.3 on Tue Jul 4 19:19:00 2017 */ ++/* Generated by re2c 0.15.3 on Tue Jul 4 19:43:56 2017 */ #line 1 "ext/date/lib/parse_date.re" /* * The MIT License (MIT) @@@ -2692,7 -2688,7 +2688,7 @@@ yy72 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 2696 "ext/date/lib/parse_date.c" -#line 2692 "<stdout>" ++#line 2692 "ext/date/lib/parse_date.c" yy73: yych = *++YYCURSOR; if (yych == 'D') goto yy74; @@@ -3377,7 -3373,7 +3373,7 @@@ yy166 TIMELIB_DEINIT; return TIMELIB_WEEKDAY; } - #line 3381 "ext/date/lib/parse_date.c" -#line 3377 "<stdout>" ++#line 3377 "ext/date/lib/parse_date.c" yy167: yych = *++YYCURSOR; if (yych <= 'K') { @@@ -3879,10 -3875,10 +3875,10 @@@ yy193 TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 3883 "ext/date/lib/parse_date.c" -#line 3879 "<stdout>" ++#line 3879 "ext/date/lib/parse_date.c" yy194: ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 21) YYFILL(21); + if ((YYLIMIT - YYCURSOR) < 23) YYFILL(23); yych = *YYCURSOR; yy195: if (yybm[0+yych] & 32) { @@@ -4060,66 -4099,47 +4099,47 @@@ yy204 goto yy193; } } - yy206: + yy205: yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy220; - goto yy56; - } else { - if (yych <= '0') goto yy295; - if (yych <= '9') goto yy296; - if (yych <= ':') goto yy220; - goto yy56; - } + if (yych <= '/') goto yy56; + if (yych <= '9') goto yy295; + goto yy56; + yy206: + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if (yych == 't') goto yy294; + goto yy212; yy207: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy263; - goto yy56; - } else { - if (yych <= '2') goto yy296; - if (yych <= '9') goto yy295; - if (yych <= ':') goto yy263; - goto yy56; + #line 1366 "ext/date/lib/parse_date.re" + { + int length = 0; + DEBUG_OUTPUT("datetextual | datenoyear"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->m = timelib_get_month((char **) &ptr); + s->time->d = timelib_get_nr((char **) &ptr, 2); + s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length); + TIMELIB_PROCESS_YEAR(s->time->y, length); + TIMELIB_DEINIT; + return TIMELIB_DATE_TEXT; } -#line 4127 "<stdout>" ++#line 4127 "ext/date/lib/parse_date.c" yy208: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy263; - goto yy56; - } else { - if (yych <= '4') goto yy295; - if (yych <= '9') goto yy292; - if (yych <= ':') goto yy263; - goto yy56; - } - yy209: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy263; - goto yy56; - } else { - if (yych <= '9') goto yy292; - if (yych <= ':') goto yy263; - goto yy56; - } - yy210: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - goto yy215; - yy211: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy215; - yy212: + if (yych == 'd') goto yy294; + goto yy212; + yy209: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy215; - yy213: + if (yych == 'd') goto yy294; + goto yy212; + yy210: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - goto yy215; - yy214: + if (yych == 'h') goto yy294; + goto yy212; + yy211: yyaccept = 6; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 18) YYFILL(18); @@@ -4212,32 -4265,32 +4265,32 @@@ yy221 TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } - #line 4216 "ext/date/lib/parse_date.c" - yy223: -#line 4269 "<stdout>" ++#line 4269 "ext/date/lib/parse_date.c" + yy222: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy224; - if (yych != ':') goto yy222; - yy224: + if (yych == '.') goto yy223; + if (yych != ':') goto yy221; + yy223: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy225; - if (yych <= '6') goto yy226; - if (yych <= '9') goto yy227; + if (yych <= '5') goto yy224; + if (yych <= '6') goto yy225; + if (yych <= '9') goto yy226; goto yy56; + yy224: + yych = *++YYCURSOR; + if (yych <= '/') goto yy221; + if (yych <= '9') goto yy227; + goto yy221; yy225: yych = *++YYCURSOR; - if (yych <= '/') goto yy222; - if (yych <= '9') goto yy228; - goto yy222; + if (yych == '0') goto yy227; + goto yy221; yy226: yych = *++YYCURSOR; - if (yych == '0') goto yy228; - goto yy222; + goto yy221; yy227: - yych = *++YYCURSOR; - goto yy222; - yy228: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '*') { @@@ -4384,9 -4488,92 +4488,92 @@@ yy239 } yy240: yych = *++YYCURSOR; - if (yych == ')') goto yy227; - goto yy222; + if (yych <= '@') { + if (yych == ')') goto yy226; + goto yy221; + } else { + if (yych <= 'Z') goto yy241; + if (yych <= '`') goto yy221; + if (yych >= '{') goto yy221; + } yy241: + yych = *++YYCURSOR; + if (yych == ')') goto yy226; + goto yy221; + yy242: + yych = *++YYCURSOR; + if (yych == 'M') goto yy247; + if (yych == 'm') goto yy247; + goto yy56; + yy243: + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if (yych <= ')') { + if (yych <= '\t') { + if (yych <= 0x00) goto yy245; + if (yych <= 0x08) goto yy221; + goto yy245; + } else { + if (yych == ' ') goto yy245; + if (yych <= '(') goto yy221; + goto yy226; + } + } else { + if (yych <= '@') { + if (yych != '.') goto yy221; + } else { + if (yych <= 'Z') goto yy238; + if (yych <= '`') goto yy221; + if (yych <= 'z') goto yy238; + goto yy221; + } + } + yy244: + yych = *++YYCURSOR; + if (yych <= '\t') { + if (yych <= 0x00) goto yy245; + if (yych <= 0x08) goto yy56; + } else { + if (yych != ' ') goto yy56; + } + yy245: + ++YYCURSOR; + #line 1644 "ext/date/lib/parse_date.re" + { + DEBUG_OUTPUT("dateshortwithtimeshort12 | dateshortwithtimelong12"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->m = timelib_get_month((char **) &ptr); + s->time->d = timelib_get_nr((char **) &ptr, 2); + + TIMELIB_HAVE_TIME(); + s->time->h = timelib_get_nr((char **) &ptr, 2); + s->time->i = timelib_get_nr((char **) &ptr, 2); + if (*ptr == ':' || *ptr == '.') { + s->time->s = timelib_get_nr((char **) &ptr, 2); + + if (*ptr == '.') { + s->time->f = timelib_get_frac_nr((char **) &ptr, 8); + } + } + + s->time->h += timelib_meridian((char **) &ptr, s->time->h); + TIMELIB_DEINIT; + return TIMELIB_SHORTDATE_WITH_TIME; + } -#line 4565 "<stdout>" ++#line 4565 "ext/date/lib/parse_date.c" + yy247: + yych = *++YYCURSOR; + if (yych <= 0x1F) { + if (yych <= 0x00) goto yy245; + if (yych == '\t') goto yy245; + goto yy56; + } else { + if (yych <= ' ') goto yy245; + if (yych == '.') goto yy244; + goto yy56; + } + yy248: yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@@ -5208,994 -5089,263 +5089,263 @@@ yy292 yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy310; - goto yy198; - } else { - if (yych <= '4') goto yy324; - if (yych <= '9') goto yy323; - if (yych <= ':') goto yy310; - goto yy198; - } - yy308: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy310; - goto yy198; - } else { - if (yych <= '9') goto yy323; - if (yych <= ':') goto yy310; - goto yy198; - } - yy309: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy198; - } else { - if (yych <= '9') goto yy262; - if (yych >= ';') goto yy198; - } - yy310: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy311; - if (yych <= '6') goto yy312; - if (yych <= '9') goto yy265; - goto yy56; - yy311: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy266; - goto yy222; - } else { - if (yych <= '9') goto yy313; - if (yych <= ':') goto yy266; - goto yy222; - } - yy312: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy266; - goto yy222; - } else { - if (yych <= '0') goto yy269; - if (yych == ':') goto yy266; - goto yy222; - } - yy313: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy315; - if (yych <= 0x1F) goto yy222; - goto yy315; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy222; - goto yy315; - } else { - if (yych == '+') goto yy315; - goto yy222; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy315; - if (yych <= '.') goto yy266; - if (yych <= '9') goto yy222; - goto yy266; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy222; - goto yy315; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy315; - goto yy222; - } - } - } - yy314: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); - yych = *YYCURSOR; - yy315: - if (yych <= '@') { - if (yych <= '\'') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy56; - goto yy314; - } else { - if (yych == ' ') goto yy314; - goto yy56; - } - } else { - if (yych <= '+') { - if (yych <= '(') goto yy233; - if (yych <= '*') goto yy56; - goto yy232; - } else { - if (yych == '-') goto yy232; - goto yy56; - } - } - } else { - if (yych <= 'Z') { - if (yych <= 'G') { - if (yych <= 'A') goto yy316; - if (yych <= 'F') goto yy234; - goto yy231; - } else { - if (yych != 'P') goto yy234; - } - } else { - if (yych <= 'o') { - if (yych <= '`') goto yy56; - if (yych <= 'a') goto yy317; - goto yy235; - } else { - if (yych <= 'p') goto yy317; - if (yych <= 'z') goto yy235; - goto yy56; - } - } - } - yy316: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy227; - goto yy222; - } else { - if (yych <= '.') goto yy319; - if (yych <= '@') goto yy222; - goto yy236; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy318; - if (yych <= 'Z') goto yy236; - goto yy222; - } else { - if (yych == 'm') goto yy322; - if (yych <= 'z') goto yy241; - goto yy222; - } - } - yy317: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy227; - goto yy222; - } else { - if (yych <= '.') goto yy319; - if (yych <= '@') goto yy222; - goto yy236; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy318; - if (yych <= 'Z') goto yy236; - goto yy222; - } else { - if (yych == 'm') goto yy318; - if (yych <= 'z') goto yy236; - goto yy222; - } - } - yy318: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { - if (yych <= '\t') { - if (yych <= 0x00) goto yy277; - if (yych <= 0x08) goto yy222; - goto yy277; - } else { - if (yych == ' ') goto yy277; - if (yych <= '(') goto yy222; - goto yy227; - } - } else { - if (yych <= '@') { - if (yych == '.') goto yy321; - goto yy222; - } else { - if (yych <= 'Z') goto yy237; - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy237; - goto yy222; - } - } - yy319: - yych = *++YYCURSOR; - if (yych == 'M') goto yy320; - if (yych != 'm') goto yy56; - yy320: - yych = *++YYCURSOR; - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy277; - if (yych == '\t') goto yy277; - goto yy56; - } else { - if (yych <= ' ') goto yy277; - if (yych != '.') goto yy56; - } - yy321: - yych = *++YYCURSOR; - if (yych <= '\t') { - if (yych <= 0x00) goto yy277; - if (yych <= 0x08) goto yy56; - goto yy277; - } else { - if (yych == ' ') goto yy277; - goto yy56; - } - yy322: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy277; - if (yych == '\t') goto yy277; - goto yy222; - } else { - if (yych <= '(') { - if (yych <= ' ') goto yy277; - goto yy222; - } else { - if (yych <= ')') goto yy227; - if (yych <= ',') goto yy222; - goto yy243; - } - } - } else { - if (yych <= 'Z') { - if (yych <= '.') goto yy321; - if (yych <= '/') goto yy243; - if (yych <= '@') goto yy222; - goto yy237; - } else { - if (yych <= '_') { - if (yych <= '^') goto yy222; - goto yy243; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy242; - goto yy222; - } - } - } - yy323: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy282; - if (yych <= 0x1F) goto yy198; - goto yy282; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy198; - goto yy266; - } else { - if (yych <= '/') goto yy198; - if (yych <= '9') goto yy288; - goto yy266; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy284; - if (yych <= 'O') goto yy198; - goto yy284; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy198; - goto yy284; - } else { - if (yych == 'p') goto yy284; - goto yy198; - } - } - } - yy324: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy282; - if (yych <= 0x1F) goto yy198; - goto yy282; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy198; - } else { - if (yych <= '/') goto yy198; - if (yych <= '9') goto yy288; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy284; - if (yych <= 'O') goto yy198; - goto yy284; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy198; - goto yy284; - } else { - if (yych == 'p') goto yy284; - goto yy198; - } - } - } - yy325: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy326; - if (yych <= '6') goto yy327; - if (yych <= '9') goto yy223; - goto yy56; - yy326: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy224; - goto yy222; - } else { - if (yych <= '9') goto yy328; - if (yych <= ':') goto yy224; - goto yy222; - } - yy327: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy224; - goto yy222; - } else { - if (yych <= '0') goto yy269; - if (yych == ':') goto yy224; - goto yy222; - } - yy328: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy271; - if (yych <= 0x1F) goto yy222; - goto yy271; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy222; - goto yy271; - } else { - if (yych == '+') goto yy271; - goto yy222; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy271; - if (yych <= '.') goto yy224; - if (yych <= '9') goto yy222; - goto yy224; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy222; - goto yy271; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy271; - goto yy222; - } - } - } - yy329: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ':') { - if (yych <= ' ') { - if (yych == '\t') goto yy282; - if (yych <= 0x1F) goto yy198; - goto yy282; - } else { - if (yych <= '.') { - if (yych <= '-') goto yy198; - goto yy310; - } else { - if (yych <= '/') goto yy198; - if (yych <= '9') goto yy288; - goto yy310; - } - } - } else { - if (yych <= 'P') { - if (yych == 'A') goto yy284; - if (yych <= 'O') goto yy198; - goto yy284; - } else { - if (yych <= 'a') { - if (yych <= '`') goto yy198; - goto yy284; - } else { - if (yych == 'p') goto yy284; - goto yy198; - } - } - } - yy330: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '1') { - if (yych <= '/') goto yy215; - if (yych <= '0') goto yy332; - goto yy333; - } else { - if (yych <= '2') goto yy334; - if (yych <= '5') goto yy335; - if (yych <= '9') goto yy336; - goto yy215; - } - yy331: - yych = *++YYCURSOR; - if (yych <= '/') { - if (yych == '.') goto yy220; - goto yy56; - } else { - if (yych <= '0') goto yy303; - if (yych <= '9') goto yy304; - if (yych <= ':') goto yy220; - goto yy56; - } - yy332: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy349; - goto yy198; - } else { - if (yych <= '0') goto yy348; - if (yych <= '9') goto yy353; - if (yych <= ':') goto yy349; - goto yy198; - } - yy333: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy337; - goto yy198; - } else { - if (yych <= '2') goto yy353; - if (yych <= '9') goto yy348; - if (yych <= ':') goto yy337; - goto yy198; - } - yy334: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy337; - goto yy198; - } else { - if (yych <= '4') goto yy348; - if (yych <= '9') goto yy347; - if (yych <= ':') goto yy337; - goto yy198; - } - yy335: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy337; - goto yy198; - } else { - if (yych <= '9') goto yy347; - if (yych <= ':') goto yy337; - goto yy198; - } - yy336: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy198; - } else { - if (yych <= '9') goto yy262; - if (yych >= ';') goto yy198; - } - yy337: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy338; - if (yych <= '6') goto yy339; - if (yych <= '9') goto yy265; - goto yy56; - yy338: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy266; - goto yy222; - } else { - if (yych <= '9') goto yy340; - if (yych <= ':') goto yy266; - goto yy222; - } - yy339: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy266; - goto yy222; - } else { - if (yych <= '0') goto yy228; - if (yych == ':') goto yy266; - goto yy222; - } - yy340: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy342; - if (yych <= 0x1F) goto yy222; - goto yy342; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy222; - goto yy342; - } else { - if (yych == '+') goto yy342; - goto yy222; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy342; - if (yych <= '.') goto yy266; - if (yych <= '9') goto yy222; - goto yy266; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy222; - goto yy342; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy342; - goto yy222; - } - } - } - yy341: - ++YYCURSOR; - if ((YYLIMIT - YYCURSOR) < 9) YYFILL(9); - yych = *YYCURSOR; - yy342: - if (yych <= '@') { - if (yych <= '\'') { - if (yych <= '\t') { - if (yych <= 0x08) goto yy56; - goto yy341; - } else { - if (yych == ' ') goto yy341; - goto yy56; - } - } else { - if (yych <= '+') { - if (yych <= '(') goto yy233; - if (yych <= '*') goto yy56; - goto yy232; - } else { - if (yych == '-') goto yy232; - goto yy56; - } - } - } else { - if (yych <= 'Z') { - if (yych <= 'G') { - if (yych <= 'A') goto yy343; - if (yych <= 'F') goto yy234; - goto yy231; - } else { - if (yych != 'P') goto yy234; - } - } else { - if (yych <= 'o') { - if (yych <= '`') goto yy56; - if (yych <= 'a') goto yy344; - goto yy235; - } else { - if (yych <= 'p') goto yy344; - if (yych <= 'z') goto yy235; - goto yy56; - } - } - } - yy343: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy227; - goto yy222; - } else { - if (yych <= '.') goto yy285; - if (yych <= '@') goto yy222; - goto yy236; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy345; - if (yych <= 'Z') goto yy236; - goto yy222; - } else { - if (yych == 'm') goto yy346; - if (yych <= 'z') goto yy241; - goto yy222; - } - } - yy344: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'L') { - if (yych <= '-') { - if (yych == ')') goto yy227; - goto yy222; - } else { - if (yych <= '.') goto yy285; - if (yych <= '@') goto yy222; - goto yy236; - } - } else { - if (yych <= '`') { - if (yych <= 'M') goto yy345; - if (yych <= 'Z') goto yy236; - goto yy222; - } else { - if (yych == 'm') goto yy345; - if (yych <= 'z') goto yy236; - goto yy222; - } - } - yy345: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ')') { - if (yych <= '\t') { - if (yych <= 0x00) goto yy277; - if (yych <= 0x08) goto yy222; - goto yy277; - } else { - if (yych == ' ') goto yy277; - if (yych <= '(') goto yy222; - goto yy227; - } - } else { - if (yych <= '@') { - if (yych == '.') goto yy287; - goto yy222; - } else { - if (yych <= 'Z') goto yy237; - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy237; - goto yy222; - } - } - yy346: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '-') { - if (yych <= 0x1F) { - if (yych <= 0x00) goto yy277; - if (yych == '\t') goto yy277; - goto yy222; - } else { - if (yych <= '(') { - if (yych <= ' ') goto yy277; - goto yy222; - } else { - if (yych <= ')') goto yy227; - if (yych <= ',') goto yy222; - goto yy243; - } - } - } else { - if (yych <= 'Z') { - if (yych <= '.') goto yy287; - if (yych <= '/') goto yy243; - if (yych <= '@') goto yy222; - goto yy237; - } else { - if (yych <= '_') { - if (yych <= '^') goto yy222; - goto yy243; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy242; - goto yy222; - } - } - } - yy347: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy224; - goto yy198; - } else { - if (yych <= '9') goto yy288; - if (yych <= ':') goto yy224; - goto yy198; - } - yy348: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych != '.') goto yy198; - } else { - if (yych <= '9') goto yy288; - if (yych >= ';') goto yy198; - } - yy349: - yych = *++YYCURSOR; - if (yych <= '/') goto yy56; - if (yych <= '5') goto yy350; - if (yych <= '6') goto yy351; - if (yych <= '9') goto yy223; - goto yy56; - yy350: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy224; - goto yy222; - } else { - if (yych <= '9') goto yy352; - if (yych <= ':') goto yy224; - goto yy222; - } - yy351: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy224; - goto yy222; - } else { - if (yych <= '0') goto yy228; - if (yych == ':') goto yy224; - goto yy222; - } - yy352: - yyaccept = 7; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= ',') { - if (yych <= ' ') { - if (yych == '\t') goto yy230; - if (yych <= 0x1F) goto yy222; - goto yy230; - } else { - if (yych <= '(') { - if (yych <= '\'') goto yy222; - goto yy230; - } else { - if (yych == '+') goto yy230; - goto yy222; - } - } - } else { - if (yych <= ':') { - if (yych <= '-') goto yy230; - if (yych <= '.') goto yy224; - if (yych <= '9') goto yy222; - goto yy224; - } else { - if (yych <= 'Z') { - if (yych <= '@') goto yy222; - goto yy230; - } else { - if (yych <= '`') goto yy222; - if (yych <= 'z') goto yy230; - goto yy222; - } - } - } - yy353: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') { - if (yych == '.') goto yy337; - goto yy198; - } else { - if (yych <= '9') goto yy288; - if (yych <= ':') goto yy337; - goto yy198; - } - yy354: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych == '.') goto yy299; - goto yy215; - } else { - if (yych <= '0') goto yy331; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy263; - if (yych == 'n') goto yy211; - goto yy215; - } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; - } + if (yych == '.') goto yy274; + goto yy207; + } else { + if (yych <= '9') goto yy290; + if (yych <= ':') goto yy274; + goto yy207; } - yy355: + yy293: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych == '.') goto yy299; - goto yy215; - } else { - if (yych <= '0') goto yy331; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; - } + if (yych <= '/') { + if (yych == '.') goto yy219; + goto yy207; } else { - if (yych <= 'q') { - if (yych <= ':') goto yy263; - if (yych == 'n') goto yy211; - goto yy215; - } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; - } + if (yych <= '9') goto yy290; + if (yych <= ':') goto yy219; + goto yy207; } - yy356: + yy294: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy215; - if (yych <= '0') goto yy359; - goto yy360; + if (yych <= 0x00) goto yy213; + goto yy212; + yy295: + yych = *++YYCURSOR; + if (yych <= '/') goto yy56; + if (yych >= ':') goto yy56; + ++YYCURSOR; + #line 1338 "ext/date/lib/parse_date.re" + { + int length = 0; + DEBUG_OUTPUT("datenoday"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->m = timelib_get_month((char **) &ptr); + s->time->y = timelib_get_nr_ex((char **) &ptr, 4, &length); + s->time->d = 1; + TIMELIB_PROCESS_YEAR(s->time->y, length); + TIMELIB_DEINIT; + return TIMELIB_DATE_NO_DAY; + } -#line 5134 "<stdout>" ++#line 5134 "ext/date/lib/parse_date.c" + yy298: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy213; + goto yy56; + } else { + if (yych <= '\t') goto yy211; + if (yych <= 0x1F) goto yy56; + goto yy211; + } } else { - if (yych <= '2') goto yy367; - if (yych <= '9') goto yy368; - goto yy215; + if (yych <= '-') { + if (yych == ',') goto yy211; + goto yy56; + } else { + if (yych <= '.') goto yy211; + if (yych <= '/') goto yy56; + goto yy295; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy211; - if (yych <= 'q') goto yy215; - goto yy212; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy211; + } else { + if (yych == 'h') goto yy211; + goto yy56; + } } else { - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; + if (yych <= 'r') { + if (yych <= 'n') goto yy208; + if (yych <= 'q') goto yy56; + goto yy209; + } else { + if (yych <= 's') goto yy206; + if (yych <= 't') goto yy210; + goto yy56; + } } } - yy357: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy215; - if (yych <= '0') goto yy359; - goto yy360; + yy299: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy213; + goto yy56; + } else { + if (yych <= '\t') goto yy211; + if (yych <= 0x1F) goto yy56; + goto yy211; + } } else { - if (yych <= '2') goto yy367; - if (yych <= '9') goto yy368; - goto yy215; + if (yych <= '-') { + if (yych == ',') goto yy211; + goto yy56; + } else { + if (yych <= '.') goto yy211; + if (yych <= '/') goto yy56; + goto yy302; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy211; - if (yych <= 'q') goto yy215; - goto yy212; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy211; + } else { + if (yych == 'h') goto yy211; + goto yy56; + } } else { - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; + if (yych <= 'r') { + if (yych <= 'n') goto yy208; + if (yych <= 'q') goto yy56; + goto yy209; + } else { + if (yych <= 's') goto yy206; + if (yych <= 't') goto yy210; + goto yy56; + } } } - yy358: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= 'm') { - if (yych <= '1') { - if (yych <= '/') goto yy215; - if (yych >= '1') goto yy360; + yy300: + yych = *++YYCURSOR; + if (yych <= '9') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy213; + goto yy56; + } else { + if (yych <= '\t') goto yy211; + if (yych <= 0x1F) goto yy56; + goto yy211; + } } else { - if (yych <= '2') goto yy208; - if (yych <= '9') goto yy209; - goto yy215; + if (yych <= '-') { + if (yych == ',') goto yy211; + goto yy56; + } else { + if (yych <= '.') goto yy211; + if (yych <= '/') goto yy56; + goto yy302; + } } } else { - if (yych <= 'r') { - if (yych <= 'n') goto yy211; - if (yych <= 'q') goto yy215; - goto yy212; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy211; + } else { + if (yych == 'h') goto yy211; + goto yy56; + } } else { - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; + if (yych <= 'r') { + if (yych <= 'n') goto yy208; + if (yych <= 'q') goto yy56; + goto yy209; + } else { + if (yych <= 's') goto yy206; + if (yych <= 't') goto yy210; + goto yy56; + } } } - yy359: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy215; - if (yych <= '-') goto yy361; - if (yych <= '.') goto yy330; - goto yy215; + yy301: + yych = *++YYCURSOR; + if (yych <= '1') { + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy213; + goto yy56; + } else { + if (yych <= '\t') goto yy211; + if (yych <= 0x1F) goto yy56; + goto yy211; + } } else { - if (yych <= '0') goto yy331; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; + if (yych <= '-') { + if (yych == ',') goto yy211; + goto yy56; + } else { + if (yych <= '.') goto yy211; + if (yych <= '/') goto yy56; + } } } else { - if (yych <= 'q') { - if (yych <= ':') goto yy220; - if (yych == 'n') goto yy211; - goto yy215; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= '9') goto yy205; + if (yych <= 'c') goto yy56; + goto yy211; + } else { + if (yych == 'h') goto yy211; + goto yy56; + } } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; + if (yych <= 'r') { + if (yych <= 'n') goto yy208; + if (yych <= 'q') goto yy56; + goto yy209; + } else { + if (yych <= 's') goto yy206; + if (yych <= 't') goto yy210; + goto yy56; + } } } - yy360: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); + yy302: + yych = *++YYCURSOR; if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy215; - if (yych <= '-') goto yy361; - if (yych <= '.') goto yy299; - goto yy215; + if (yych <= ' ') { + if (yych <= 0x08) { + if (yych <= 0x00) goto yy213; + goto yy56; + } else { + if (yych <= '\t') goto yy211; + if (yych <= 0x1F) goto yy56; + goto yy211; + } } else { - if (yych <= '0') goto yy300; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; + if (yych <= '-') { + if (yych <= '+') goto yy56; + if (yych <= ',') goto yy211; + } else { + if (yych <= '.') goto yy211; + if (yych <= '/') goto yy56; + goto yy295; + } } } else { - if (yych <= 'q') { - if (yych <= ':') goto yy263; - if (yych == 'n') goto yy211; - goto yy215; + if (yych <= 'm') { + if (yych <= 'd') { + if (yych <= 'c') goto yy56; + goto yy211; + } else { + if (yych == 'h') goto yy211; + goto yy56; + } } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; + if (yych <= 'r') { + if (yych <= 'n') goto yy208; + if (yych <= 'q') goto yy56; + goto yy209; + } else { + if (yych <= 's') goto yy206; + if (yych <= 't') goto yy210; + goto yy56; + } } } - yy361: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; @@@ -6216,71 -5366,17 +5366,17 @@@ yy305 TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 6220 "ext/date/lib/parse_date.c" - yy364: -#line 5370 "<stdout>" ++#line 5370 "ext/date/lib/parse_date.c" + yy306: yych = *++YYCURSOR; - if (yych <= '/') goto yy363; - if (yych >= ':') goto yy363; + if (yych <= '/') goto yy305; + if (yych >= ':') goto yy305; yych = *++YYCURSOR; - if (yych <= '/') goto yy363; - if (yych >= ':') goto yy363; + if (yych <= '/') goto yy305; + if (yych >= ':') goto yy305; yych = *++YYCURSOR; - goto yy363; - yy367: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy215; - if (yych <= '-') goto yy361; - if (yych <= '.') goto yy299; - goto yy215; - } else { - if (yych <= '0') goto yy331; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy263; - if (yych == 'n') goto yy211; - goto yy215; - } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; - } - } - yy368: - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '9') { - if (yych <= '/') { - if (yych <= ',') goto yy215; - if (yych <= '-') goto yy361; - if (yych <= '.') goto yy299; - goto yy215; - } else { - if (yych <= '0') goto yy331; - if (yych <= '1') goto yy301; - if (yych <= '2') goto yy302; - goto yy296; - } - } else { - if (yych <= 'q') { - if (yych <= ':') goto yy263; - if (yych == 'n') goto yy211; - goto yy215; - } else { - if (yych <= 'r') goto yy212; - if (yych <= 's') goto yy210; - if (yych <= 't') goto yy213; - goto yy215; - } - } - yy369: + goto yy305; + yy309: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'B') { @@@ -6845,8 -5941,8 +5941,8 @@@ yy332 TIMELIB_DEINIT; return TIMELIB_AGO; } - #line 6849 "ext/date/lib/parse_date.c" - yy393: -#line 5945 "<stdout>" ++#line 5945 "ext/date/lib/parse_date.c" + yy333: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { @@@ -8544,8 -7640,8 +7640,8 @@@ yy394 TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 8548 "ext/date/lib/parse_date.c" - yy455: -#line 7644 "<stdout>" ++#line 7644 "ext/date/lib/parse_date.c" + yy395: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@@ -9091,9 -8187,9 +8187,9 @@@ yy415 TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } - #line 9095 "ext/date/lib/parse_date.c" - yy476: - yyaccept = 10; -#line 8191 "<stdout>" ++#line 8191 "ext/date/lib/parse_date.c" + yy416: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ',') { if (yych <= '\t') { @@@ -9235,17 -8331,17 +8331,17 @@@ yy427 TIMELIB_DEINIT; return TIMELIB_TIME12; } - #line 9239 "ext/date/lib/parse_date.c" - yy489: - yyaccept = 11; -#line 8335 "<stdout>" ++#line 8335 "ext/date/lib/parse_date.c" + yy429: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy492; + if (yych == '.') goto yy432; } else { - if (yych <= '9') goto yy506; - if (yych <= ':') goto yy492; + if (yych <= '9') goto yy446; + if (yych <= ':') goto yy432; } - yy490: + yy430: #line 1135 "ext/date/lib/parse_date.re" { int tz_not_found; @@@ -9271,37 -8367,37 +8367,37 @@@ TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 9275 "ext/date/lib/parse_date.c" - yy491: - yyaccept = 11; -#line 8371 "<stdout>" ++#line 8371 "ext/date/lib/parse_date.c" + yy431: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy492; - if (yych != ':') goto yy490; - yy492: + if (yych == '.') goto yy432; + if (yych != ':') goto yy430; + yy432: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '5') goto yy493; - if (yych <= '6') goto yy494; - if (yych <= '9') goto yy495; + if (yych <= '5') goto yy433; + if (yych <= '6') goto yy434; + if (yych <= '9') goto yy435; goto yy56; - yy493: - yyaccept = 11; + yy433: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy499; - goto yy490; - yy494: - yyaccept = 11; + if (yych == '.') goto yy436; + if (yych <= '/') goto yy430; + if (yych <= '9') goto yy439; + goto yy430; + yy434: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych == '0') goto yy499; - goto yy490; - yy495: - yyaccept = 11; + if (yych == '.') goto yy436; + if (yych == '0') goto yy439; + goto yy430; + yy435: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '.') goto yy490; - yy496: + if (yych != '.') goto yy430; + yy436: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= ':') goto yy56; @@@ -9567,9 -8663,9 +8663,9 @@@ yy462 TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } - #line 9571 "ext/date/lib/parse_date.c" - yy524: - yyaccept = 11; -#line 8667 "<stdout>" ++#line 8667 "ext/date/lib/parse_date.c" + yy464: + yyaccept = 10; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; @@@ -9676,56 -8772,56 +8772,56 @@@ yy474 TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } - #line 9680 "ext/date/lib/parse_date.c" - yy535: -#line 8776 "<stdout>" ++#line 8776 "ext/date/lib/parse_date.c" + yy475: yych = *++YYCURSOR; - if (yych == 'M') goto yy536; + if (yych == 'M') goto yy476; if (yych != 'm') goto yy56; - yy536: + yy476: yych = *++YYCURSOR; - if (yych == 'B') goto yy537; + if (yych == 'B') goto yy477; if (yych != 'b') goto yy56; - yy537: + yy477: yych = *++YYCURSOR; - if (yych == 'E') goto yy538; + if (yych == 'E') goto yy478; if (yych != 'e') goto yy56; - yy538: + yy478: yych = *++YYCURSOR; - if (yych == 'R') goto yy539; + if (yych == 'R') goto yy479; if (yych != 'r') goto yy56; - yy539: - yyaccept = 10; + yy479: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy531; - if (yych <= 0x1F) goto yy475; - goto yy531; + if (yych == '\t') goto yy471; + if (yych <= 0x1F) goto yy415; + goto yy471; } else { if (yych <= '.') { - if (yych <= ',') goto yy475; - goto yy531; + if (yych <= ',') goto yy415; + goto yy471; } else { - if (yych <= '/') goto yy475; - if (yych <= '9') goto yy533; - goto yy475; + if (yych <= '/') goto yy415; + if (yych <= '9') goto yy473; + goto yy415; } } - yy540: + yy480: yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych >= ':') goto yy534; - yy541: + if (yych <= '/') goto yy474; + if (yych >= ':') goto yy474; + yy481: yych = *++YYCURSOR; - if (yych <= '/') goto yy534; - if (yych >= ':') goto yy534; + if (yych <= '/') goto yy474; + if (yych >= ':') goto yy474; yych = *++YYCURSOR; - goto yy534; - yy543: + goto yy474; + yy483: yych = *++YYCURSOR; - if (yych == 'T') goto yy544; + if (yych == 'T') goto yy484; if (yych != 't') goto yy56; - yy544: - yyaccept = 10; + yy484: + yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '.') { if (yych <= 0x1F) { @@@ -10351,37 -9447,37 +9447,37 @@@ yy544 TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 10355 "ext/date/lib/parse_date.c" - yy607: - yyaccept = 11; -#line 9451 "<stdout>" ++#line 9451 "ext/date/lib/parse_date.c" + yy547: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych <= '9') goto yy612; - goto yy490; - yy608: - yyaccept = 11; + if (yych == '.') goto yy436; + if (yych <= '/') goto yy430; + if (yych <= '9') goto yy552; + goto yy430; + yy548: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '/') { - if (yych == '.') goto yy496; - goto yy490; + if (yych == '.') goto yy436; + goto yy430; } else { - if (yych <= '0') goto yy612; - if (yych <= '9') goto yy610; - goto yy490; + if (yych <= '0') goto yy552; + if (yych <= '9') goto yy550; + goto yy430; } - yy609: - yyaccept = 11; + yy549: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '.') goto yy496; - if (yych <= '/') goto yy490; - if (yych >= ':') goto yy490; - yy610: - yyaccept = 12; + if (yych == '.') goto yy436; + if (yych <= '/') goto yy430; + if (yych >= ':') goto yy430; + yy550: + yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy611; - if (yych <= '9') goto yy604; - yy611: + if (yych <= '/') goto yy551; + if (yych <= '9') goto yy544; + yy551: #line 1324 "ext/date/lib/parse_date.re" { int length = 0; @@@ -10395,9 -9491,9 +9491,9 @@@ TIMELIB_DEINIT; return TIMELIB_DATE_FULL_POINTED; } - #line 10399 "ext/date/lib/parse_date.c" - yy612: - yyaccept = 11; -#line 9495 "<stdout>" ++#line 9495 "ext/date/lib/parse_date.c" + yy552: + yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if (yych <= '9') { if (yych <= ' ') { @@@ -11004,9 -10100,9 +10100,9 @@@ yy596 TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 11008 "ext/date/lib/parse_date.c" - yy657: - yyaccept = 13; -#line 10104 "<stdout>" ++#line 10104 "ext/date/lib/parse_date.c" + yy597: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '1') { @@@ -11115,9 -10211,9 +10211,9 @@@ yy606 TIMELIB_DEINIT; return TIMELIB_AMERICAN; } - #line 11119 "ext/date/lib/parse_date.c" - yy667: - yyaccept = 14; -#line 10215 "<stdout>" ++#line 10215 "ext/date/lib/parse_date.c" + yy607: + yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'n') { if (yych <= '/') { @@@ -11334,37 -10430,37 +10430,37 @@@ yy640 TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 11338 "ext/date/lib/parse_date.c" - yy701: -#line 10434 "<stdout>" ++#line 10434 "ext/date/lib/parse_date.c" + yy641: yych = *++YYCURSOR; if (yych <= '5') { - if (yych <= '/') goto yy700; - if (yych >= '5') goto yy704; + if (yych <= '/') goto yy640; + if (yych >= '5') goto yy644; } else { - if (yych <= '9') goto yy705; - if (yych <= ':') goto yy703; - goto yy700; + if (yych <= '9') goto yy645; + if (yych <= ':') goto yy643; + goto yy640; } - yy702: + yy642: yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych <= '5') goto yy704; - if (yych <= '9') goto yy705; - if (yych >= ';') goto yy700; - yy703: + if (yych <= '/') goto yy640; + if (yych <= '5') goto yy644; + if (yych <= '9') goto yy645; + if (yych >= ';') goto yy640; + yy643: yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych <= '5') goto yy704; - if (yych <= '9') goto yy705; - goto yy700; - yy704: + if (yych <= '/') goto yy640; + if (yych <= '5') goto yy644; + if (yych <= '9') goto yy645; + goto yy640; + yy644: yych = *++YYCURSOR; - if (yych <= '/') goto yy700; - if (yych >= ':') goto yy700; - yy705: + if (yych <= '/') goto yy640; + if (yych >= ':') goto yy640; + yy645: yych = *++YYCURSOR; - goto yy700; - yy706: + goto yy640; + yy646: yych = *++YYCURSOR; if (yych != 'T') goto yy56; yych = *++YYCURSOR; @@@ -11834,32 -10930,32 +10930,32 @@@ yy703 TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 11838 "ext/date/lib/parse_date.c" - yy764: -#line 10934 "<stdout>" ++#line 10934 "ext/date/lib/parse_date.c" + yy704: yych = *++YYCURSOR; - if (yych == 'C') goto yy765; + if (yych == 'C') goto yy705; if (yych != 'c') goto yy56; - yy765: + yy705: yych = *++YYCURSOR; if (yych != '-') goto yy56; - yy766: + yy706: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '0') goto yy767; - if (yych <= '2') goto yy768; - if (yych <= '3') goto yy769; + if (yych <= '0') goto yy707; + if (yych <= '2') goto yy708; + if (yych <= '3') goto yy709; goto yy56; - yy767: + yy707: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy770; + if (yych <= '9') goto yy710; goto yy56; - yy768: + yy708: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy770; + if (yych <= '9') goto yy710; goto yy56; - yy769: + yy709: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '2') goto yy56; @@@ -11878,47 -10974,47 +10974,47 @@@ yy710 TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } - #line 11882 "ext/date/lib/parse_date.c" - yy772: -#line 10978 "<stdout>" ++#line 10978 "ext/date/lib/parse_date.c" + yy712: yych = *++YYCURSOR; - if (yych == 'V') goto yy765; - if (yych == 'v') goto yy765; + if (yych == 'V') goto yy705; + if (yych == 'v') goto yy705; goto yy56; - yy773: + yy713: yych = *++YYCURSOR; - if (yych == 'T') goto yy765; - if (yych == 't') goto yy765; + if (yych == 'T') goto yy705; + if (yych == 't') goto yy705; goto yy56; - yy774: + yy714: yych = *++YYCURSOR; - if (yych == 'P') goto yy775; + if (yych == 'P') goto yy715; if (yych != 'p') goto yy56; - yy775: + yy715: yych = *++YYCURSOR; if (yych <= 'S') { - if (yych == '-') goto yy766; + if (yych == '-') goto yy706; goto yy56; } else { - if (yych <= 'T') goto yy765; - if (yych == 't') goto yy765; + if (yych <= 'T') goto yy705; + if (yych == 't') goto yy705; goto yy56; } - yy776: + yy716: yych = *++YYCURSOR; - if (yych == 'G') goto yy765; - if (yych == 'g') goto yy765; + if (yych == 'G') goto yy705; + if (yych == 'g') goto yy705; goto yy56; - yy777: + yy717: yych = *++YYCURSOR; - if (yych == 'R') goto yy765; - if (yych == 'r') goto yy765; + if (yych == 'R') goto yy705; + if (yych == 'r') goto yy705; goto yy56; - yy778: + yy718: yych = *++YYCURSOR; if (yych <= 'Y') { - if (yych == 'R') goto yy765; + if (yych == 'R') goto yy705; if (yych <= 'X') goto yy56; - goto yy765; + goto yy705; } else { if (yych <= 'r') { if (yych <= 'q') goto yy56; @@@ -12011,12 -11107,12 +11107,12 @@@ yy723 TIMELIB_DEINIT; return TIMELIB_CLF; } - #line 12015 "ext/date/lib/parse_date.c" - yy784: -#line 11111 "<stdout>" ++#line 11111 "ext/date/lib/parse_date.c" + yy724: yych = *++YYCURSOR; switch (yych) { - case '0': goto yy785; - case '1': goto yy786; + case '0': goto yy725; + case '1': goto yy726; case '2': case '3': case '4': @@@ -12162,21 -11258,21 +11258,21 @@@ yy733 TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } - #line 12166 "ext/date/lib/parse_date.c" - yy794: -#line 11262 "<stdout>" ++#line 11262 "ext/date/lib/parse_date.c" + yy734: yych = *++YYCURSOR; - if (yych == 'I') goto yy927; - goto yy793; - yy795: + if (yych == 'I') goto yy867; + goto yy733; + yy735: yych = *++YYCURSOR; - if (yych == 'I') goto yy926; - goto yy793; - yy796: + if (yych == 'I') goto yy866; + goto yy733; + yy736: yych = *++YYCURSOR; if (yych <= 'U') { - if (yych == 'A') goto yy919; + if (yych == 'A') goto yy859; if (yych <= 'T') goto yy56; - goto yy918; + goto yy858; } else { if (yych <= 'a') { if (yych <= '`') goto yy56; @@@ -12374,8 -11470,8 +11470,8 @@@ yy754 TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 12378 "ext/date/lib/parse_date.c" - yy815: -#line 11474 "<stdout>" ++#line 11474 "ext/date/lib/parse_date.c" + yy755: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '8') goto yy56; @@@ -12399,20 -11495,20 +11495,20 @@@ yy756 TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } - #line 12403 "ext/date/lib/parse_date.c" - yy818: -#line 11499 "<stdout>" ++#line 11499 "ext/date/lib/parse_date.c" + yy758: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy820; + if (yych <= '9') goto yy760; goto yy60; - yy819: + yy759: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '6') goto yy820; + if (yych <= '6') goto yy760; if (yych <= '9') goto yy54; goto yy60; - yy820: - yyaccept = 18; + yy760: + yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy54; @@@ -12472,18 -11568,18 +11568,18 @@@ yy761 TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } - #line 12476 "ext/date/lib/parse_date.c" - yy822: -#line 11572 "<stdout>" ++#line 11572 "ext/date/lib/parse_date.c" + yy762: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy820; + if (yych <= '9') goto yy760; goto yy60; - yy823: + yy763: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '9') goto yy825; + if (yych <= '9') goto yy765; goto yy56; - yy824: + yy764: yych = *++YYCURSOR; if (yych <= '/') goto yy56; if (yych >= '3') goto yy56; @@@ -12579,8 -11675,8 +11675,8 @@@ yy782 TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } - #line 12583 "ext/date/lib/parse_date.c" - yy843: -#line 11679 "<stdout>" ++#line 11679 "ext/date/lib/parse_date.c" + yy783: yych = *++YYCURSOR; if (yych <= '2') { if (yych <= '/') goto yy60; @@@ -12846,8 -11942,8 +11942,8 @@@ yy788 TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } - #line 12850 "ext/date/lib/parse_date.c" - yy849: -#line 11946 "<stdout>" ++#line 11946 "ext/date/lib/parse_date.c" + yy789: yych = *++YYCURSOR; if (yych <= 'H') { if (yych <= '2') { @@@ -13653,27 -12749,27 +12749,27 @@@ yy913 TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } - #line 13657 "ext/date/lib/parse_date.c" - yy974: - yyaccept = 22; -#line 12753 "<stdout>" ++#line 12753 "ext/date/lib/parse_date.c" + yy914: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych == '-') goto yy976; - if (yych <= '/') goto yy973; - if (yych <= '2') goto yy995; - goto yy973; - yy975: - yyaccept = 22; + if (yych == '-') goto yy916; + if (yych <= '/') goto yy913; + if (yych <= '2') goto yy935; + goto yy913; + yy915: + yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); - if (yych != '-') goto yy973; - yy976: + if (yych != '-') goto yy913; + yy916: yych = *++YYCURSOR; if (yych <= '/') goto yy56; - if (yych <= '2') goto yy977; - if (yych <= '3') goto yy978; - if (yych <= '9') goto yy979; + if (yych <= '2') goto yy917; + if (yych <= '3') goto yy918; + if (yych <= '9') goto yy919; goto yy56; - yy977: - yyaccept = 13; + yy917: + yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'm') { if (yych <= '9') { @@@ -14587,44 -13683,44 +13683,44 @@@ yy1007 TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } - #line 14591 "ext/date/lib/parse_date.c" - yy1068: -#line 13687 "<stdout>" ++#line 13687 "ext/date/lib/parse_date.c" + yy1008: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '0') goto yy1080; - if (yych <= '9') goto yy1081; + if (yych <= '0') goto yy1020; + if (yych <= '9') goto yy1021; goto yy60; - yy1069: + yy1009: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '2') goto yy1079; - if (yych <= '9') goto yy1078; + if (yych <= '2') goto yy1019; + if (yych <= '9') goto yy1018; goto yy60; - yy1070: + yy1010: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy1078; + if (yych <= '9') goto yy1018; goto yy60; - yy1071: + yy1011: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '5') goto yy1076; - if (yych <= '6') goto yy1077; - if (yych <= '9') goto yy1074; + if (yych <= '5') goto yy1016; + if (yych <= '6') goto yy1017; + if (yych <= '9') goto yy1014; goto yy60; - yy1072: + yy1012: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '9') goto yy1074; + if (yych <= '9') goto yy1014; goto yy60; - yy1073: + yy1013: yych = *++YYCURSOR; if (yych <= '/') goto yy60; - if (yych <= '0') goto yy1074; + if (yych <= '0') goto yy1014; if (yych <= '9') goto yy54; goto yy60; - yy1074: - yyaccept = 25; + yy1014: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yybm[0+yych] & 2) { goto yy54; @@@ -14690,9 -13786,9 +13786,9 @@@ yy1015 TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } - #line 14694 "ext/date/lib/parse_date.c" - yy1076: - yyaccept = 25; -#line 13790 "<stdout>" ++#line 13790 "ext/date/lib/parse_date.c" + yy1016: + yyaccept = 24; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { if (yych <= 'D') { @@@ -15562,8 -14658,8 +14658,8 @@@ yy1057 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 15566 "ext/date/lib/parse_date.c" - yy1118: -#line 14662 "<stdout>" ++#line 14662 "ext/date/lib/parse_date.c" + yy1058: ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2); yych = *YYCURSOR; @@@ -15625,19 -14721,19 +14721,19 @@@ yy1065 TIMELIB_DEINIT; return TIMELIB_WEEK_DAY_OF_MONTH; } - #line 15629 "ext/date/lib/parse_date.c" - yy1127: - yyaccept = 26; -#line 14725 "<stdout>" ++#line 14725 "ext/date/lib/parse_date.c" + yy1067: + yyaccept = 25; yych = *(YYMARKER = ++YYCURSOR); if (yych <= ' ') { - if (yych == '\t') goto yy1118; - if (yych <= 0x1F) goto yy1117; - goto yy1118; + if (yych == '\t') goto yy1058; + if (yych <= 0x1F) goto yy1057; + goto yy1058; } else { if (yych <= 'R') { - if (yych <= 'Q') goto yy1117; + if (yych <= 'Q') goto yy1057; } else { - if (yych != 'r') goto yy1117; + if (yych != 'r') goto yy1057; } } yych = *++YYCURSOR; @@@ -15741,53 -14837,53 +14837,53 @@@ yy1081 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 15745 "ext/date/lib/parse_date.c" - yy1142: -#line 14841 "<stdout>" ++#line 14841 "ext/date/lib/parse_date.c" + yy1082: yych = *++YYCURSOR; - goto yy1117; - yy1143: + goto yy1057; + yy1083: yych = *++YYCURSOR; - if (yych == 'A') goto yy1144; + if (yych == 'A') goto yy1084; if (yych != 'a') goto yy56; - yy1144: + yy1084: yych = *++YYCURSOR; - if (yych == 'Y') goto yy1145; + if (yych == 'Y') goto yy1085; if (yych != 'y') goto yy56; - yy1145: + yy1085: yych = *++YYCURSOR; - if (yych == 'S') goto yy1142; - if (yych == 's') goto yy1142; - goto yy1117; - yy1146: + if (yych == 'S') goto yy1082; + if (yych == 's') goto yy1082; + goto yy1057; + yy1086: yych = *++YYCURSOR; - if (yych == 'A') goto yy1147; + if (yych == 'A') goto yy1087; if (yych != 'a') goto yy56; - yy1147: + yy1087: yych = *++YYCURSOR; - if (yych == 'R') goto yy1148; + if (yych == 'R') goto yy1088; if (yych != 'r') goto yy56; - yy1148: + yy1088: yych = *++YYCURSOR; - if (yych == 'S') goto yy1142; - if (yych == 's') goto yy1142; - goto yy1117; - yy1149: + if (yych == 'S') goto yy1082; + if (yych == 's') goto yy1082; + goto yy1057; + yy1089: yych = *++YYCURSOR; - if (yych == 'I') goto yy1162; - if (yych == 'i') goto yy1162; + if (yych == 'I') goto yy1102; + if (yych == 'i') goto yy1102; goto yy56; - yy1150: + yy1090: yych = *++YYCURSOR; - if (yych == 'R') goto yy1151; + if (yych == 'R') goto yy1091; if (yych != 'r') goto yy56; - yy1151: + yy1091: yych = *++YYCURSOR; - if (yych == 'T') goto yy1152; + if (yych == 'T') goto yy1092; if (yych != 't') goto yy56; - yy1152: + yy1092: yych = *++YYCURSOR; if (yych <= 'N') { - if (yych == 'H') goto yy1154; + if (yych == 'H') goto yy1094; if (yych <= 'M') goto yy56; } else { if (yych <= 'h') { @@@ -18287,14 -17383,14 +17383,14 @@@ yy1234 TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 18291 "ext/date/lib/parse_date.c" - yy1295: - yyaccept = 28; -#line 17387 "<stdout>" ++#line 17387 "ext/date/lib/parse_date.c" + yy1235: + yyaccept = 27; yych = *(YYMARKER = ++YYCURSOR); - if (yych <= '/') goto yy1297; - if (yych >= '5') goto yy1297; - yy1296: - yyaccept = 28; + if (yych <= '/') goto yy1237; + if (yych >= '5') goto yy1237; + yy1236: + yyaccept = 27; YYMARKER = ++YYCURSOR; if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5); yych = *YYCURSOR; @@@ -18542,8 -17638,8 +17638,8 @@@ yy1255 TIMELIB_DEINIT; return TIMELIB_LF_DAY_OF_MONTH; } - #line 18546 "ext/date/lib/parse_date.c" - yy1317: -#line 17642 "<stdout>" ++#line 17642 "ext/date/lib/parse_date.c" + yy1257: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { @@@ -19927,8 -19023,8 +19023,8 @@@ yy1327 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 19931 "ext/date/lib/parse_date.c" - yy1388: -#line 19027 "<stdout>" ++#line 19027 "ext/date/lib/parse_date.c" + yy1328: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@@ -20344,8 -19440,8 +19440,8 @@@ yy1357 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 20348 "ext/date/lib/parse_date.c" - yy1418: -#line 19444 "<stdout>" ++#line 19444 "ext/date/lib/parse_date.c" + yy1358: yych = *++YYCURSOR; if (yych <= 'Y') { if (yych <= ')') { @@@ -20385,8 -19481,8 +19481,8 @@@ yy1360 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 20389 "ext/date/lib/parse_date.c" - yy1421: -#line 19485 "<stdout>" ++#line 19485 "ext/date/lib/parse_date.c" + yy1361: yych = *++YYCURSOR; if (yych <= 'S') { if (yych <= '@') { @@@ -22325,8 -21421,8 +21421,8 @@@ yy1440 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 22329 "ext/date/lib/parse_date.c" - yy1501: -#line 21425 "<stdout>" ++#line 21425 "ext/date/lib/parse_date.c" + yy1441: yych = *++YYCURSOR; if (yych <= 'N') { if (yych <= ')') { @@@ -22467,8 -21563,8 +21563,8 @@@ yy1448 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 22471 "ext/date/lib/parse_date.c" - yy1509: -#line 21567 "<stdout>" ++#line 21567 "ext/date/lib/parse_date.c" + yy1449: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'V') { @@@ -22988,8 -22084,8 +22084,8 @@@ yy1471 TIMELIB_DEINIT; return TIMELIB_RELATIVE; } - #line 22992 "ext/date/lib/parse_date.c" - yy1532: -#line 22088 "<stdout>" ++#line 22088 "ext/date/lib/parse_date.c" + yy1472: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); if (yych <= 'R') { diff --cc ext/wddx/wddx.c index 25d7dea,41fdd3d..62c9e8e --- a/ext/wddx/wddx.c +++ b/ext/wddx/wddx.c @@@ -756,28 -791,30 +756,28 @@@ static void php_wddx_push_element(void ent.type = ST_NUMBER; SET_STACK_VARNAME; - ALLOC_ZVAL(ent.data); - INIT_PZVAL(ent.data); - Z_TYPE_P(ent.data) = IS_LONG; - Z_LVAL_P(ent.data) = 0; + ZVAL_LONG(&ent.data, 0); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); - } else if (!strcmp(name, EL_BOOLEAN)) { + } else if (!strcmp((char *)name, EL_BOOLEAN)) { int i; + ALLOC_ZVAL(ent.data); + INIT_PZVAL(ent.data); + Z_TYPE_P(ent.data) = IS_BOOL; + ent.type = ST_BOOLEAN; + SET_STACK_VARNAME; if (atts) for (i = 0; atts[i]; i++) { - if (!strcmp(atts[i], EL_VALUE) && atts[i+1] && atts[i+1][0]) { + if (!strcmp((char *)atts[i], EL_VALUE) && atts[i+1] && atts[i+1][0]) { - ent.type = ST_BOOLEAN; - SET_STACK_VARNAME; - + ZVAL_TRUE(&ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); - php_wddx_process_data(user_data, atts[i+1], strlen(atts[i+1])); + php_wddx_process_data(user_data, atts[i+1], strlen((char *)atts[i+1])); break; } } else { - ent.type = ST_BOOLEAN; - SET_STACK_VARNAME; - ZVAL_FALSE(&ent.data); + ZVAL_FALSE(ent.data); wddx_stack_push((wddx_stack *)stack, &ent, sizeof(st_entry)); } - } else if (!strcmp(name, EL_NULL)) { + } else if (!strcmp((char *)name, EL_NULL)) { ent.type = ST_NULL; SET_STACK_VARNAME;
« previous php.cvs (#98355) next »