From e226f0f87fcb0b72f1dcc56668871bc308ed2bc7 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Wed, 24 Aug 2005 13:47:28 +0000 Subject: - Fixed bug #34087 (strtotime() does not work with date format "Y/m/d"). - Make use of YYMAXFILL. - Added support for using a . as hour/minute/second separator. --- ext/date/lib/parse_date.c | 7621 +++++++++++++++++++---------------- ext/date/lib/parse_date.re | 56 +- ext/date/lib/resource/parse_date.re | 56 +- ext/date/php_date.c | 229 +- ext/date/php_date.h | 1 + ext/date/tests/bug34087.phpt | 10 + 6 files changed, 4321 insertions(+), 3652 deletions(-) create mode 100644 ext/date/tests/bug34087.phpt (limited to 'ext') diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c index 486061f830..aa44ba199b 100644 --- a/ext/date/lib/parse_date.c +++ b/ext/date/lib/parse_date.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.8.dev on Tue Aug 9 23:05:03 2005 */ +/* Generated by re2c 0.9.8.dev on Wed Aug 24 15:27:50 2005 */ #line 1 "resource/parse_date.re" /* +----------------------------------------------------------------------+ @@ -821,7 +821,7 @@ std: YYDEBUG(1, *YYCURSOR); ++YYCURSOR; yy0: - if((YYLIMIT - YYCURSOR) < 25) YYFILL(25); + if((YYLIMIT - YYCURSOR) < 26) YYFILL(26); yych = *YYCURSOR; YYDEBUG(-1, yych); switch(yych){ @@ -890,47 +890,48 @@ yy2: if(yych <= 'Z') goto yy48; goto yy3; } else { - if(yych == 'e') goto yy1277; + if(yych == 'e') goto yy1308; if(yych <= 'z') goto yy48; goto yy3; } yy3: YYDEBUG(3, *YYCURSOR); -#line 1342 "resource/parse_date.re" +#line 1360 "resource/parse_date.re" { int tz_not_found; + DEBUG_OUTPUT("tzcorrection | tz"); TIMELIB_INIT; s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found); s->errors += tz_not_found; TIMELIB_DEINIT; return TIMELIB_TIMEZONE; } -#line 903 "" +#line 904 "" yy4: YYDEBUG(4, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= 'H'){ if(yych <= '@') goto yy3; - if(yych == 'E') goto yy593; + if(yych == 'E') goto yy604; goto yy48; } else { - if(yych <= 'I') goto yy594; - if(yych == 'O') goto yy589; + if(yych <= 'I') goto yy605; + if(yych == 'O') goto yy600; goto yy48; } } else { if(yych <= 'h'){ if(yych <= '`') goto yy3; - if(yych == 'e') goto yy593; + if(yych == 'e') goto yy604; goto yy48; } else { if(yych <= 'n'){ - if(yych <= 'i') goto yy594; + if(yych <= 'i') goto yy605; goto yy48; } else { - if(yych <= 'o') goto yy1274; + if(yych <= 'o') goto yy1305; if(yych <= 'z') goto yy48; goto yy3; } @@ -978,27 +979,27 @@ yy5: case 'H': case 'h': goto yy470; case 'U': case 'u': goto yy471; case 'W': case 'w': goto yy472; - case 'o': goto yy1262; + case 'o': goto yy1293; default: goto yy3; } yy6: YYDEBUG(6, *YYCURSOR); yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '-') goto yy1258; + if(yych == '-') goto yy1289; if(yych <= '0') goto yy7; - if(yych <= '9') goto yy1259; + if(yych <= '9') goto yy1290; goto yy7; yy7: YYDEBUG(7, *YYCURSOR); -#line 1406 "resource/parse_date.re" +#line 1426 "resource/parse_date.re" { /* printf("unexpected character: #%d, %c ", *s->tok, *s->tok); */ s->errors++; goto std; } -#line 986 "" +#line 987 "" yy8: YYDEBUG(8, *YYCURSOR); yyaccept = 0; @@ -1028,11 +1029,11 @@ yy8: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy765; - case '-': goto yy772; - case '.': goto yy775; - case '/': goto yy771; - case '0': goto yy1257; + case 't': case 'w': case 'y': goto yy776; + case '-': goto yy783; + case '.': goto yy1255; + case '/': goto yy782; + case '0': goto yy1288; case '1': case '2': case '3': @@ -1041,8 +1042,8 @@ yy8: case '6': case '7': case '8': - case '9': goto yy1256; - case ':': goto yy1233; + case '9': goto yy1287; + case ':': goto yy1256; default: goto yy7; } yy9: @@ -1074,21 +1075,21 @@ yy9: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy765; - case '-': goto yy772; - case '.': goto yy775; - case '/': goto yy771; + case 't': case 'w': case 'y': goto yy776; + case '-': goto yy783; + case '.': goto yy786; + case '/': goto yy782; case '0': case '1': - case '2': goto yy1256; + case '2': goto yy1287; case '3': case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1232; - case ':': goto yy784; + case '9': goto yy1254; + case ':': goto yy795; default: goto yy7; } yy10: @@ -1120,21 +1121,21 @@ yy10: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy765; - case '-': goto yy772; - case '.': goto yy775; - case '/': goto yy771; + case 't': case 'w': case 'y': goto yy776; + case '-': goto yy783; + case '.': goto yy786; + case '/': goto yy782; case '0': case '1': case '2': - case '3': goto yy1232; + case '3': goto yy1254; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1230; - case ':': goto yy784; + case '9': goto yy1246; + case ':': goto yy795; default: goto yy7; } yy11: @@ -1166,12 +1167,12 @@ yy11: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy765; - case '-': goto yy772; - case '.': goto yy775; - case '/': goto yy771; + case 't': case 'w': case 'y': goto yy776; + case '-': goto yy783; + case '.': goto yy786; + case '/': goto yy782; case '0': - case '1': goto yy1230; + case '1': goto yy1246; case '2': case '3': case '4': @@ -1179,8 +1180,8 @@ yy11: case '6': case '7': case '8': - case '9': goto yy770; - case ':': goto yy784; + case '9': goto yy781; + case ':': goto yy795; default: goto yy7; } yy12: @@ -1212,10 +1213,10 @@ yy12: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy765; - case '-': goto yy772; - case '.': goto yy775; - case '/': goto yy771; + case 't': case 'w': case 'y': goto yy776; + case '-': goto yy783; + case '.': goto yy786; + case '/': goto yy782; case '0': case '1': case '2': @@ -1225,8 +1226,8 @@ yy12: case '6': case '7': case '8': - case '9': goto yy770; - case ':': goto yy784; + case '9': goto yy781; + case ':': goto yy795; default: goto yy7; } yy13: @@ -1242,13 +1243,13 @@ yy13: if(yych <= '9') goto yy506; if(yych <= '@') goto yy3; if(yych <= 'H') goto yy48; - goto yy763; + goto yy774; } } else { if(yych <= 'X'){ - if(yych == 'V') goto yy762; + if(yych == 'V') goto yy773; if(yych <= 'W') goto yy48; - goto yy762; + goto yy773; } else { if(yych <= 'Z') goto yy48; if(yych <= '`') goto yy3; @@ -1271,7 +1272,7 @@ yy14: } } else { if(yych <= 'Z'){ - if(yych == 'I') goto yy760; + if(yych == 'I') goto yy771; goto yy48; } else { if(yych <= '`') goto yy3; @@ -1294,7 +1295,7 @@ yy15: } } else { if(yych <= 'Z'){ - if(yych == 'I') goto yy758; + if(yych == 'I') goto yy769; goto yy48; } else { if(yych <= '`') goto yy3; @@ -1308,18 +1309,18 @@ yy16: if(yych <= 'Z'){ if(yych <= 'A'){ if(yych <= '@') goto yy3; - goto yy741; + goto yy752; } else { - if(yych == 'U') goto yy740; + if(yych == 'U') goto yy751; goto yy48; } } else { if(yych <= 't'){ if(yych <= '`') goto yy3; - if(yych <= 'a') goto yy750; + if(yych <= 'a') goto yy761; goto yy51; } else { - if(yych <= 'u') goto yy749; + if(yych <= 'u') goto yy760; if(yych <= 'z') goto yy51; goto yy3; } @@ -1330,18 +1331,18 @@ yy17: if(yych <= 'Z'){ if(yych <= 'A'){ if(yych <= '@') goto yy3; - goto yy741; + goto yy752; } else { - if(yych == 'U') goto yy740; + if(yych == 'U') goto yy751; goto yy48; } } else { if(yych <= 't'){ if(yych <= '`') goto yy3; - if(yych <= 'a') goto yy741; + if(yych <= 'a') goto yy752; goto yy48; } else { - if(yych <= 'u') goto yy740; + if(yych <= 'u') goto yy751; if(yych <= 'z') goto yy48; goto yy3; } @@ -1355,16 +1356,16 @@ yy18: if(yych <= '@') goto yy3; goto yy48; } else { - if(yych <= 'E') goto yy704; + if(yych <= 'E') goto yy715; if(yych <= 'H') goto yy48; - goto yy705; + goto yy716; } } else { if(yych <= 'O'){ if(yych <= 'N') goto yy48; - goto yy706; + goto yy717; } else { - if(yych == 'R') goto yy707; + if(yych == 'R') goto yy718; goto yy48; } } @@ -1374,16 +1375,16 @@ yy18: if(yych <= '`') goto yy3; goto yy51; } else { - if(yych <= 'e') goto yy722; + if(yych <= 'e') goto yy733; if(yych <= 'h') goto yy51; - goto yy723; + goto yy734; } } else { if(yych <= 'q'){ - if(yych == 'o') goto yy724; + if(yych == 'o') goto yy735; goto yy51; } else { - if(yych <= 'r') goto yy725; + if(yych <= 'r') goto yy736; if(yych <= 'z') goto yy51; goto yy3; } @@ -1398,16 +1399,16 @@ yy19: if(yych <= '@') goto yy3; goto yy48; } else { - if(yych <= 'E') goto yy704; + if(yych <= 'E') goto yy715; if(yych <= 'H') goto yy48; - goto yy705; + goto yy716; } } else { if(yych <= 'O'){ if(yych <= 'N') goto yy48; - goto yy706; + goto yy717; } else { - if(yych == 'R') goto yy707; + if(yych == 'R') goto yy718; goto yy48; } } @@ -1417,16 +1418,16 @@ yy19: if(yych <= '`') goto yy3; goto yy48; } else { - if(yych <= 'e') goto yy704; + if(yych <= 'e') goto yy715; if(yych <= 'h') goto yy48; - goto yy705; + goto yy716; } } else { if(yych <= 'q'){ - if(yych == 'o') goto yy706; + if(yych == 'o') goto yy717; goto yy48; } else { - if(yych <= 'r') goto yy707; + if(yych <= 'r') goto yy718; if(yych <= 'z') goto yy48; goto yy3; } @@ -1438,18 +1439,18 @@ yy20: if(yych <= 'Z'){ if(yych <= 'A'){ if(yych <= '@') goto yy3; - goto yy688; + goto yy699; } else { - if(yych == 'O') goto yy689; + if(yych == 'O') goto yy700; goto yy48; } } else { if(yych <= 'n'){ if(yych <= '`') goto yy3; - if(yych <= 'a') goto yy696; + if(yych <= 'a') goto yy707; goto yy51; } else { - if(yych <= 'o') goto yy697; + if(yych <= 'o') goto yy708; if(yych <= 'z') goto yy51; goto yy3; } @@ -1460,18 +1461,18 @@ yy21: if(yych <= 'Z'){ if(yych <= 'A'){ if(yych <= '@') goto yy3; - goto yy688; + goto yy699; } else { - if(yych == 'O') goto yy689; + if(yych == 'O') goto yy700; goto yy48; } } else { if(yych <= 'n'){ if(yych <= '`') goto yy3; - if(yych <= 'a') goto yy688; + if(yych <= 'a') goto yy699; goto yy48; } else { - if(yych <= 'o') goto yy689; + if(yych <= 'o') goto yy700; if(yych <= 'z') goto yy48; goto yy3; } @@ -1482,24 +1483,24 @@ yy22: if(yych <= 'Z'){ if(yych <= 'O'){ if(yych <= '@') goto yy3; - if(yych == 'G') goto yy671; + if(yych == 'G') goto yy682; goto yy48; } else { - if(yych <= 'P') goto yy670; - if(yych == 'U') goto yy669; + if(yych <= 'P') goto yy681; + if(yych == 'U') goto yy680; goto yy48; } } else { if(yych <= 'o'){ if(yych <= '`') goto yy3; - if(yych == 'g') goto yy681; + if(yych == 'g') goto yy692; goto yy51; } else { if(yych <= 't'){ - if(yych <= 'p') goto yy680; + if(yych <= 'p') goto yy691; goto yy51; } else { - if(yych <= 'u') goto yy679; + if(yych <= 'u') goto yy690; if(yych <= 'z') goto yy51; goto yy3; } @@ -1511,24 +1512,24 @@ yy23: if(yych <= 'Z'){ if(yych <= 'O'){ if(yych <= '@') goto yy3; - if(yych == 'G') goto yy671; + if(yych == 'G') goto yy682; goto yy48; } else { - if(yych <= 'P') goto yy670; - if(yych == 'U') goto yy669; + if(yych <= 'P') goto yy681; + if(yych == 'U') goto yy680; goto yy48; } } else { if(yych <= 'o'){ if(yych <= '`') goto yy3; - if(yych == 'g') goto yy671; + if(yych == 'g') goto yy682; goto yy48; } else { if(yych <= 't'){ - if(yych <= 'p') goto yy670; + if(yych <= 'p') goto yy681; goto yy48; } else { - if(yych <= 'u') goto yy669; + if(yych <= 'u') goto yy680; if(yych <= 'z') goto yy48; goto yy3; } @@ -1540,15 +1541,15 @@ yy24: if(yych <= 'Z'){ if(yych <= 'E'){ if(yych <= '@') goto yy3; - if(yych <= 'A') goto yy622; + if(yych <= 'A') goto yy633; if(yych <= 'D') goto yy48; - goto yy621; + goto yy632; } else { if(yych <= 'I'){ if(yych <= 'H') goto yy48; - goto yy623; + goto yy634; } else { - if(yych == 'U') goto yy624; + if(yych == 'U') goto yy635; goto yy48; } } @@ -1556,17 +1557,17 @@ yy24: if(yych <= 'h'){ if(yych <= 'a'){ if(yych <= '`') goto yy3; - goto yy646; + goto yy657; } else { - if(yych == 'e') goto yy645; + if(yych == 'e') goto yy656; goto yy51; } } else { if(yych <= 't'){ - if(yych <= 'i') goto yy647; + if(yych <= 'i') goto yy658; goto yy51; } else { - if(yych <= 'u') goto yy648; + if(yych <= 'u') goto yy659; if(yych <= 'z') goto yy51; goto yy3; } @@ -1578,15 +1579,15 @@ yy25: if(yych <= 'Z'){ if(yych <= 'E'){ if(yych <= '@') goto yy3; - if(yych <= 'A') goto yy622; + if(yych <= 'A') goto yy633; if(yych <= 'D') goto yy48; - goto yy621; + goto yy632; } else { if(yych <= 'I'){ if(yych <= 'H') goto yy48; - goto yy623; + goto yy634; } else { - if(yych == 'U') goto yy624; + if(yych == 'U') goto yy635; goto yy48; } } @@ -1594,17 +1595,17 @@ yy25: if(yych <= 'h'){ if(yych <= 'a'){ if(yych <= '`') goto yy3; - goto yy622; + goto yy633; } else { - if(yych == 'e') goto yy621; + if(yych == 'e') goto yy632; goto yy48; } } else { if(yych <= 't'){ - if(yych <= 'i') goto yy623; + if(yych <= 'i') goto yy634; goto yy48; } else { - if(yych <= 'u') goto yy624; + if(yych <= 'u') goto yy635; if(yych <= 'z') goto yy48; goto yy3; } @@ -1615,14 +1616,14 @@ yy26: yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'C') goto yy611; + if(yych == 'C') goto yy622; goto yy48; } else { if(yych <= 'b'){ if(yych <= '`') goto yy3; goto yy51; } else { - if(yych <= 'c') goto yy616; + if(yych <= 'c') goto yy627; if(yych <= 'z') goto yy51; goto yy3; } @@ -1632,14 +1633,14 @@ yy27: yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'C') goto yy611; + if(yych == 'C') goto yy622; goto yy48; } else { if(yych <= 'b'){ if(yych <= '`') goto yy3; goto yy48; } else { - if(yych <= 'c') goto yy611; + if(yych <= 'c') goto yy622; if(yych <= 'z') goto yy48; goto yy3; } @@ -1650,24 +1651,24 @@ yy28: if(yych <= 'Z'){ if(yych <= 'H'){ if(yych <= '@') goto yy3; - if(yych == 'E') goto yy593; + if(yych == 'E') goto yy604; goto yy48; } else { - if(yych <= 'I') goto yy594; - if(yych == 'O') goto yy589; + if(yych <= 'I') goto yy605; + if(yych == 'O') goto yy600; goto yy48; } } else { if(yych <= 'h'){ if(yych <= '`') goto yy3; - if(yych == 'e') goto yy591; + if(yych == 'e') goto yy602; goto yy51; } else { if(yych <= 'n'){ - if(yych <= 'i') goto yy592; + if(yych <= 'i') goto yy603; goto yy51; } else { - if(yych <= 'o') goto yy590; + if(yych <= 'o') goto yy601; if(yych <= 'z') goto yy51; goto yy3; } @@ -1685,7 +1686,7 @@ yy29: if(yych <= '`') goto yy3; goto yy51; } else { - if(yych <= 'e') goto yy582; + if(yych <= 'e') goto yy593; if(yych <= 'z') goto yy51; goto yy3; } @@ -1921,11 +1922,11 @@ yy43: yy44: YYDEBUG(44, *YYCURSOR); -#line 1395 "resource/parse_date.re" +#line 1415 "resource/parse_date.re" { goto std; } -#line 1834 "" +#line 1835 "" yy45: YYDEBUG(45, *YYCURSOR); ++YYCURSOR; @@ -1933,12 +1934,12 @@ yy45: yy46: YYDEBUG(46, *YYCURSOR); -#line 1400 "resource/parse_date.re" +#line 1420 "resource/parse_date.re" { s->pos = cursor; s->line++; goto std; } -#line 1843 "" +#line 1844 "" yy47: YYDEBUG(47, *YYCURSOR); yych = *++YYCURSOR; @@ -2011,21 +2012,21 @@ yy54: YYDEBUG(54, *YYCURSOR); YYCURSOR = YYMARKER; switch(yyaccept){ - case 11: goto yy786; - case 20: goto yy1236; - case 21: goto yy1244; - case 12: goto yy927; - case 18: goto yy1159; + case 11: goto yy797; + case 20: goto yy1259; + case 21: goto yy1267; + case 12: goto yy943; + case 18: goto yy1175; case 8: goto yy562; - case 17: goto yy1021; + case 17: goto yy1037; case 6: goto yy509; - case 10: goto yy777; - case 16: goto yy1054; - case 19: goto yy1065; - case 15: goto yy1047; - case 13: goto yy960; - case 14: goto yy1012; - case 9: goto yy673; + case 10: goto yy788; + case 16: goto yy1070; + case 19: goto yy1081; + case 15: goto yy1063; + case 13: goto yy976; + case 14: goto yy1028; + case 9: goto yy684; case 5: goto yy190; case 4: goto yy158; case 3: goto yy151; @@ -2396,10 +2397,10 @@ yy84: yy85: YYDEBUG(85, *YYCURSOR); -#line 1379 "resource/parse_date.re" +#line 1399 "resource/parse_date.re" { timelib_ull i; - + DEBUG_OUTPUT("relative"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -2411,7 +2412,7 @@ yy85: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 2233 "" +#line 2234 "" yy86: YYDEBUG(86, *YYCURSOR); ++YYCURSOR; @@ -3104,11 +3105,12 @@ yy150: yy151: YYDEBUG(151, *YYCURSOR); -#line 1337 "resource/parse_date.re" +#line 1354 "resource/parse_date.re" { + DEBUG_OUTPUT("dayabbr"); goto std; } -#line 2796 "" +#line 2798 "" yy152: YYDEBUG(152, *YYCURSOR); yyaccept = 1; @@ -3147,10 +3149,10 @@ yy157: yy158: YYDEBUG(158, *YYCURSOR); -#line 1321 "resource/parse_date.re" +#line 1338 "resource/parse_date.re" { const timelib_relunit* relunit; - + DEBUG_OUTPUT("dayfull"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); TIMELIB_HAVE_WEEKDAY_RELATIVE(); @@ -3162,7 +3164,7 @@ yy158: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 2836 "" +#line 2838 "" yy159: YYDEBUG(159, *YYCURSOR); yyaccept = 1; @@ -3531,10 +3533,10 @@ yy189: yy190: YYDEBUG(190, *YYCURSOR); -#line 1305 "resource/parse_date.re" +#line 1322 "resource/parse_date.re" { timelib_sll i; - + DEBUG_OUTPUT("relativetext"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -3546,7 +3548,7 @@ yy190: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 3154 "" +#line 3156 "" yy191: YYDEBUG(191, *YYCURSOR); ++YYCURSOR; @@ -9145,7 +9147,7 @@ yy504: yy505: YYDEBUG(505, *YYCURSOR); ++YYCURSOR; - if((YYLIMIT - YYCURSOR) < 16) YYFILL(16); + if((YYLIMIT - YYCURSOR) < 17) YYFILL(17); yych = *YYCURSOR; goto yy506; yy506: @@ -9162,22 +9164,23 @@ yy507: YYDEBUG(507, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy506; - if(yych <= '0') goto yy571; - if(yych <= '2') goto yy572; - if(yych <= '3') goto yy573; + if(yych <= '0') goto yy582; + if(yych <= '2') goto yy583; + if(yych <= '3') goto yy584; goto yy506; yy508: YYDEBUG(508, *YYCURSOR); ++YYCURSOR; if((yych = *YYCURSOR) <= '/') goto yy520; - if(yych == '2') goto yy570; + if(yych == '2') goto yy581; if(yych <= '9') goto yy564; goto yy520; yy509: YYDEBUG(509, *YYCURSOR); -#line 1137 "resource/parse_date.re" +#line 1144 "resource/parse_date.re" { + DEBUG_OUTPUT("datetextual | datenoyear"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -9187,7 +9190,7 @@ yy509: TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 8146 "" +#line 8149 "" yy510: YYDEBUG(510, *YYCURSOR); yych = *++YYCURSOR; @@ -9233,27 +9236,39 @@ yy516: YYDEBUG(516, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy563; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy563; + if(yych <= ':') goto yy525; + goto yy509; + } yy517: YYDEBUG(517, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '3') goto yy563; - if(yych <= '9') goto yy560; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '3') goto yy563; + if(yych <= '9') goto yy560; + if(yych <= ':') goto yy525; + goto yy509; + } yy518: YYDEBUG(518, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy560; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy560; + if(yych <= ':') goto yy525; + goto yy509; + } yy519: YYDEBUG(519, *YYCURSOR); ++YYCURSOR; @@ -9274,27 +9289,39 @@ yy521: YYDEBUG(521, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy559; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy559; + if(yych <= ':') goto yy525; + goto yy509; + } yy522: YYDEBUG(522, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '3') goto yy559; - if(yych <= '9') goto yy524; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '3') goto yy559; + if(yych <= '9') goto yy524; + if(yych <= ':') goto yy525; + goto yy509; + } yy523: YYDEBUG(523, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy524; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy524; + if(yych <= ':') goto yy525; + goto yy509; + } yy524: YYDEBUG(524, *YYCURSOR); yych = *++YYCURSOR; @@ -9312,16 +9339,21 @@ yy526: YYDEBUG(526, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy527; - if(yych <= '9') goto yy528; - if(yych <= ':') goto yy529; - goto yy527; + if(yych <= '/'){ + if(yych == '.') goto yy529; + goto yy527; + } else { + if(yych <= '9') goto yy528; + if(yych <= ':') goto yy529; + goto yy527; + } yy527: YYDEBUG(527, *YYCURSOR); -#line 1352 "resource/parse_date.re" +#line 1371 "resource/parse_date.re" { int tz_not_found; + DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -9345,11 +9377,12 @@ yy527: TIMELIB_DEINIT; return TIMELIB_SHORTDATE_WITH_TIME; } -#line 8268 "" +#line 8300 "" yy528: YYDEBUG(528, *YYCURSOR); yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy529; if(yych != ':') goto yy527; goto yy529; yy529: @@ -9634,10 +9667,14 @@ yy559: YYDEBUG(559, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy557; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy557; + if(yych <= ':') goto yy525; + goto yy509; + } yy560: YYDEBUG(560, *YYCURSOR); yych = *++YYCURSOR; @@ -9653,8 +9690,9 @@ yy561: yy562: YYDEBUG(562, *YYCURSOR); -#line 1113 "resource/parse_date.re" +#line 1118 "resource/parse_date.re" { + DEBUG_OUTPUT("datenoday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -9664,237 +9702,415 @@ yy562: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 8517 "" +#line 8555 "" yy563: YYDEBUG(563, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy561; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy561; + if(yych <= ':') goto yy525; + goto yy509; + } yy564: YYDEBUG(564, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '2'){ + if(yych <= '1'){ + if(yych == '.') goto yy565; if(yych <= '/') goto yy520; - if(yych >= '2') goto yy566; - goto yy565; + goto yy566; } else { - if(yych <= '9') goto yy567; + if(yych <= '2') goto yy567; + if(yych <= '9') goto yy568; if(yych <= ':') goto yy525; goto yy520; } yy565: YYDEBUG(565, *YYCURSOR); - yyaccept = 6; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy569; - if(yych <= ':') goto yy525; - goto yy509; + yych = *++YYCURSOR; + if(yych <= '2'){ + if(yych <= '/') goto yy520; + if(yych <= '1') goto yy571; + goto yy572; + } else { + if(yych <= '5') goto yy573; + if(yych <= '9') goto yy574; + goto yy520; + } yy566: YYDEBUG(566, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '3') goto yy569; - if(yych <= '9') goto yy568; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy570; + if(yych <= ':') goto yy525; + goto yy509; + } yy567: YYDEBUG(567, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy509; - if(yych <= '9') goto yy568; - if(yych <= ':') goto yy525; - goto yy509; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '3') goto yy570; + if(yych <= '9') goto yy569; + if(yych <= ':') goto yy525; + goto yy509; + } yy568: YYDEBUG(568, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy562; - if(yych <= '9') goto yy557; - goto yy562; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy509; + } else { + if(yych <= '9') goto yy569; + if(yych <= ':') goto yy525; + goto yy509; + } yy569: YYDEBUG(569, *YYCURSOR); - yyaccept = 8; - yych = *(YYMARKER = ++YYCURSOR); + yych = *++YYCURSOR; if(yych <= '/') goto yy562; if(yych <= '9') goto yy557; - if(yych <= ':') goto yy525; goto yy562; yy570: YYDEBUG(570, *YYCURSOR); - yyaccept = 6; + yyaccept = 8; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '2'){ - if(yych <= '/') goto yy520; - if(yych <= '1') goto yy565; - goto yy566; + if(yych <= '/'){ + if(yych == '.') goto yy525; + goto yy562; } else { - if(yych <= '9') goto yy567; + if(yych <= '9') goto yy557; if(yych <= ':') goto yy525; - goto yy520; + goto yy562; } yy571: YYDEBUG(571, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '1'){ - if(yych <= '/') goto yy520; - if(yych <= '0') goto yy564; - goto yy574; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy575; + goto yy509; } else { - if(yych <= '2') goto yy581; - if(yych <= '9') goto yy574; - goto yy520; + if(yych <= '9') goto yy580; + if(yych <= ':') goto yy575; + goto yy509; } yy572: YYDEBUG(572, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy520; - if(yych == '2') goto yy581; - if(yych <= '9') goto yy574; - goto yy520; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy575; + goto yy509; + } else { + if(yych <= '3') goto yy580; + if(yych <= '9') goto yy579; + if(yych <= ':') goto yy575; + goto yy509; + } yy573: YYDEBUG(573, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy520; - if(yych <= '1') goto yy574; - if(yych <= '2') goto yy517; - if(yych <= '9') goto yy518; - goto yy520; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy575; + goto yy509; + } else { + if(yych <= '9') goto yy579; + if(yych <= ':') goto yy575; + goto yy509; + } yy574: YYDEBUG(574, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '1'){ - if(yych == '-') goto yy575; - if(yych <= '/') goto yy520; - goto yy565; + if(yych <= '/'){ + if(yych != '.') goto yy509; + goto yy575; } else { - if(yych <= '2') goto yy566; - if(yych <= '9') goto yy567; - if(yych <= ':') goto yy525; - goto yy520; + if(yych <= '9') goto yy524; + if(yych >= ';') goto yy509; + goto yy575; } yy575: YYDEBUG(575, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych >= ':') goto yy54; - goto yy576; + if(yych <= '5') goto yy576; + if(yych <= '6') goto yy577; + if(yych <= '9') goto yy528; + goto yy54; yy576: YYDEBUG(576, *YYCURSOR); - ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy577; - if(yych <= '9') goto yy578; - goto yy577; + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy529; + goto yy527; + } else { + if(yych <= '9') goto yy578; + if(yych <= ':') goto yy529; + goto yy527; + } yy577: YYDEBUG(577, *YYCURSOR); - -#line 1241 "resource/parse_date.re" -{ - 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((char **) &ptr, 4); - TIMELIB_PROCESS_YEAR(s->time->y); - TIMELIB_DEINIT; - return TIMELIB_PG_TEXT; + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy529; + goto yy527; + } else { + if(yych <= '0') goto yy533; + if(yych == ':') goto yy529; + goto yy527; } -#line 8628 "" yy578: YYDEBUG(578, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy577; - if(yych >= ':') goto yy577; - goto yy579; + yyaccept = 7; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '.'){ + if(yych <= '*'){ + if(yych == ' ') goto yy534; + goto yy527; + } else { + if(yych == ',') goto yy527; + if(yych <= '-') goto yy536; + goto yy529; + } + } else { + if(yych <= '@'){ + if(yych == ':') goto yy529; + goto yy527; + } else { + if(yych <= 'Z') goto yy537; + if(yych <= '`') goto yy527; + if(yych <= 'z') goto yy538; + goto yy527; + } + } yy579: YYDEBUG(579, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy577; - if(yych >= ':') goto yy577; - goto yy580; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy529; + goto yy509; + } else { + if(yych <= '9') goto yy557; + if(yych <= ':') goto yy529; + goto yy509; + } yy580: YYDEBUG(580, *YYCURSOR); - yych = *++YYCURSOR; - goto yy577; + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy575; + goto yy509; + } else { + if(yych <= '9') goto yy557; + if(yych <= ':') goto yy575; + goto yy509; + } yy581: YYDEBUG(581, *YYCURSOR); yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '1'){ - if(yych == '-') goto yy575; + if(yych == '.') goto yy565; if(yych <= '/') goto yy520; - goto yy565; + goto yy566; } else { - if(yych <= '2') goto yy566; - if(yych <= '9') goto yy567; + if(yych <= '2') goto yy567; + if(yych <= '9') goto yy568; if(yych <= ':') goto yy525; goto yy520; } yy582: YYDEBUG(582, *YYCURSOR); - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= 'Z'){ - if(yych <= '@'){ - if(yych == '/') goto yy53; - goto yy3; - } else { - if(yych == 'C') goto yy504; - goto yy49; - } + yych = *++YYCURSOR; + if(yych <= '1'){ + if(yych <= '/') goto yy520; + if(yych <= '0') goto yy564; + goto yy585; } else { - if(yych <= '`'){ - if(yych == '_') goto yy53; - goto yy3; - } else { - if(yych == 'c') goto yy583; - if(yych <= 'z') goto yy52; - goto yy3; - } + if(yych <= '2') goto yy592; + if(yych <= '9') goto yy585; + goto yy520; } yy583: YYDEBUG(583, *YYCURSOR); - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= 'D'){ - if(yych <= '.'){ - if(yych <= 0x1F) goto yy3; - if(yych == '-') goto yy507; - goto yy506; - } else { - if(yych <= '/') goto yy53; - if(yych <= '9') goto yy506; - if(yych <= '@') goto yy3; - goto yy50; - } - } else { - if(yych <= '_'){ - if(yych <= 'E') goto yy512; - if(yych <= 'Z') goto yy50; - if(yych <= '^') goto yy3; - goto yy53; - } else { - if(yych <= 'd'){ - if(yych <= '`') goto yy3; - goto yy58; - } else { - if(yych <= 'e') goto yy584; - if(yych <= 'z') goto yy58; - goto yy3; - } - } - } + yych = *++YYCURSOR; + if(yych <= '/') goto yy520; + if(yych == '2') goto yy592; + if(yych <= '9') goto yy585; + goto yy520; yy584: YYDEBUG(584, *YYCURSOR); - yyaccept = 1; - yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '^'){ + yych = *++YYCURSOR; + if(yych <= '/') goto yy520; + if(yych <= '1') goto yy585; + if(yych <= '2') goto yy517; + if(yych <= '9') goto yy518; + goto yy520; +yy585: + YYDEBUG(585, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + YYDEBUG(-1, yych); + switch(yych){ + case '-': goto yy586; + case '.': goto yy565; + case '0': + case '1': goto yy566; + case '2': goto yy567; + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': goto yy568; + case ':': goto yy525; + default: goto yy520; + } +yy586: + YYDEBUG(586, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych >= ':') goto yy54; + goto yy587; +yy587: + YYDEBUG(587, *YYCURSOR); + ++YYCURSOR; + if((yych = *YYCURSOR) <= '/') goto yy588; + if(yych <= '9') goto yy589; + goto yy588; +yy588: + YYDEBUG(588, *YYCURSOR); + +#line 1253 "resource/parse_date.re" +{ + DEBUG_OUTPUT("pgtextshort"); + 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((char **) &ptr, 4); + TIMELIB_PROCESS_YEAR(s->time->y); + TIMELIB_DEINIT; + return TIMELIB_PG_TEXT; + } +#line 8814 "" +yy589: + YYDEBUG(589, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy588; + if(yych >= ':') goto yy588; + goto yy590; +yy590: + YYDEBUG(590, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy588; + if(yych >= ':') goto yy588; + goto yy591; +yy591: + YYDEBUG(591, *YYCURSOR); + yych = *++YYCURSOR; + goto yy588; +yy592: + YYDEBUG(592, *YYCURSOR); + yyaccept = 6; + yych = *(YYMARKER = ++YYCURSOR); + YYDEBUG(-1, yych); + switch(yych){ + case '-': goto yy586; + case '.': goto yy565; + case '0': + case '1': goto yy566; + case '2': goto yy567; + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': goto yy568; + case ':': goto yy525; + default: goto yy520; + } +yy593: + YYDEBUG(593, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= 'Z'){ + if(yych <= '@'){ + if(yych == '/') goto yy53; + goto yy3; + } else { + if(yych == 'C') goto yy504; + goto yy49; + } + } else { + if(yych <= '`'){ + if(yych == '_') goto yy53; + goto yy3; + } else { + if(yych == 'c') goto yy594; + if(yych <= 'z') goto yy52; + goto yy3; + } + } +yy594: + YYDEBUG(594, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= 'D'){ + if(yych <= '.'){ + if(yych <= 0x1F) goto yy3; + if(yych == '-') goto yy507; + goto yy506; + } else { + if(yych <= '/') goto yy53; + if(yych <= '9') goto yy506; + if(yych <= '@') goto yy3; + goto yy50; + } + } else { + if(yych <= '_'){ + if(yych <= 'E') goto yy512; + if(yych <= 'Z') goto yy50; + if(yych <= '^') goto yy3; + goto yy53; + } else { + if(yych <= 'd'){ + if(yych <= '`') goto yy3; + goto yy58; + } else { + if(yych <= 'e') goto yy595; + if(yych <= 'z') goto yy58; + goto yy3; + } + } + } +yy595: + YYDEBUG(595, *YYCURSOR); + yyaccept = 1; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '^'){ if(yych <= '/'){ if(yych <= '.') goto yy3; goto yy53; @@ -9908,25 +10124,25 @@ yy584: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'm') goto yy585; + if(yych <= 'm') goto yy596; if(yych <= 'z') goto yy59; goto yy3; } } -yy585: - YYDEBUG(585, *YYCURSOR); +yy596: + YYDEBUG(596, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'B') goto yy514; if(yych != 'b') goto yy60; - goto yy586; -yy586: - YYDEBUG(586, *YYCURSOR); + goto yy597; +yy597: + YYDEBUG(597, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'E') goto yy515; if(yych != 'e') goto yy60; - goto yy587; -yy587: - YYDEBUG(587, *YYCURSOR); + goto yy598; +yy598: + YYDEBUG(598, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -9942,13 +10158,13 @@ yy587: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'r') goto yy588; + if(yych <= 'r') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy588: - YYDEBUG(588, *YYCURSOR); +yy599: + YYDEBUG(599, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych == '/') goto yy53; @@ -9959,25 +10175,25 @@ yy588: if(yych <= 'z') goto yy59; goto yy506; } -yy589: - YYDEBUG(589, *YYCURSOR); +yy600: + YYDEBUG(600, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'V') goto yy601; + if(yych == 'V') goto yy612; goto yy49; } else { if(yych <= 'u'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'v') goto yy601; + if(yych <= 'v') goto yy612; if(yych <= 'z') goto yy49; goto yy3; } } -yy590: - YYDEBUG(590, *YYCURSOR); +yy601: + YYDEBUG(601, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -9985,7 +10201,7 @@ yy590: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'V') goto yy601; + if(yych == 'V') goto yy612; goto yy49; } } else { @@ -9993,13 +10209,13 @@ yy590: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'v') goto yy602; + if(yych == 'v') goto yy613; if(yych <= 'z') goto yy52; goto yy3; } } -yy591: - YYDEBUG(591, *YYCURSOR); +yy602: + YYDEBUG(602, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10007,7 +10223,7 @@ yy591: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'X') goto yy597; + if(yych == 'X') goto yy608; goto yy49; } } else { @@ -10015,13 +10231,13 @@ yy591: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'x') goto yy600; + if(yych == 'x') goto yy611; if(yych <= 'z') goto yy52; goto yy3; } } -yy592: - YYDEBUG(592, *YYCURSOR); +yy603: + YYDEBUG(603, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10029,7 +10245,7 @@ yy592: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'N') goto yy595; + if(yych == 'N') goto yy606; goto yy49; } } else { @@ -10037,71 +10253,71 @@ yy592: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'n') goto yy598; + if(yych == 'n') goto yy609; if(yych <= 'z') goto yy52; goto yy3; } } -yy593: - YYDEBUG(593, *YYCURSOR); +yy604: + YYDEBUG(604, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'X') goto yy597; + if(yych == 'X') goto yy608; goto yy49; } else { if(yych <= 'w'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'x') goto yy597; + if(yych <= 'x') goto yy608; if(yych <= 'z') goto yy49; goto yy3; } } -yy594: - YYDEBUG(594, *YYCURSOR); +yy605: + YYDEBUG(605, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'N') goto yy49; - goto yy595; + goto yy606; } else { if(yych <= 'm'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'n') goto yy595; + if(yych <= 'n') goto yy606; if(yych <= 'z') goto yy49; goto yy3; } } -yy595: - YYDEBUG(595, *YYCURSOR); +yy606: + YYDEBUG(606, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'T') goto yy50; - goto yy596; + goto yy607; } else { if(yych <= 's'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 't') goto yy596; + if(yych <= 't') goto yy607; if(yych <= 'z') goto yy50; goto yy3; } } -yy596: - YYDEBUG(596, *YYCURSOR); +yy607: + YYDEBUG(607, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'H') goto yy173; if(yych == 'h') goto yy173; goto yy3; -yy597: - YYDEBUG(597, *YYCURSOR); +yy608: + YYDEBUG(608, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; @@ -10117,8 +10333,8 @@ yy597: goto yy3; } } -yy598: - YYDEBUG(598, *YYCURSOR); +yy609: + YYDEBUG(609, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10126,7 +10342,7 @@ yy598: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'T') goto yy596; + if(yych == 'T') goto yy607; goto yy50; } } else { @@ -10134,13 +10350,13 @@ yy598: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 't') goto yy599; + if(yych == 't') goto yy610; if(yych <= 'z') goto yy58; goto yy3; } } -yy599: - YYDEBUG(599, *YYCURSOR); +yy610: + YYDEBUG(610, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -10162,8 +10378,8 @@ yy599: goto yy3; } } -yy600: - YYDEBUG(600, *YYCURSOR); +yy611: + YYDEBUG(611, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10184,8 +10400,8 @@ yy600: goto yy3; } } -yy601: - YYDEBUG(601, *YYCURSOR); +yy612: + YYDEBUG(612, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -10200,17 +10416,17 @@ yy601: } } else { if(yych <= '`'){ - if(yych == 'E') goto yy603; + if(yych == 'E') goto yy614; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'e') goto yy603; + if(yych == 'e') goto yy614; if(yych <= 'z') goto yy50; goto yy3; } } -yy602: - YYDEBUG(602, *YYCURSOR); +yy613: + YYDEBUG(613, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ @@ -10226,7 +10442,7 @@ yy602: } } else { if(yych <= '_'){ - if(yych <= 'E') goto yy603; + if(yych <= 'E') goto yy614; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -10235,21 +10451,21 @@ yy602: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'e') goto yy604; + if(yych <= 'e') goto yy615; if(yych <= 'z') goto yy58; goto yy3; } } } -yy603: - YYDEBUG(603, *YYCURSOR); +yy614: + YYDEBUG(614, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'M') goto yy605; - if(yych == 'm') goto yy605; + if(yych == 'M') goto yy616; + if(yych == 'm') goto yy616; goto yy3; -yy604: - YYDEBUG(604, *YYCURSOR); +yy615: + YYDEBUG(615, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -10258,7 +10474,7 @@ yy604: goto yy53; } else { if(yych != 'M') goto yy3; - goto yy605; + goto yy616; } } else { if(yych <= 'l'){ @@ -10266,43 +10482,43 @@ yy604: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'm') goto yy606; + if(yych <= 'm') goto yy617; if(yych <= 'z') goto yy59; goto yy3; } } -yy605: - YYDEBUG(605, *YYCURSOR); +yy616: + YYDEBUG(616, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy607; - if(yych == 'b') goto yy607; + if(yych == 'B') goto yy618; + if(yych == 'b') goto yy618; goto yy54; -yy606: - YYDEBUG(606, *YYCURSOR); +yy617: + YYDEBUG(617, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy607; - if(yych == 'b') goto yy608; + if(yych == 'B') goto yy618; + if(yych == 'b') goto yy619; goto yy60; -yy607: - YYDEBUG(607, *YYCURSOR); +yy618: + YYDEBUG(618, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy609; - if(yych == 'e') goto yy609; + if(yych == 'E') goto yy620; + if(yych == 'e') goto yy620; goto yy54; -yy608: - YYDEBUG(608, *YYCURSOR); +yy619: + YYDEBUG(619, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy609; - if(yych == 'e') goto yy610; + if(yych == 'E') goto yy620; + if(yych == 'e') goto yy621; goto yy60; -yy609: - YYDEBUG(609, *YYCURSOR); +yy620: + YYDEBUG(620, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'R') goto yy505; if(yych == 'r') goto yy505; goto yy54; -yy610: - YYDEBUG(610, *YYCURSOR); +yy621: + YYDEBUG(621, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -10318,30 +10534,30 @@ yy610: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'r') goto yy588; + if(yych <= 'r') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy611: - YYDEBUG(611, *YYCURSOR); +yy622: + YYDEBUG(622, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'T') goto yy49; - goto yy612; + goto yy623; } else { if(yych <= 's'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 't') goto yy612; + if(yych <= 't') goto yy623; if(yych <= 'z') goto yy49; goto yy3; } } -yy612: - YYDEBUG(612, *YYCURSOR); +yy623: + YYDEBUG(623, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -10356,36 +10572,36 @@ yy612: } } else { if(yych <= '`'){ - if(yych == 'O') goto yy613; + if(yych == 'O') goto yy624; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'o') goto yy613; + if(yych == 'o') goto yy624; if(yych <= 'z') goto yy50; goto yy3; } } -yy613: - YYDEBUG(613, *YYCURSOR); +yy624: + YYDEBUG(624, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'B') goto yy614; + if(yych == 'B') goto yy625; if(yych != 'b') goto yy3; - goto yy614; -yy614: - YYDEBUG(614, *YYCURSOR); + goto yy625; +yy625: + YYDEBUG(625, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy615; + if(yych == 'E') goto yy626; if(yych != 'e') goto yy54; - goto yy615; -yy615: - YYDEBUG(615, *YYCURSOR); + goto yy626; +yy626: + YYDEBUG(626, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'R') goto yy505; if(yych == 'r') goto yy505; goto yy54; -yy616: - YYDEBUG(616, *YYCURSOR); +yy627: + YYDEBUG(627, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10393,7 +10609,7 @@ yy616: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'T') goto yy612; + if(yych == 'T') goto yy623; goto yy49; } } else { @@ -10401,13 +10617,13 @@ yy616: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 't') goto yy617; + if(yych == 't') goto yy628; if(yych <= 'z') goto yy52; goto yy3; } } -yy617: - YYDEBUG(617, *YYCURSOR); +yy628: + YYDEBUG(628, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'N'){ @@ -10423,7 +10639,7 @@ yy617: } } else { if(yych <= '_'){ - if(yych <= 'O') goto yy613; + if(yych <= 'O') goto yy624; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -10432,14 +10648,14 @@ yy617: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'o') goto yy618; + if(yych <= 'o') goto yy629; if(yych <= 'z') goto yy58; goto yy3; } } } -yy618: - YYDEBUG(618, *YYCURSOR); +yy629: + YYDEBUG(629, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -10447,7 +10663,7 @@ yy618: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'B') goto yy614; + if(yych == 'B') goto yy625; goto yy3; } } else { @@ -10456,19 +10672,19 @@ yy618: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'b') goto yy619; + if(yych <= 'b') goto yy630; if(yych <= 'z') goto yy59; goto yy3; } } -yy619: - YYDEBUG(619, *YYCURSOR); +yy630: + YYDEBUG(630, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy615; + if(yych == 'E') goto yy626; if(yych != 'e') goto yy60; - goto yy620; -yy620: - YYDEBUG(620, *YYCURSOR); + goto yy631; +yy631: + YYDEBUG(631, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -10484,189 +10700,189 @@ yy620: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'r') goto yy588; + if(yych <= 'r') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy621: - YYDEBUG(621, *YYCURSOR); +yy632: + YYDEBUG(632, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= 'O'){ if(yych <= '@') goto yy3; - if(yych == 'C') goto yy636; + if(yych == 'C') goto yy647; goto yy49; } else { - if(yych <= 'P') goto yy635; - if(yych == 'V') goto yy637; + if(yych <= 'P') goto yy646; + if(yych == 'V') goto yy648; goto yy49; } } else { if(yych <= 'o'){ if(yych <= '`') goto yy3; - if(yych == 'c') goto yy636; + if(yych == 'c') goto yy647; goto yy49; } else { if(yych <= 'u'){ - if(yych <= 'p') goto yy635; + if(yych <= 'p') goto yy646; goto yy49; } else { - if(yych <= 'v') goto yy637; + if(yych <= 'v') goto yy648; if(yych <= 'z') goto yy49; goto yy3; } } } -yy622: - YYDEBUG(622, *YYCURSOR); +yy633: + YYDEBUG(633, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'T') goto yy630; + if(yych == 'T') goto yy641; goto yy49; } else { if(yych <= 's'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 't') goto yy630; + if(yych <= 't') goto yy641; if(yych <= 'z') goto yy49; goto yy3; } } -yy623: - YYDEBUG(623, *YYCURSOR); +yy634: + YYDEBUG(634, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'X') goto yy628; + if(yych == 'X') goto yy639; goto yy49; } else { if(yych <= 'w'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'x') goto yy628; + if(yych <= 'x') goto yy639; if(yych <= 'z') goto yy49; goto yy3; } } -yy624: - YYDEBUG(624, *YYCURSOR); +yy635: + YYDEBUG(635, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'N') goto yy49; - goto yy625; + goto yy636; } else { if(yych <= 'm'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'n') goto yy625; + if(yych <= 'n') goto yy636; if(yych <= 'z') goto yy49; goto yy3; } } -yy625: - YYDEBUG(625, *YYCURSOR); +yy636: + YYDEBUG(636, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy151; if(yych != 'D') goto yy50; - goto yy626; + goto yy637; } else { if(yych <= 'c'){ if(yych <= '`') goto yy151; goto yy50; } else { - if(yych <= 'd') goto yy626; + if(yych <= 'd') goto yy637; if(yych <= 'z') goto yy50; goto yy151; } } -yy626: - YYDEBUG(626, *YYCURSOR); +yy637: + YYDEBUG(637, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'A') goto yy627; + if(yych == 'A') goto yy638; if(yych != 'a') goto yy3; - goto yy627; -yy627: - YYDEBUG(627, *YYCURSOR); + goto yy638; +yy638: + YYDEBUG(638, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy157; goto yy54; -yy628: - YYDEBUG(628, *YYCURSOR); +yy639: + YYDEBUG(639, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'T') goto yy50; - goto yy629; + goto yy640; } else { if(yych <= 's'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 't') goto yy629; + if(yych <= 't') goto yy640; if(yych <= 'z') goto yy50; goto yy3; } } -yy629: - YYDEBUG(629, *YYCURSOR); +yy640: + YYDEBUG(640, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'H') goto yy173; if(yych == 'h') goto yy173; goto yy3; -yy630: - YYDEBUG(630, *YYCURSOR); +yy641: + YYDEBUG(641, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy151; if(yych != 'U') goto yy50; - goto yy631; + goto yy642; } else { if(yych <= 't'){ if(yych <= '`') goto yy151; goto yy50; } else { - if(yych <= 'u') goto yy631; + if(yych <= 'u') goto yy642; if(yych <= 'z') goto yy50; goto yy151; } } -yy631: - YYDEBUG(631, *YYCURSOR); +yy642: + YYDEBUG(642, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'R') goto yy632; + if(yych == 'R') goto yy643; if(yych != 'r') goto yy3; - goto yy632; -yy632: - YYDEBUG(632, *YYCURSOR); + goto yy643; +yy643: + YYDEBUG(643, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'D') goto yy633; + if(yych == 'D') goto yy644; if(yych != 'd') goto yy54; - goto yy633; -yy633: - YYDEBUG(633, *YYCURSOR); + goto yy644; +yy644: + YYDEBUG(644, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy634; + if(yych == 'A') goto yy645; if(yych != 'a') goto yy54; - goto yy634; -yy634: - YYDEBUG(634, *YYCURSOR); + goto yy645; +yy645: + YYDEBUG(645, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy157; goto yy54; -yy635: - YYDEBUG(635, *YYCURSOR); +yy646: + YYDEBUG(646, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -10681,65 +10897,65 @@ yy635: } } else { if(yych <= '`'){ - if(yych == 'T') goto yy640; + if(yych == 'T') goto yy651; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 't') goto yy640; + if(yych == 't') goto yy651; if(yych <= 'z') goto yy50; goto yy3; } } -yy636: - YYDEBUG(636, *YYCURSOR); +yy647: + YYDEBUG(647, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'O') goto yy639; + if(yych == 'O') goto yy650; goto yy50; } else { if(yych <= 'n'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 'o') goto yy639; + if(yych <= 'o') goto yy650; if(yych <= 'z') goto yy50; goto yy3; } } -yy637: - YYDEBUG(637, *YYCURSOR); +yy648: + YYDEBUG(648, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'E') goto yy50; - goto yy638; + goto yy649; } else { if(yych <= 'd'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 'e') goto yy638; + if(yych <= 'e') goto yy649; if(yych <= 'z') goto yy50; goto yy3; } } -yy638: - YYDEBUG(638, *YYCURSOR); +yy649: + YYDEBUG(649, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'N') goto yy230; if(yych == 'n') goto yy230; goto yy3; -yy639: - YYDEBUG(639, *YYCURSOR); +yy650: + YYDEBUG(650, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'N') goto yy233; if(yych == 'n') goto yy233; goto yy3; -yy640: - YYDEBUG(640, *YYCURSOR); +yy651: + YYDEBUG(651, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ @@ -10755,38 +10971,38 @@ yy640: if(yych <= 'E'){ if(yych <= '9') goto yy506; if(yych <= 'D') goto yy3; - goto yy641; + goto yy652; } else { if(yych != 'e') goto yy3; - goto yy641; + goto yy652; } } -yy641: - YYDEBUG(641, *YYCURSOR); +yy652: + YYDEBUG(652, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy642; + if(yych == 'M') goto yy653; if(yych != 'm') goto yy54; - goto yy642; -yy642: - YYDEBUG(642, *YYCURSOR); + goto yy653; +yy653: + YYDEBUG(653, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy643; + if(yych == 'B') goto yy654; if(yych != 'b') goto yy54; - goto yy643; -yy643: - YYDEBUG(643, *YYCURSOR); + goto yy654; +yy654: + YYDEBUG(654, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy644; + if(yych == 'E') goto yy655; if(yych != 'e') goto yy54; - goto yy644; -yy644: - YYDEBUG(644, *YYCURSOR); + goto yy655; +yy655: + YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'R') goto yy505; if(yych == 'r') goto yy505; goto yy54; -yy645: - YYDEBUG(645, *YYCURSOR); +yy656: + YYDEBUG(656, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10797,14 +11013,14 @@ yy645: } else { if(yych <= '@') goto yy3; if(yych <= 'B') goto yy49; - goto yy636; + goto yy647; } } else { if(yych <= 'P'){ if(yych <= 'O') goto yy49; - goto yy635; + goto yy646; } else { - if(yych == 'V') goto yy637; + if(yych == 'V') goto yy648; goto yy49; } } @@ -10816,21 +11032,21 @@ yy645: } else { if(yych <= '`') goto yy3; if(yych <= 'b') goto yy52; - goto yy660; + goto yy671; } } else { if(yych <= 'u'){ - if(yych == 'p') goto yy659; + if(yych == 'p') goto yy670; goto yy52; } else { - if(yych <= 'v') goto yy661; + if(yych <= 'v') goto yy672; if(yych <= 'z') goto yy52; goto yy3; } } } -yy646: - YYDEBUG(646, *YYCURSOR); +yy657: + YYDEBUG(657, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10838,7 +11054,7 @@ yy646: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'T') goto yy630; + if(yych == 'T') goto yy641; goto yy49; } } else { @@ -10846,13 +11062,13 @@ yy646: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 't') goto yy654; + if(yych == 't') goto yy665; if(yych <= 'z') goto yy52; goto yy3; } } -yy647: - YYDEBUG(647, *YYCURSOR); +yy658: + YYDEBUG(658, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10860,7 +11076,7 @@ yy647: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'X') goto yy628; + if(yych == 'X') goto yy639; goto yy49; } } else { @@ -10868,13 +11084,13 @@ yy647: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'x') goto yy652; + if(yych == 'x') goto yy663; if(yych <= 'z') goto yy52; goto yy3; } } -yy648: - YYDEBUG(648, *YYCURSOR); +yy659: + YYDEBUG(659, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10882,7 +11098,7 @@ yy648: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'N') goto yy625; + if(yych == 'N') goto yy636; goto yy49; } } else { @@ -10890,13 +11106,13 @@ yy648: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'n') goto yy649; + if(yych == 'n') goto yy660; if(yych <= 'z') goto yy52; goto yy3; } } -yy649: - YYDEBUG(649, *YYCURSOR); +yy660: + YYDEBUG(660, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10904,7 +11120,7 @@ yy649: if(yych == '/') goto yy53; goto yy151; } else { - if(yych == 'D') goto yy626; + if(yych == 'D') goto yy637; goto yy50; } } else { @@ -10912,13 +11128,13 @@ yy649: if(yych == '_') goto yy53; goto yy151; } else { - if(yych == 'd') goto yy650; + if(yych == 'd') goto yy661; if(yych <= 'z') goto yy58; goto yy151; } } -yy650: - YYDEBUG(650, *YYCURSOR); +yy661: + YYDEBUG(661, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -10926,7 +11142,7 @@ yy650: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'A') goto yy627; + if(yych == 'A') goto yy638; goto yy3; } } else { @@ -10934,19 +11150,19 @@ yy650: if(yych <= '_') goto yy53; goto yy3; } else { - if(yych <= 'a') goto yy651; + if(yych <= 'a') goto yy662; if(yych <= 'z') goto yy59; goto yy3; } } -yy651: - YYDEBUG(651, *YYCURSOR); +yy662: + YYDEBUG(662, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy166; goto yy60; -yy652: - YYDEBUG(652, *YYCURSOR); +yy663: + YYDEBUG(663, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10954,7 +11170,7 @@ yy652: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'T') goto yy629; + if(yych == 'T') goto yy640; goto yy50; } } else { @@ -10962,13 +11178,13 @@ yy652: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 't') goto yy653; + if(yych == 't') goto yy664; if(yych <= 'z') goto yy58; goto yy3; } } -yy653: - YYDEBUG(653, *YYCURSOR); +yy664: + YYDEBUG(664, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -10990,8 +11206,8 @@ yy653: goto yy3; } } -yy654: - YYDEBUG(654, *YYCURSOR); +yy665: + YYDEBUG(665, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -10999,7 +11215,7 @@ yy654: if(yych == '/') goto yy53; goto yy151; } else { - if(yych == 'U') goto yy631; + if(yych == 'U') goto yy642; goto yy50; } } else { @@ -11007,13 +11223,13 @@ yy654: if(yych == '_') goto yy53; goto yy151; } else { - if(yych == 'u') goto yy655; + if(yych == 'u') goto yy666; if(yych <= 'z') goto yy58; goto yy151; } } -yy655: - YYDEBUG(655, *YYCURSOR); +yy666: + YYDEBUG(666, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11021,7 +11237,7 @@ yy655: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'R') goto yy632; + if(yych == 'R') goto yy643; goto yy3; } } else { @@ -11030,31 +11246,31 @@ yy655: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'r') goto yy656; + if(yych <= 'r') goto yy667; if(yych <= 'z') goto yy59; goto yy3; } } -yy656: - YYDEBUG(656, *YYCURSOR); +yy667: + YYDEBUG(667, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'D') goto yy633; + if(yych == 'D') goto yy644; if(yych != 'd') goto yy60; - goto yy657; -yy657: - YYDEBUG(657, *YYCURSOR); + goto yy668; +yy668: + YYDEBUG(668, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy634; + if(yych == 'A') goto yy645; if(yych != 'a') goto yy60; - goto yy658; -yy658: - YYDEBUG(658, *YYCURSOR); + goto yy669; +yy669: + YYDEBUG(669, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy166; goto yy60; -yy659: - YYDEBUG(659, *YYCURSOR); +yy670: + YYDEBUG(670, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'S'){ @@ -11070,7 +11286,7 @@ yy659: } } else { if(yych <= '_'){ - if(yych <= 'T') goto yy640; + if(yych <= 'T') goto yy651; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -11079,14 +11295,14 @@ yy659: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 't') goto yy664; + if(yych <= 't') goto yy675; if(yych <= 'z') goto yy58; goto yy3; } } } -yy660: - YYDEBUG(660, *YYCURSOR); +yy671: + YYDEBUG(671, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11094,7 +11310,7 @@ yy660: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'O') goto yy639; + if(yych == 'O') goto yy650; goto yy50; } } else { @@ -11102,13 +11318,13 @@ yy660: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'o') goto yy663; + if(yych == 'o') goto yy674; if(yych <= 'z') goto yy58; goto yy3; } } -yy661: - YYDEBUG(661, *YYCURSOR); +yy672: + YYDEBUG(672, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11116,7 +11332,7 @@ yy661: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'E') goto yy638; + if(yych == 'E') goto yy649; goto yy50; } } else { @@ -11124,13 +11340,13 @@ yy661: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'e') goto yy662; + if(yych == 'e') goto yy673; if(yych <= 'z') goto yy58; goto yy3; } } -yy662: - YYDEBUG(662, *YYCURSOR); +yy673: + YYDEBUG(673, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11152,8 +11368,8 @@ yy662: goto yy3; } } -yy663: - YYDEBUG(663, *YYCURSOR); +yy674: + YYDEBUG(674, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11175,8 +11391,8 @@ yy663: goto yy3; } } -yy664: - YYDEBUG(664, *YYCURSOR); +yy675: + YYDEBUG(675, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ @@ -11191,35 +11407,35 @@ yy664: } } else { if(yych <= '`'){ - if(yych <= 'E') goto yy641; + if(yych <= 'E') goto yy652; if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'e') goto yy665; + if(yych == 'e') goto yy676; if(yych <= 'z') goto yy59; goto yy3; } } -yy665: - YYDEBUG(665, *YYCURSOR); +yy676: + YYDEBUG(676, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy642; + if(yych == 'M') goto yy653; if(yych != 'm') goto yy60; - goto yy666; -yy666: - YYDEBUG(666, *YYCURSOR); + goto yy677; +yy677: + YYDEBUG(677, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy643; + if(yych == 'B') goto yy654; if(yych != 'b') goto yy60; - goto yy667; -yy667: - YYDEBUG(667, *YYCURSOR); + goto yy678; +yy678: + YYDEBUG(678, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy644; + if(yych == 'E') goto yy655; if(yych != 'e') goto yy60; - goto yy668; -yy668: - YYDEBUG(668, *YYCURSOR); + goto yy679; +yy679: + YYDEBUG(679, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -11235,75 +11451,76 @@ yy668: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'r') goto yy588; + if(yych <= 'r') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy669: - YYDEBUG(669, *YYCURSOR); +yy680: + YYDEBUG(680, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'G') goto yy676; + if(yych == 'G') goto yy687; goto yy49; } else { if(yych <= 'f'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'g') goto yy676; + if(yych <= 'g') goto yy687; if(yych <= 'z') goto yy49; goto yy3; } } -yy670: - YYDEBUG(670, *YYCURSOR); +yy681: + YYDEBUG(681, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'R') goto yy674; + if(yych == 'R') goto yy685; goto yy49; } else { if(yych <= 'q'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'r') goto yy674; + if(yych <= 'r') goto yy685; if(yych <= 'z') goto yy49; goto yy3; } } -yy671: - YYDEBUG(671, *YYCURSOR); +yy682: + YYDEBUG(682, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'O') goto yy49; - goto yy672; + goto yy683; } else { if(yych <= 'n'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'o') goto yy672; + if(yych <= 'o') goto yy683; if(yych <= 'z') goto yy49; goto yy3; } } -yy672: - YYDEBUG(672, *YYCURSOR); +yy683: + YYDEBUG(683, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '@') goto yy673; + if((yych = *YYCURSOR) <= '@') goto yy684; if(yych <= 'Z') goto yy50; - if(yych <= '`') goto yy673; + if(yych <= '`') goto yy684; if(yych <= 'z') goto yy50; - goto yy673; -yy673: - YYDEBUG(673, *YYCURSOR); + goto yy684; +yy684: + YYDEBUG(684, *YYCURSOR); -#line 1291 "resource/parse_date.re" +#line 1307 "resource/parse_date.re" { + DEBUG_OUTPUT("ago"); TIMELIB_INIT; s->time->relative.y = 0 - s->time->relative.y; s->time->relative.m = 0 - s->time->relative.m; @@ -11315,9 +11532,9 @@ yy673: TIMELIB_DEINIT; return TIMELIB_AGO; } -#line 9946 "" -yy674: - YYDEBUG(674, *YYCURSOR); +#line 10139 "" +yy685: + YYDEBUG(685, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -11332,24 +11549,24 @@ yy674: } } else { if(yych <= '`'){ - if(yych == 'I') goto yy675; + if(yych == 'I') goto yy686; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'i') goto yy675; + if(yych == 'i') goto yy686; if(yych <= 'z') goto yy50; goto yy3; } } -yy675: - YYDEBUG(675, *YYCURSOR); +yy686: + YYDEBUG(686, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'L') goto yy505; if(yych == 'l') goto yy505; goto yy3; -yy676: - YYDEBUG(676, *YYCURSOR); +yy687: + YYDEBUG(687, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -11364,30 +11581,30 @@ yy676: } } else { if(yych <= '`'){ - if(yych == 'U') goto yy677; + if(yych == 'U') goto yy688; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'u') goto yy677; + if(yych == 'u') goto yy688; if(yych <= 'z') goto yy50; goto yy3; } } -yy677: - YYDEBUG(677, *YYCURSOR); +yy688: + YYDEBUG(688, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'S') goto yy678; + if(yych == 'S') goto yy689; if(yych != 's') goto yy3; - goto yy678; -yy678: - YYDEBUG(678, *YYCURSOR); + goto yy689; +yy689: + YYDEBUG(689, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'T') goto yy505; if(yych == 't') goto yy505; goto yy54; -yy679: - YYDEBUG(679, *YYCURSOR); +yy690: + YYDEBUG(690, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11395,7 +11612,7 @@ yy679: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'G') goto yy676; + if(yych == 'G') goto yy687; goto yy49; } } else { @@ -11403,13 +11620,13 @@ yy679: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'g') goto yy685; + if(yych == 'g') goto yy696; if(yych <= 'z') goto yy52; goto yy3; } } -yy680: - YYDEBUG(680, *YYCURSOR); +yy691: + YYDEBUG(691, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11417,7 +11634,7 @@ yy680: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'R') goto yy674; + if(yych == 'R') goto yy685; goto yy49; } } else { @@ -11425,13 +11642,13 @@ yy680: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'r') goto yy683; + if(yych == 'r') goto yy694; if(yych <= 'z') goto yy52; goto yy3; } } -yy681: - YYDEBUG(681, *YYCURSOR); +yy692: + YYDEBUG(692, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11439,7 +11656,7 @@ yy681: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'O') goto yy672; + if(yych == 'O') goto yy683; goto yy49; } } else { @@ -11447,31 +11664,31 @@ yy681: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'o') goto yy682; + if(yych == 'o') goto yy693; if(yych <= 'z') goto yy52; goto yy3; } } -yy682: - YYDEBUG(682, *YYCURSOR); +yy693: + YYDEBUG(693, *YYCURSOR); yyaccept = 9; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ if(yych == '/') goto yy53; - if(yych <= '@') goto yy673; + if(yych <= '@') goto yy684; goto yy50; } else { if(yych <= '_'){ - if(yych <= '^') goto yy673; + if(yych <= '^') goto yy684; goto yy53; } else { - if(yych <= '`') goto yy673; + if(yych <= '`') goto yy684; if(yych <= 'z') goto yy58; - goto yy673; + goto yy684; } } -yy683: - YYDEBUG(683, *YYCURSOR); +yy694: + YYDEBUG(694, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'H'){ @@ -11487,7 +11704,7 @@ yy683: } } else { if(yych <= '_'){ - if(yych <= 'I') goto yy675; + if(yych <= 'I') goto yy686; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -11496,14 +11713,14 @@ yy683: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'i') goto yy684; + if(yych <= 'i') goto yy695; if(yych <= 'z') goto yy58; goto yy3; } } } -yy684: - YYDEBUG(684, *YYCURSOR); +yy695: + YYDEBUG(695, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11520,13 +11737,13 @@ yy684: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'l') goto yy588; + if(yych <= 'l') goto yy599; if(yych <= 'z') goto yy59; goto yy3; } } -yy685: - YYDEBUG(685, *YYCURSOR); +yy696: + YYDEBUG(696, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'T'){ @@ -11542,7 +11759,7 @@ yy685: } } else { if(yych <= '_'){ - if(yych <= 'U') goto yy677; + if(yych <= 'U') goto yy688; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -11551,14 +11768,14 @@ yy685: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'u') goto yy686; + if(yych <= 'u') goto yy697; if(yych <= 'z') goto yy58; goto yy3; } } } -yy686: - YYDEBUG(686, *YYCURSOR); +yy697: + YYDEBUG(697, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11566,7 +11783,7 @@ yy686: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'S') goto yy678; + if(yych == 'S') goto yy689; goto yy3; } } else { @@ -11575,13 +11792,13 @@ yy686: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 's') goto yy687; + if(yych <= 's') goto yy698; if(yych <= 'z') goto yy59; goto yy3; } } -yy687: - YYDEBUG(687, *YYCURSOR); +yy698: + YYDEBUG(698, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -11597,83 +11814,83 @@ yy687: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 't') goto yy588; + if(yych <= 't') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy688: - YYDEBUG(688, *YYCURSOR); +yy699: + YYDEBUG(699, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= 'R'){ if(yych <= '@') goto yy3; if(yych <= 'Q') goto yy49; - goto yy693; + goto yy704; } else { - if(yych == 'Y') goto yy694; + if(yych == 'Y') goto yy705; goto yy49; } } else { if(yych <= 'r'){ if(yych <= '`') goto yy3; if(yych <= 'q') goto yy49; - goto yy693; + goto yy704; } else { - if(yych == 'y') goto yy694; + if(yych == 'y') goto yy705; if(yych <= 'z') goto yy49; goto yy3; } } -yy689: - YYDEBUG(689, *YYCURSOR); +yy700: + YYDEBUG(700, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'N') goto yy49; - goto yy690; + goto yy701; } else { if(yych <= 'm'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'n') goto yy690; + if(yych <= 'n') goto yy701; if(yych <= 'z') goto yy49; goto yy3; } } -yy690: - YYDEBUG(690, *YYCURSOR); +yy701: + YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy151; if(yych != 'D') goto yy50; - goto yy691; + goto yy702; } else { if(yych <= 'c'){ if(yych <= '`') goto yy151; goto yy50; } else { - if(yych <= 'd') goto yy691; + if(yych <= 'd') goto yy702; if(yych <= 'z') goto yy50; goto yy151; } } -yy691: - YYDEBUG(691, *YYCURSOR); +yy702: + YYDEBUG(702, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'A') goto yy692; + if(yych == 'A') goto yy703; if(yych != 'a') goto yy3; - goto yy692; -yy692: - YYDEBUG(692, *YYCURSOR); + goto yy703; +yy703: + YYDEBUG(703, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy157; goto yy54; -yy693: - YYDEBUG(693, *YYCURSOR); +yy704: + YYDEBUG(704, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -11688,17 +11905,17 @@ yy693: } } else { if(yych <= '`'){ - if(yych == 'C') goto yy695; + if(yych == 'C') goto yy706; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'c') goto yy695; + if(yych == 'c') goto yy706; if(yych <= 'z') goto yy50; goto yy3; } } -yy694: - YYDEBUG(694, *YYCURSOR); +yy705: + YYDEBUG(705, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ @@ -11721,15 +11938,15 @@ yy694: goto yy3; } } -yy695: - YYDEBUG(695, *YYCURSOR); +yy706: + YYDEBUG(706, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'H') goto yy505; if(yych == 'h') goto yy505; goto yy3; -yy696: - YYDEBUG(696, *YYCURSOR); +yy707: + YYDEBUG(707, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11738,8 +11955,8 @@ yy696: if(yych <= '@') goto yy3; goto yy49; } else { - if(yych <= 'R') goto yy693; - if(yych == 'Y') goto yy694; + if(yych <= 'R') goto yy704; + if(yych == 'Y') goto yy705; goto yy49; } } else { @@ -11749,17 +11966,17 @@ yy696: goto yy52; } else { if(yych <= 'x'){ - if(yych <= 'r') goto yy701; + if(yych <= 'r') goto yy712; goto yy52; } else { - if(yych <= 'y') goto yy702; + if(yych <= 'y') goto yy713; if(yych <= 'z') goto yy52; goto yy3; } } } -yy697: - YYDEBUG(697, *YYCURSOR); +yy708: + YYDEBUG(708, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11767,7 +11984,7 @@ yy697: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'N') goto yy690; + if(yych == 'N') goto yy701; goto yy49; } } else { @@ -11775,13 +11992,13 @@ yy697: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'n') goto yy698; + if(yych == 'n') goto yy709; if(yych <= 'z') goto yy52; goto yy3; } } -yy698: - YYDEBUG(698, *YYCURSOR); +yy709: + YYDEBUG(709, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -11789,7 +12006,7 @@ yy698: if(yych == '/') goto yy53; goto yy151; } else { - if(yych == 'D') goto yy691; + if(yych == 'D') goto yy702; goto yy50; } } else { @@ -11797,13 +12014,13 @@ yy698: if(yych == '_') goto yy53; goto yy151; } else { - if(yych == 'd') goto yy699; + if(yych == 'd') goto yy710; if(yych <= 'z') goto yy58; goto yy151; } } -yy699: - YYDEBUG(699, *YYCURSOR); +yy710: + YYDEBUG(710, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11811,7 +12028,7 @@ yy699: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'A') goto yy692; + if(yych == 'A') goto yy703; goto yy3; } } else { @@ -11819,19 +12036,19 @@ yy699: if(yych <= '_') goto yy53; goto yy3; } else { - if(yych <= 'a') goto yy700; + if(yych <= 'a') goto yy711; if(yych <= 'z') goto yy59; goto yy3; } } -yy700: - YYDEBUG(700, *YYCURSOR); +yy711: + YYDEBUG(711, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy166; goto yy60; -yy701: - YYDEBUG(701, *YYCURSOR); +yy712: + YYDEBUG(712, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'B'){ @@ -11847,7 +12064,7 @@ yy701: } } else { if(yych <= '_'){ - if(yych <= 'C') goto yy695; + if(yych <= 'C') goto yy706; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -11856,14 +12073,14 @@ yy701: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'c') goto yy703; + if(yych <= 'c') goto yy714; if(yych <= 'z') goto yy58; goto yy3; } } } -yy702: - YYDEBUG(702, *YYCURSOR); +yy713: + YYDEBUG(713, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ @@ -11887,8 +12104,8 @@ yy702: goto yy3; } } -yy703: - YYDEBUG(703, *YYCURSOR); +yy714: + YYDEBUG(714, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -11905,189 +12122,189 @@ yy703: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'h') goto yy588; + if(yych <= 'h') goto yy599; if(yych <= 'z') goto yy59; goto yy3; } } -yy704: - YYDEBUG(704, *YYCURSOR); +yy715: + YYDEBUG(715, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'B') goto yy717; + if(yych == 'B') goto yy728; goto yy49; } else { if(yych <= 'a'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'b') goto yy717; + if(yych <= 'b') goto yy728; if(yych <= 'z') goto yy49; goto yy3; } } -yy705: - YYDEBUG(705, *YYCURSOR); +yy716: + YYDEBUG(716, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= 'F'){ if(yych <= '@') goto yy3; if(yych <= 'E') goto yy49; - goto yy714; + goto yy725; } else { - if(yych == 'R') goto yy713; + if(yych == 'R') goto yy724; goto yy49; } } else { if(yych <= 'f'){ if(yych <= '`') goto yy3; if(yych <= 'e') goto yy49; - goto yy714; + goto yy725; } else { - if(yych == 'r') goto yy713; + if(yych == 'r') goto yy724; if(yych <= 'z') goto yy49; goto yy3; } } -yy706: - YYDEBUG(706, *YYCURSOR); +yy717: + YYDEBUG(717, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'U') goto yy711; + if(yych == 'U') goto yy722; goto yy49; } else { if(yych <= 't'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'u') goto yy711; + if(yych <= 'u') goto yy722; if(yych <= 'z') goto yy49; goto yy3; } } -yy707: - YYDEBUG(707, *YYCURSOR); +yy718: + YYDEBUG(718, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'I') goto yy49; - goto yy708; + goto yy719; } else { if(yych <= 'h'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'i') goto yy708; + if(yych <= 'i') goto yy719; if(yych <= 'z') goto yy49; goto yy3; } } -yy708: - YYDEBUG(708, *YYCURSOR); +yy719: + YYDEBUG(719, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy151; if(yych != 'D') goto yy50; - goto yy709; + goto yy720; } else { if(yych <= 'c'){ if(yych <= '`') goto yy151; goto yy50; } else { - if(yych <= 'd') goto yy709; + if(yych <= 'd') goto yy720; if(yych <= 'z') goto yy50; goto yy151; } } -yy709: - YYDEBUG(709, *YYCURSOR); +yy720: + YYDEBUG(720, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'A') goto yy710; + if(yych == 'A') goto yy721; if(yych != 'a') goto yy3; - goto yy710; -yy710: - YYDEBUG(710, *YYCURSOR); + goto yy721; +yy721: + YYDEBUG(721, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy157; goto yy54; -yy711: - YYDEBUG(711, *YYCURSOR); +yy722: + YYDEBUG(722, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'R') goto yy50; - goto yy712; + goto yy723; } else { if(yych <= 'q'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 'r') goto yy712; + if(yych <= 'r') goto yy723; if(yych <= 'z') goto yy50; goto yy3; } } -yy712: - YYDEBUG(712, *YYCURSOR); +yy723: + YYDEBUG(723, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'T') goto yy243; if(yych == 't') goto yy243; goto yy3; -yy713: - YYDEBUG(713, *YYCURSOR); +yy724: + YYDEBUG(724, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; - if(yych == 'S') goto yy716; + if(yych == 'S') goto yy727; goto yy50; } else { if(yych <= 'r'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 's') goto yy716; + if(yych <= 's') goto yy727; if(yych <= 'z') goto yy50; goto yy3; } } -yy714: - YYDEBUG(714, *YYCURSOR); +yy725: + YYDEBUG(725, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'T') goto yy50; - goto yy715; + goto yy726; } else { if(yych <= 's'){ if(yych <= '`') goto yy3; goto yy50; } else { - if(yych <= 't') goto yy715; + if(yych <= 't') goto yy726; if(yych <= 'z') goto yy50; goto yy3; } } -yy715: - YYDEBUG(715, *YYCURSOR); +yy726: + YYDEBUG(726, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'H') goto yy173; if(yych == 'h') goto yy173; goto yy3; -yy716: - YYDEBUG(716, *YYCURSOR); +yy727: + YYDEBUG(727, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych == 'T') goto yy173; if(yych == 't') goto yy173; goto yy3; -yy717: - YYDEBUG(717, *YYCURSOR); +yy728: + YYDEBUG(728, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12102,42 +12319,42 @@ yy717: } } else { if(yych <= '`'){ - if(yych == 'R') goto yy718; + if(yych == 'R') goto yy729; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'r') goto yy718; + if(yych == 'r') goto yy729; if(yych <= 'z') goto yy50; goto yy3; } } -yy718: - YYDEBUG(718, *YYCURSOR); +yy729: + YYDEBUG(729, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'U') goto yy719; + if(yych == 'U') goto yy730; if(yych != 'u') goto yy3; - goto yy719; -yy719: - YYDEBUG(719, *YYCURSOR); + goto yy730; +yy730: + YYDEBUG(730, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy720; + if(yych == 'A') goto yy731; if(yych != 'a') goto yy54; - goto yy720; -yy720: - YYDEBUG(720, *YYCURSOR); + goto yy731; +yy731: + YYDEBUG(731, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy721; + if(yych == 'R') goto yy732; if(yych != 'r') goto yy54; - goto yy721; -yy721: - YYDEBUG(721, *YYCURSOR); + goto yy732; +yy732: + YYDEBUG(732, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy505; if(yych == 'y') goto yy505; goto yy54; -yy722: - YYDEBUG(722, *YYCURSOR); +yy733: + YYDEBUG(733, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12145,7 +12362,7 @@ yy722: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'B') goto yy717; + if(yych == 'B') goto yy728; goto yy49; } } else { @@ -12153,13 +12370,13 @@ yy722: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'b') goto yy735; + if(yych == 'b') goto yy746; if(yych <= 'z') goto yy52; goto yy3; } } -yy723: - YYDEBUG(723, *YYCURSOR); +yy734: + YYDEBUG(734, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12168,8 +12385,8 @@ yy723: if(yych <= '@') goto yy3; goto yy49; } else { - if(yych <= 'F') goto yy714; - if(yych == 'R') goto yy713; + if(yych <= 'F') goto yy725; + if(yych == 'R') goto yy724; goto yy49; } } else { @@ -12179,17 +12396,17 @@ yy723: goto yy52; } else { if(yych <= 'q'){ - if(yych <= 'f') goto yy732; + if(yych <= 'f') goto yy743; goto yy52; } else { - if(yych <= 'r') goto yy731; + if(yych <= 'r') goto yy742; if(yych <= 'z') goto yy52; goto yy3; } } } -yy724: - YYDEBUG(724, *YYCURSOR); +yy735: + YYDEBUG(735, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12197,7 +12414,7 @@ yy724: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'U') goto yy711; + if(yych == 'U') goto yy722; goto yy49; } } else { @@ -12205,13 +12422,13 @@ yy724: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'u') goto yy729; + if(yych == 'u') goto yy740; if(yych <= 'z') goto yy52; goto yy3; } } -yy725: - YYDEBUG(725, *YYCURSOR); +yy736: + YYDEBUG(736, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12219,7 +12436,7 @@ yy725: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'I') goto yy708; + if(yych == 'I') goto yy719; goto yy49; } } else { @@ -12227,13 +12444,13 @@ yy725: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'i') goto yy726; + if(yych == 'i') goto yy737; if(yych <= 'z') goto yy52; goto yy3; } } -yy726: - YYDEBUG(726, *YYCURSOR); +yy737: + YYDEBUG(737, *YYCURSOR); yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12241,7 +12458,7 @@ yy726: if(yych == '/') goto yy53; goto yy151; } else { - if(yych == 'D') goto yy709; + if(yych == 'D') goto yy720; goto yy50; } } else { @@ -12249,13 +12466,13 @@ yy726: if(yych == '_') goto yy53; goto yy151; } else { - if(yych == 'd') goto yy727; + if(yych == 'd') goto yy738; if(yych <= 'z') goto yy58; goto yy151; } } -yy727: - YYDEBUG(727, *YYCURSOR); +yy738: + YYDEBUG(738, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12263,7 +12480,7 @@ yy727: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'A') goto yy710; + if(yych == 'A') goto yy721; goto yy3; } } else { @@ -12271,19 +12488,19 @@ yy727: if(yych <= '_') goto yy53; goto yy3; } else { - if(yych <= 'a') goto yy728; + if(yych <= 'a') goto yy739; if(yych <= 'z') goto yy59; goto yy3; } } -yy728: - YYDEBUG(728, *YYCURSOR); +yy739: + YYDEBUG(739, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy157; if(yych == 'y') goto yy166; goto yy60; -yy729: - YYDEBUG(729, *YYCURSOR); +yy740: + YYDEBUG(740, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12291,7 +12508,7 @@ yy729: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'R') goto yy712; + if(yych == 'R') goto yy723; goto yy50; } } else { @@ -12299,13 +12516,13 @@ yy729: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'r') goto yy730; + if(yych == 'r') goto yy741; if(yych <= 'z') goto yy58; goto yy3; } } -yy730: - YYDEBUG(730, *YYCURSOR); +yy741: + YYDEBUG(741, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12327,8 +12544,8 @@ yy730: goto yy3; } } -yy731: - YYDEBUG(731, *YYCURSOR); +yy742: + YYDEBUG(742, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12336,7 +12553,7 @@ yy731: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'S') goto yy716; + if(yych == 'S') goto yy727; goto yy50; } } else { @@ -12344,13 +12561,13 @@ yy731: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 's') goto yy734; + if(yych == 's') goto yy745; if(yych <= 'z') goto yy58; goto yy3; } } -yy732: - YYDEBUG(732, *YYCURSOR); +yy743: + YYDEBUG(743, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12358,7 +12575,7 @@ yy732: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'T') goto yy715; + if(yych == 'T') goto yy726; goto yy50; } } else { @@ -12366,13 +12583,13 @@ yy732: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 't') goto yy733; + if(yych == 't') goto yy744; if(yych <= 'z') goto yy58; goto yy3; } } -yy733: - YYDEBUG(733, *YYCURSOR); +yy744: + YYDEBUG(744, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12394,8 +12611,8 @@ yy733: goto yy3; } } -yy734: - YYDEBUG(734, *YYCURSOR); +yy745: + YYDEBUG(745, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12417,8 +12634,8 @@ yy734: goto yy3; } } -yy735: - YYDEBUG(735, *YYCURSOR); +yy746: + YYDEBUG(746, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Q'){ @@ -12434,7 +12651,7 @@ yy735: } } else { if(yych <= '_'){ - if(yych <= 'R') goto yy718; + if(yych <= 'R') goto yy729; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -12443,14 +12660,14 @@ yy735: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'r') goto yy736; + if(yych <= 'r') goto yy747; if(yych <= 'z') goto yy58; goto yy3; } } } -yy736: - YYDEBUG(736, *YYCURSOR); +yy747: + YYDEBUG(747, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12458,7 +12675,7 @@ yy736: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'U') goto yy719; + if(yych == 'U') goto yy730; goto yy3; } } else { @@ -12467,25 +12684,25 @@ yy736: if(yych <= '`') goto yy3; goto yy59; } else { - if(yych <= 'u') goto yy737; + if(yych <= 'u') goto yy748; if(yych <= 'z') goto yy59; goto yy3; } } -yy737: - YYDEBUG(737, *YYCURSOR); +yy748: + YYDEBUG(748, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy720; + if(yych == 'A') goto yy731; if(yych != 'a') goto yy60; - goto yy738; -yy738: - YYDEBUG(738, *YYCURSOR); + goto yy749; +yy749: + YYDEBUG(749, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy721; + if(yych == 'R') goto yy732; if(yych != 'r') goto yy60; - goto yy739; -yy739: - YYDEBUG(739, *YYCURSOR); + goto yy750; +yy750: + YYDEBUG(750, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -12501,54 +12718,54 @@ yy739: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'y') goto yy588; + if(yych <= 'y') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy740: - YYDEBUG(740, *YYCURSOR); +yy751: + YYDEBUG(751, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= 'L'){ if(yych <= '@') goto yy3; if(yych <= 'K') goto yy49; - goto yy747; + goto yy758; } else { - if(yych == 'N') goto yy746; + if(yych == 'N') goto yy757; goto yy49; } } else { if(yych <= 'l'){ if(yych <= '`') goto yy3; if(yych <= 'k') goto yy49; - goto yy747; + goto yy758; } else { - if(yych == 'n') goto yy746; + if(yych == 'n') goto yy757; if(yych <= 'z') goto yy49; goto yy3; } } -yy741: - YYDEBUG(741, *YYCURSOR); +yy752: + YYDEBUG(752, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Z'){ if(yych <= '@') goto yy3; if(yych != 'N') goto yy49; - goto yy742; + goto yy753; } else { if(yych <= 'm'){ if(yych <= '`') goto yy3; goto yy49; } else { - if(yych <= 'n') goto yy742; + if(yych <= 'n') goto yy753; if(yych <= 'z') goto yy49; goto yy3; } } -yy742: - YYDEBUG(742, *YYCURSOR); - yyaccept = 1; +yy753: + YYDEBUG(753, *YYCURSOR); + yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ if(yych <= '-'){ @@ -12562,36 +12779,36 @@ yy742: } } else { if(yych <= '`'){ - if(yych == 'U') goto yy743; + if(yych == 'U') goto yy754; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'u') goto yy743; + if(yych == 'u') goto yy754; if(yych <= 'z') goto yy50; goto yy3; } } -yy743: - YYDEBUG(743, *YYCURSOR); +yy754: + YYDEBUG(754, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'A') goto yy744; + if(yych == 'A') goto yy755; if(yych != 'a') goto yy3; - goto yy744; -yy744: - YYDEBUG(744, *YYCURSOR); + goto yy755; +yy755: + YYDEBUG(755, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy745; + if(yych == 'R') goto yy756; if(yych != 'r') goto yy54; - goto yy745; -yy745: - YYDEBUG(745, *YYCURSOR); + goto yy756; +yy756: + YYDEBUG(756, *YYCURSOR); yych = *++YYCURSOR; if(yych == 'Y') goto yy505; if(yych == 'y') goto yy505; goto yy54; -yy746: - YYDEBUG(746, *YYCURSOR); +yy757: + YYDEBUG(757, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12606,17 +12823,17 @@ yy746: } } else { if(yych <= '`'){ - if(yych == 'E') goto yy748; + if(yych == 'E') goto yy759; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'e') goto yy748; + if(yych == 'e') goto yy759; if(yych <= 'z') goto yy50; goto yy3; } } -yy747: - YYDEBUG(747, *YYCURSOR); +yy758: + YYDEBUG(758, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12631,25 +12848,25 @@ yy747: } } else { if(yych <= '`'){ - if(yych == 'Y') goto yy748; + if(yych == 'Y') goto yy759; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'y') goto yy748; + if(yych == 'y') goto yy759; if(yych <= 'z') goto yy50; goto yy3; } } -yy748: - YYDEBUG(748, *YYCURSOR); +yy759: + YYDEBUG(759, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 0x1F) goto yy3; if(yych == '/') goto yy3; if(yych <= '9') goto yy506; goto yy3; -yy749: - YYDEBUG(749, *YYCURSOR); +yy760: + YYDEBUG(760, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12658,8 +12875,8 @@ yy749: if(yych <= '@') goto yy3; goto yy49; } else { - if(yych <= 'L') goto yy747; - if(yych == 'N') goto yy746; + if(yych <= 'L') goto yy758; + if(yych == 'N') goto yy757; goto yy49; } } else { @@ -12669,17 +12886,17 @@ yy749: goto yy52; } else { if(yych <= 'm'){ - if(yych <= 'l') goto yy756; + if(yych <= 'l') goto yy767; goto yy52; } else { - if(yych <= 'n') goto yy755; + if(yych <= 'n') goto yy766; if(yych <= 'z') goto yy52; goto yy3; } } } -yy750: - YYDEBUG(750, *YYCURSOR); +yy761: + YYDEBUG(761, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Z'){ @@ -12687,7 +12904,7 @@ yy750: if(yych == '/') goto yy53; goto yy3; } else { - if(yych == 'N') goto yy742; + if(yych == 'N') goto yy753; goto yy49; } } else { @@ -12695,13 +12912,13 @@ yy750: if(yych == '_') goto yy53; goto yy3; } else { - if(yych == 'n') goto yy751; + if(yych == 'n') goto yy762; if(yych <= 'z') goto yy52; goto yy3; } } -yy751: - YYDEBUG(751, *YYCURSOR); +yy762: + YYDEBUG(762, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'T'){ @@ -12717,7 +12934,7 @@ yy751: } } else { if(yych <= '_'){ - if(yych <= 'U') goto yy743; + if(yych <= 'U') goto yy754; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -12726,14 +12943,14 @@ yy751: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'u') goto yy752; + if(yych <= 'u') goto yy763; if(yych <= 'z') goto yy58; goto yy3; } } } -yy752: - YYDEBUG(752, *YYCURSOR); +yy763: + YYDEBUG(763, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '^'){ @@ -12741,7 +12958,7 @@ yy752: if(yych <= '.') goto yy3; goto yy53; } else { - if(yych == 'A') goto yy744; + if(yych == 'A') goto yy755; goto yy3; } } else { @@ -12749,19 +12966,19 @@ yy752: if(yych <= '_') goto yy53; goto yy3; } else { - if(yych <= 'a') goto yy753; + if(yych <= 'a') goto yy764; if(yych <= 'z') goto yy59; goto yy3; } } -yy753: - YYDEBUG(753, *YYCURSOR); +yy764: + YYDEBUG(764, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy745; + if(yych == 'R') goto yy756; if(yych != 'r') goto yy60; - goto yy754; -yy754: - YYDEBUG(754, *YYCURSOR); + goto yy765; +yy765: + YYDEBUG(765, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '^'){ if(yych <= '/'){ @@ -12777,13 +12994,13 @@ yy754: if(yych <= '`') goto yy54; goto yy59; } else { - if(yych <= 'y') goto yy588; + if(yych <= 'y') goto yy599; if(yych <= 'z') goto yy59; goto yy54; } } -yy755: - YYDEBUG(755, *YYCURSOR); +yy766: + YYDEBUG(766, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ @@ -12799,7 +13016,7 @@ yy755: } } else { if(yych <= '_'){ - if(yych <= 'E') goto yy748; + if(yych <= 'E') goto yy759; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -12808,14 +13025,14 @@ yy755: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'e') goto yy757; + if(yych <= 'e') goto yy768; if(yych <= 'z') goto yy58; goto yy3; } } } -yy756: - YYDEBUG(756, *YYCURSOR); +yy767: + YYDEBUG(767, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'X'){ @@ -12831,7 +13048,7 @@ yy756: } } else { if(yych <= '_'){ - if(yych <= 'Y') goto yy748; + if(yych <= 'Y') goto yy759; if(yych <= 'Z') goto yy50; if(yych <= '^') goto yy3; goto yy53; @@ -12840,14 +13057,14 @@ yy756: if(yych <= '`') goto yy3; goto yy58; } else { - if(yych <= 'y') goto yy757; + if(yych <= 'y') goto yy768; if(yych <= 'z') goto yy58; goto yy3; } } } -yy757: - YYDEBUG(757, *YYCURSOR); +yy768: + YYDEBUG(768, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ @@ -12864,8 +13081,8 @@ yy757: goto yy3; } } -yy758: - YYDEBUG(758, *YYCURSOR); +yy769: + YYDEBUG(769, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12880,15 +13097,15 @@ yy758: } else { if(yych <= 'Z'){ if(yych != 'I') goto yy49; - goto yy759; + goto yy770; } else { if(yych <= '`') goto yy3; if(yych <= 'z') goto yy49; goto yy3; } } -yy759: - YYDEBUG(759, *YYCURSOR); +yy770: + YYDEBUG(770, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ @@ -12905,8 +13122,8 @@ yy759: goto yy3; } } -yy760: - YYDEBUG(760, *YYCURSOR); +yy771: + YYDEBUG(771, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12921,15 +13138,15 @@ yy760: } else { if(yych <= 'Z'){ if(yych != 'I') goto yy49; - goto yy761; + goto yy772; } else { if(yych <= '`') goto yy3; if(yych <= 'z') goto yy49; goto yy3; } } -yy761: - YYDEBUG(761, *YYCURSOR); +yy772: + YYDEBUG(772, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12943,7 +13160,7 @@ yy761: } } else { if(yych <= 'Z'){ - if(yych == 'I') goto yy748; + if(yych == 'I') goto yy759; goto yy50; } else { if(yych <= '`') goto yy3; @@ -12951,8 +13168,8 @@ yy761: goto yy3; } } -yy762: - YYDEBUG(762, *YYCURSOR); +yy773: + YYDEBUG(773, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ @@ -12969,8 +13186,8 @@ yy762: goto yy3; } } -yy763: - YYDEBUG(763, *YYCURSOR); +yy774: + YYDEBUG(774, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '@'){ @@ -12984,7 +13201,7 @@ yy763: } } else { if(yych <= 'Z'){ - if(yych == 'I') goto yy759; + if(yych == 'I') goto yy770; goto yy49; } else { if(yych <= '`') goto yy3; @@ -12992,17 +13209,17 @@ yy763: goto yy3; } } -yy764: - YYDEBUG(764, *YYCURSOR); +yy775: + YYDEBUG(775, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; - goto yy765; -yy765: - YYDEBUG(765, *YYCURSOR); + goto yy776; +yy776: + YYDEBUG(776, *YYCURSOR); YYDEBUG(-1, yych); switch(yych){ - case ' ': goto yy764; + case ' ': goto yy775; case '!': case '"': case '#': @@ -13016,33 +13233,33 @@ yy765: case '+': case ',': case '-': - case '.': goto yy773; - case 'A': case 'a': goto yy781; - case 'D': case 'd': goto yy768; - case 'F': case 'f': goto yy769; + case '.': goto yy784; + case 'A': case 'a': goto yy792; + case 'D': case 'd': goto yy779; + case 'F': case 'f': goto yy780; case 'H': case 'h': goto yy70; - case 'I': goto yy776; - case 'J': case 'j': goto yy780; - case 'M': case 'm': goto yy767; - case 'N': case 'n': goto yy783; - case 'O': case 'o': goto yy782; - case 'S': case 's': goto yy766; + case 'I': goto yy787; + case 'J': case 'j': goto yy791; + case 'M': case 'm': goto yy778; + case 'N': case 'n': goto yy794; + case 'O': case 'o': goto yy793; + case 'S': case 's': goto yy777; case 'T': case 't': goto yy75; - case 'V': goto yy778; + case 'V': goto yy789; case 'W': case 'w': goto yy72; - case 'X': goto yy779; + case 'X': goto yy790; case 'Y': case 'y': goto yy74; default: goto yy54; } -yy766: - YYDEBUG(766, *YYCURSOR); +yy777: + YYDEBUG(777, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ if(yych <= 'D'){ if(yych == 'A') goto yy131; goto yy54; } else { - if(yych <= 'E') goto yy1229; + if(yych <= 'E') goto yy1245; if(yych <= 'T') goto yy54; goto yy132; } @@ -13051,17 +13268,17 @@ yy766: if(yych == 'a') goto yy131; goto yy54; } else { - if(yych <= 'e') goto yy1229; + if(yych <= 'e') goto yy1245; if(yych == 'u') goto yy132; goto yy54; } } -yy767: - YYDEBUG(767, *YYCURSOR); +yy778: + YYDEBUG(778, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'O'){ if(yych <= 'H'){ - if(yych == 'A') goto yy873; + if(yych == 'A') goto yy879; goto yy54; } else { if(yych <= 'I') goto yy123; @@ -13070,7 +13287,7 @@ yy767: } } else { if(yych <= 'h'){ - if(yych == 'a') goto yy873; + if(yych == 'a') goto yy879; goto yy54; } else { if(yych <= 'i') goto yy123; @@ -13078,28 +13295,28 @@ yy767: goto yy54; } } -yy768: - YYDEBUG(768, *YYCURSOR); +yy779: + YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'E'){ if(yych == 'A') goto yy119; if(yych <= 'D') goto yy54; - goto yy860; + goto yy866; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; goto yy119; } else { - if(yych == 'e') goto yy860; + if(yych == 'e') goto yy866; goto yy54; } } -yy769: - YYDEBUG(769, *YYCURSOR); +yy780: + YYDEBUG(780, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'R'){ if(yych <= 'N'){ - if(yych == 'E') goto yy876; + if(yych == 'E') goto yy882; goto yy54; } else { if(yych <= 'O') goto yy96; @@ -13108,7 +13325,7 @@ yy769: } } else { if(yych <= 'n'){ - if(yych == 'e') goto yy876; + if(yych == 'e') goto yy882; goto yy54; } else { if(yych <= 'o') goto yy96; @@ -13116,45 +13333,45 @@ yy769: goto yy54; } } -yy770: - YYDEBUG(770, *YYCURSOR); +yy781: + YYDEBUG(781, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy984; + if(yych == '-') goto yy1000; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy983; + if(yych <= '9') goto yy999; goto yy67; -yy771: - YYDEBUG(771, *YYCURSOR); +yy782: + YYDEBUG(782, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch(yych){ case '0': case '1': - case '2': goto yy926; - case '3': goto yy928; + case '2': goto yy942; + case '3': goto yy944; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy929; - case 'A': case 'a': goto yy933; - case 'D': case 'd': goto yy937; - case 'F': case 'f': goto yy931; - case 'J': case 'j': goto yy930; - case 'M': case 'm': goto yy932; - case 'N': case 'n': goto yy936; - case 'O': case 'o': goto yy935; - case 'S': case 's': goto yy934; + case '9': goto yy945; + case 'A': case 'a': goto yy949; + case 'D': case 'd': goto yy953; + case 'F': case 'f': goto yy947; + case 'J': case 'j': goto yy946; + case 'M': case 'm': goto yy948; + case 'N': case 'n': goto yy952; + case 'O': case 'o': goto yy951; + case 'S': case 's': goto yy950; default: goto yy54; } -yy772: - YYDEBUG(772, *YYCURSOR); +yy783: + YYDEBUG(783, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch(yych){ - case '0': goto yy882; - case '1': goto yy883; + case '0': goto yy898; + case '1': goto yy899; case '2': case '3': case '4': @@ -13162,25 +13379,25 @@ yy772: case '6': case '7': case '8': - case '9': goto yy884; - case 'A': case 'a': goto yy888; - case 'D': case 'd': goto yy892; - case 'F': case 'f': goto yy886; - case 'J': case 'j': goto yy885; - case 'M': case 'm': goto yy887; - case 'N': case 'n': goto yy891; - case 'O': case 'o': goto yy890; - case 'S': case 's': goto yy889; - default: goto yy774; + case '9': goto yy900; + case 'A': case 'a': goto yy904; + case 'D': case 'd': goto yy908; + case 'F': case 'f': goto yy902; + case 'J': case 'j': goto yy901; + case 'M': case 'm': goto yy903; + case 'N': case 'n': goto yy907; + case 'O': case 'o': goto yy906; + case 'S': case 's': goto yy905; + default: goto yy785; } -yy773: - YYDEBUG(773, *YYCURSOR); +yy784: + YYDEBUG(784, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 13) YYFILL(13); yych = *YYCURSOR; - goto yy774; -yy774: - YYDEBUG(774, *YYCURSOR); + goto yy785; +yy785: + YYDEBUG(785, *YYCURSOR); YYDEBUG(-1, yych); switch(yych){ case ' ': @@ -13197,56 +13414,61 @@ yy774: case '+': case ',': case '-': - case '.': goto yy773; - case 'A': case 'a': goto yy781; - case 'D': case 'd': goto yy850; - case 'F': case 'f': goto yy847; - case 'I': goto yy776; - case 'J': case 'j': goto yy780; - case 'M': case 'm': goto yy848; - case 'N': case 'n': goto yy783; - case 'O': case 'o': goto yy782; - case 'S': case 's': goto yy849; - case 'V': goto yy778; - case 'X': goto yy779; + case '.': goto yy784; + case 'A': case 'a': goto yy792; + case 'D': case 'd': goto yy865; + case 'F': case 'f': goto yy862; + case 'I': goto yy787; + case 'J': case 'j': goto yy791; + case 'M': case 'm': goto yy863; + case 'N': case 'n': goto yy794; + case 'O': case 'o': goto yy793; + case 'S': case 's': goto yy864; + case 'V': goto yy789; + case 'X': goto yy790; default: goto yy54; } -yy775: - YYDEBUG(775, *YYCURSOR); +yy786: + YYDEBUG(786, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy774; - if(yych <= '0') goto yy851; - if(yych <= '1') goto yy852; - if(yych <= '9') goto yy853; - goto yy774; -yy776: - YYDEBUG(776, *YYCURSOR); + if(yych <= '1'){ + if(yych <= '/') goto yy785; + if(yych <= '0') goto yy858; + goto yy859; + } else { + if(yych <= '5') goto yy860; + if(yych <= '9') goto yy861; + goto yy785; + } +yy787: + YYDEBUG(787, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'H'){ if(yych <= '.'){ - if(yych >= ' ') goto yy811; - goto yy777; + if(yych >= ' ') goto yy822; + goto yy788; } else { - if(yych <= '/') goto yy777; - if(yych <= '9') goto yy813; - goto yy777; + if(yych <= '/') goto yy788; + if(yych <= '9') goto yy824; + goto yy788; } } else { if(yych <= 'V'){ - if(yych <= 'I') goto yy846; - if(yych >= 'V') goto yy819; - goto yy777; + if(yych <= 'I') goto yy857; + if(yych >= 'V') goto yy830; + goto yy788; } else { - if(yych == 'X') goto yy819; - goto yy777; + if(yych == 'X') goto yy830; + goto yy788; } } -yy777: - YYDEBUG(777, *YYCURSOR); +yy788: + YYDEBUG(788, *YYCURSOR); -#line 1149 "resource/parse_date.re" +#line 1157 "resource/parse_date.re" { + DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -13254,94 +13476,98 @@ yy777: TIMELIB_DEINIT; return TIMELIB_DATE_TEXT; } -#line 11673 "" -yy778: - YYDEBUG(778, *YYCURSOR); +#line 11871 "" +yy789: + YYDEBUG(789, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych == 'I') goto yy844; - goto yy777; + if(yych <= '9') goto yy824; + if(yych == 'I') goto yy855; + goto yy788; } -yy779: - YYDEBUG(779, *YYCURSOR); +yy790: + YYDEBUG(790, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych == 'I') goto yy843; - goto yy777; + if(yych <= '9') goto yy824; + if(yych == 'I') goto yy854; + goto yy788; } -yy780: - YYDEBUG(780, *YYCURSOR); +yy791: + YYDEBUG(791, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy836; + if(yych == 'A') goto yy847; if(yych <= 'T') goto yy54; - goto yy835; + goto yy846; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy836; + goto yy847; } else { - if(yych == 'u') goto yy835; + if(yych == 'u') goto yy846; goto yy54; } } -yy781: - YYDEBUG(781, *YYCURSOR); +yy792: + YYDEBUG(792, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy829; + if(yych == 'P') goto yy840; if(yych <= 'T') goto yy54; - goto yy828; + goto yy839; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy829; + goto yy840; } else { - if(yych == 'u') goto yy828; + if(yych == 'u') goto yy839; goto yy54; } } -yy782: - YYDEBUG(782, *YYCURSOR); +yy793: + YYDEBUG(793, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy823; - if(yych == 'c') goto yy823; + if(yych == 'C') goto yy834; + if(yych == 'c') goto yy834; goto yy54; -yy783: - YYDEBUG(783, *YYCURSOR); +yy794: + YYDEBUG(794, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy809; - if(yych == 'o') goto yy809; + if(yych == 'O') goto yy820; + if(yych == 'o') goto yy820; goto yy54; -yy784: - YYDEBUG(784, *YYCURSOR); +yy795: + YYDEBUG(795, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy785; - if(yych <= '9') goto yy787; + if(yych <= '5') goto yy796; + if(yych <= '9') goto yy798; goto yy54; -yy785: - YYDEBUG(785, *YYCURSOR); +yy796: + YYDEBUG(796, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy786; - if(yych <= '9') goto yy803; - if(yych <= ':') goto yy788; - goto yy786; -yy786: - YYDEBUG(786, *YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy799; + goto yy797; + } else { + if(yych <= '9') goto yy814; + if(yych <= ':') goto yy799; + goto yy797; + } +yy797: + YYDEBUG(797, *YYCURSOR); #line 965 "resource/parse_date.re" { @@ -13351,7 +13577,7 @@ yy786: TIMELIB_HAVE_TIME(); s->time->h = timelib_get_nr((char **) &ptr, 2); s->time->i = timelib_get_nr((char **) &ptr, 2); - if (*ptr == ':') { + if (*ptr == ':' || *ptr == '.') { s->time->s = timelib_get_nr((char **) &ptr, 2); if (*ptr == '.') { @@ -13366,132 +13592,133 @@ yy786: TIMELIB_DEINIT; return TIMELIB_TIME24_WITH_ZONE; } -#line 11767 "" -yy787: - YYDEBUG(787, *YYCURSOR); +#line 11969 "" +yy798: + YYDEBUG(798, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych != ':') goto yy786; - goto yy788; -yy788: - YYDEBUG(788, *YYCURSOR); + if(yych == '.') goto yy799; + if(yych != ':') goto yy797; + goto yy799; +yy799: + YYDEBUG(799, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy789; - if(yych <= '6') goto yy790; - if(yych <= '9') goto yy791; + if(yych <= '5') goto yy800; + if(yych <= '6') goto yy801; + if(yych <= '9') goto yy802; goto yy54; -yy789: - YYDEBUG(789, *YYCURSOR); +yy800: + YYDEBUG(800, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '.') goto yy792; - if(yych <= '/') goto yy786; - if(yych <= '9') goto yy795; - goto yy786; -yy790: - YYDEBUG(790, *YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy806; + goto yy797; +yy801: + YYDEBUG(801, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '.') goto yy792; - if(yych == '0') goto yy795; - goto yy786; -yy791: - YYDEBUG(791, *YYCURSOR); + if(yych == '.') goto yy803; + if(yych == '0') goto yy806; + goto yy797; +yy802: + YYDEBUG(802, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych != '.') goto yy786; - goto yy792; -yy792: - YYDEBUG(792, *YYCURSOR); + if(yych != '.') goto yy797; + goto yy803; +yy803: + YYDEBUG(803, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy793; -yy793: - YYDEBUG(793, *YYCURSOR); + goto yy804; +yy804: + YYDEBUG(804, *YYCURSOR); ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy794; -yy794: - YYDEBUG(794, *YYCURSOR); - if(yych <= '/') goto yy786; - if(yych <= '9') goto yy793; - goto yy786; -yy795: - YYDEBUG(795, *YYCURSOR); + goto yy805; +yy805: + YYDEBUG(805, *YYCURSOR); + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy804; + goto yy797; +yy806: + YYDEBUG(806, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'A'){ if(yych <= '-'){ - if(yych != ' ') goto yy786; - goto yy796; + if(yych != ' ') goto yy797; + goto yy807; } else { - if(yych <= '.') goto yy792; - if(yych <= '@') goto yy786; - goto yy798; + if(yych <= '.') goto yy803; + if(yych <= '@') goto yy797; + goto yy809; } } else { if(yych <= '`'){ - if(yych == 'P') goto yy798; - goto yy786; + if(yych == 'P') goto yy809; + goto yy797; } else { - if(yych <= 'a') goto yy798; - if(yych == 'p') goto yy798; - goto yy786; + if(yych <= 'a') goto yy809; + if(yych == 'p') goto yy809; + goto yy797; } } -yy796: - YYDEBUG(796, *YYCURSOR); +yy807: + YYDEBUG(807, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; - goto yy797; -yy797: - YYDEBUG(797, *YYCURSOR); + goto yy808; +yy808: + YYDEBUG(808, *YYCURSOR); if(yych <= 'O'){ if(yych <= ' '){ if(yych <= 0x1F) goto yy54; - goto yy796; + goto yy807; } else { if(yych != 'A') goto yy54; - goto yy798; + goto yy809; } } else { if(yych <= 'a'){ - if(yych <= 'P') goto yy798; + if(yych <= 'P') goto yy809; if(yych <= '`') goto yy54; - goto yy798; + goto yy809; } else { if(yych != 'p') goto yy54; - goto yy798; + goto yy809; } } -yy798: - YYDEBUG(798, *YYCURSOR); +yy809: + YYDEBUG(809, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'L'){ if(yych != '.') goto yy54; - goto yy799; + goto yy810; } else { - if(yych <= 'M') goto yy800; - if(yych == 'm') goto yy800; + if(yych <= 'M') goto yy811; + if(yych == 'm') goto yy811; goto yy54; } -yy799: - YYDEBUG(799, *YYCURSOR); +yy810: + YYDEBUG(810, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy800; + if(yych == 'M') goto yy811; if(yych != 'm') goto yy54; - goto yy800; -yy800: - YYDEBUG(800, *YYCURSOR); + goto yy811; +yy811: + YYDEBUG(811, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) == '.') goto yy802; - goto yy801; -yy801: - YYDEBUG(801, *YYCURSOR); + if((yych = *YYCURSOR) == '.') goto yy813; + goto yy812; +yy812: + YYDEBUG(812, *YYCURSOR); #line 950 "resource/parse_date.re" { @@ -13507,130 +13734,132 @@ yy801: TIMELIB_DEINIT; return TIMELIB_TIME12; } -#line 11878 "" -yy802: - YYDEBUG(802, *YYCURSOR); +#line 12081 "" +yy813: + YYDEBUG(813, *YYCURSOR); yych = *++YYCURSOR; - goto yy801; -yy803: - YYDEBUG(803, *YYCURSOR); + goto yy812; +yy814: + YYDEBUG(814, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= 'A'){ - if(yych <= '9'){ - if(yych != ' ') goto yy786; - goto yy804; + if(yych <= '@'){ + if(yych <= '-'){ + if(yych != ' ') goto yy797; + goto yy815; } else { - if(yych <= ':') goto yy788; - if(yych <= '@') goto yy786; - goto yy806; + if(yych <= '.') goto yy799; + if(yych == ':') goto yy799; + goto yy797; } } else { if(yych <= '`'){ - if(yych == 'P') goto yy806; - goto yy786; + if(yych <= 'A') goto yy817; + if(yych == 'P') goto yy817; + goto yy797; } else { - if(yych <= 'a') goto yy806; - if(yych == 'p') goto yy806; - goto yy786; + if(yych <= 'a') goto yy817; + if(yych == 'p') goto yy817; + goto yy797; } } -yy804: - YYDEBUG(804, *YYCURSOR); +yy815: + YYDEBUG(815, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; - goto yy805; -yy805: - YYDEBUG(805, *YYCURSOR); + goto yy816; +yy816: + YYDEBUG(816, *YYCURSOR); if(yych <= 'O'){ if(yych <= ' '){ if(yych <= 0x1F) goto yy54; - goto yy804; + goto yy815; } else { if(yych != 'A') goto yy54; - goto yy806; + goto yy817; } } else { if(yych <= 'a'){ - if(yych <= 'P') goto yy806; + if(yych <= 'P') goto yy817; if(yych <= '`') goto yy54; - goto yy806; + goto yy817; } else { if(yych != 'p') goto yy54; - goto yy806; + goto yy817; } } -yy806: - YYDEBUG(806, *YYCURSOR); +yy817: + YYDEBUG(817, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'L'){ if(yych != '.') goto yy54; - goto yy807; + goto yy818; } else { - if(yych <= 'M') goto yy808; - if(yych == 'm') goto yy808; + if(yych <= 'M') goto yy819; + if(yych == 'm') goto yy819; goto yy54; } -yy807: - YYDEBUG(807, *YYCURSOR); +yy818: + YYDEBUG(818, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy808; + if(yych == 'M') goto yy819; if(yych != 'm') goto yy54; - goto yy808; -yy808: - YYDEBUG(808, *YYCURSOR); + goto yy819; +yy819: + YYDEBUG(819, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '.') goto yy802; - goto yy801; -yy809: - YYDEBUG(809, *YYCURSOR); + if(yych == '.') goto yy813; + goto yy812; +yy820: + YYDEBUG(820, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy810; + if(yych == 'V') goto yy821; if(yych != 'v') goto yy54; - goto yy810; -yy810: - YYDEBUG(810, *YYCURSOR); + goto yy821; +yy821: + YYDEBUG(821, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy777; - goto yy815; + if(yych <= 'D') goto yy788; + goto yy826; } else { - if(yych == 'e') goto yy815; - goto yy777; + if(yych == 'e') goto yy826; + goto yy788; } } -yy811: - YYDEBUG(811, *YYCURSOR); +yy822: + YYDEBUG(822, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 4) YYFILL(4); yych = *YYCURSOR; - goto yy812; -yy812: - YYDEBUG(812, *YYCURSOR); + goto yy823; +yy823: + YYDEBUG(823, *YYCURSOR); if(yych <= 0x1F) goto yy54; - if(yych <= '.') goto yy811; + if(yych <= '.') goto yy822; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy813; -yy813: - YYDEBUG(813, *YYCURSOR); + goto yy824; +yy824: + YYDEBUG(824, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy814; - if(yych <= '9') goto yy820; - goto yy814; -yy814: - YYDEBUG(814, *YYCURSOR); + if((yych = *YYCURSOR) <= '/') goto yy825; + if(yych <= '9') goto yy831; + goto yy825; +yy825: + YYDEBUG(825, *YYCURSOR); -#line 1089 "resource/parse_date.re" +#line 1092 "resource/parse_date.re" { + DEBUG_OUTPUT("datefull"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -13640,1108 +13869,1208 @@ yy814: TIMELIB_DEINIT; return TIMELIB_DATE_FULL; } -#line 11985 "" -yy815: - YYDEBUG(815, *YYCURSOR); +#line 12190 "" +yy826: + YYDEBUG(826, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy816; + if(yych == 'M') goto yy827; if(yych != 'm') goto yy54; - goto yy816; -yy816: - YYDEBUG(816, *YYCURSOR); + goto yy827; +yy827: + YYDEBUG(827, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy817; + if(yych == 'B') goto yy828; if(yych != 'b') goto yy54; - goto yy817; -yy817: - YYDEBUG(817, *YYCURSOR); + goto yy828; +yy828: + YYDEBUG(828, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy818; + if(yych == 'E') goto yy829; if(yych != 'e') goto yy54; - goto yy818; -yy818: - YYDEBUG(818, *YYCURSOR); + goto yy829; +yy829: + YYDEBUG(829, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy819; + if(yych == 'R') goto yy830; if(yych != 'r') goto yy54; - goto yy819; -yy819: - YYDEBUG(819, *YYCURSOR); + goto yy830; +yy830: + YYDEBUG(830, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - if(yych <= '9') goto yy813; - goto yy777; -yy820: - YYDEBUG(820, *YYCURSOR); + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + if(yych <= '9') goto yy824; + goto yy788; +yy831: + YYDEBUG(831, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych >= ':') goto yy814; - goto yy821; -yy821: - YYDEBUG(821, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych >= ':') goto yy825; + goto yy832; +yy832: + YYDEBUG(832, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych >= ':') goto yy814; - goto yy822; -yy822: - YYDEBUG(822, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych >= ':') goto yy825; + goto yy833; +yy833: + YYDEBUG(833, *YYCURSOR); yych = *++YYCURSOR; - goto yy814; -yy823: - YYDEBUG(823, *YYCURSOR); + goto yy825; +yy834: + YYDEBUG(834, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy824; + if(yych == 'T') goto yy835; if(yych != 't') goto yy54; - goto yy824; -yy824: - YYDEBUG(824, *YYCURSOR); + goto yy835; +yy835: + YYDEBUG(835, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'O'){ - if(yych <= 'N') goto yy777; - goto yy825; + if(yych <= 'N') goto yy788; + goto yy836; } else { - if(yych != 'o') goto yy777; - goto yy825; + if(yych != 'o') goto yy788; + goto yy836; } } -yy825: - YYDEBUG(825, *YYCURSOR); +yy836: + YYDEBUG(836, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy826; + if(yych == 'B') goto yy837; if(yych != 'b') goto yy54; - goto yy826; -yy826: - YYDEBUG(826, *YYCURSOR); + goto yy837; +yy837: + YYDEBUG(837, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy827; + if(yych == 'E') goto yy838; if(yych != 'e') goto yy54; - goto yy827; -yy827: - YYDEBUG(827, *YYCURSOR); + goto yy838; +yy838: + YYDEBUG(838, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy819; - if(yych == 'r') goto yy819; + if(yych == 'R') goto yy830; + if(yych == 'r') goto yy830; goto yy54; -yy828: - YYDEBUG(828, *YYCURSOR); +yy839: + YYDEBUG(839, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy832; - if(yych == 'g') goto yy832; + if(yych == 'G') goto yy843; + if(yych == 'g') goto yy843; goto yy54; -yy829: - YYDEBUG(829, *YYCURSOR); +yy840: + YYDEBUG(840, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy830; + if(yych == 'R') goto yy841; if(yych != 'r') goto yy54; - goto yy830; -yy830: - YYDEBUG(830, *YYCURSOR); + goto yy841; +yy841: + YYDEBUG(841, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'I'){ - if(yych <= 'H') goto yy777; - goto yy831; + if(yych <= 'H') goto yy788; + goto yy842; } else { - if(yych != 'i') goto yy777; - goto yy831; + if(yych != 'i') goto yy788; + goto yy842; } } -yy831: - YYDEBUG(831, *YYCURSOR); +yy842: + YYDEBUG(842, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'L') goto yy819; - if(yych == 'l') goto yy819; + if(yych == 'L') goto yy830; + if(yych == 'l') goto yy830; goto yy54; -yy832: - YYDEBUG(832, *YYCURSOR); +yy843: + YYDEBUG(843, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'U'){ - if(yych <= 'T') goto yy777; - goto yy833; + if(yych <= 'T') goto yy788; + goto yy844; } else { - if(yych != 'u') goto yy777; - goto yy833; + if(yych != 'u') goto yy788; + goto yy844; } } -yy833: - YYDEBUG(833, *YYCURSOR); +yy844: + YYDEBUG(844, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'S') goto yy834; + if(yych == 'S') goto yy845; if(yych != 's') goto yy54; - goto yy834; -yy834: - YYDEBUG(834, *YYCURSOR); + goto yy845; +yy845: + YYDEBUG(845, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy819; - if(yych == 't') goto yy819; + if(yych == 'T') goto yy830; + if(yych == 't') goto yy830; goto yy54; -yy835: - YYDEBUG(835, *YYCURSOR); +yy846: + YYDEBUG(846, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'N'){ - if(yych == 'L') goto yy842; + if(yych == 'L') goto yy853; if(yych <= 'M') goto yy54; - goto yy841; + goto yy852; } else { if(yych <= 'l'){ if(yych <= 'k') goto yy54; - goto yy842; + goto yy853; } else { - if(yych == 'n') goto yy841; + if(yych == 'n') goto yy852; goto yy54; } } -yy836: - YYDEBUG(836, *YYCURSOR); +yy847: + YYDEBUG(847, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy837; + if(yych == 'N') goto yy848; if(yych != 'n') goto yy54; - goto yy837; -yy837: - YYDEBUG(837, *YYCURSOR); + goto yy848; +yy848: + YYDEBUG(848, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'U'){ - if(yych <= 'T') goto yy777; - goto yy838; + if(yych <= 'T') goto yy788; + goto yy849; } else { - if(yych != 'u') goto yy777; - goto yy838; + if(yych != 'u') goto yy788; + goto yy849; } } -yy838: - YYDEBUG(838, *YYCURSOR); +yy849: + YYDEBUG(849, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy839; + if(yych == 'A') goto yy850; if(yych != 'a') goto yy54; - goto yy839; -yy839: - YYDEBUG(839, *YYCURSOR); + goto yy850; +yy850: + YYDEBUG(850, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy840; + if(yych == 'R') goto yy851; if(yych != 'r') goto yy54; - goto yy840; -yy840: - YYDEBUG(840, *YYCURSOR); + goto yy851; +yy851: + YYDEBUG(851, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'Y') goto yy819; - if(yych == 'y') goto yy819; + if(yych == 'Y') goto yy830; + if(yych == 'y') goto yy830; goto yy54; -yy841: - YYDEBUG(841, *YYCURSOR); +yy852: + YYDEBUG(852, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy777; - goto yy819; + if(yych <= 'D') goto yy788; + goto yy830; } else { - if(yych == 'e') goto yy819; - goto yy777; + if(yych == 'e') goto yy830; + goto yy788; } } -yy842: - YYDEBUG(842, *YYCURSOR); +yy853: + YYDEBUG(853, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'Y'){ - if(yych <= 'X') goto yy777; - goto yy819; + if(yych <= 'X') goto yy788; + goto yy830; } else { - if(yych == 'y') goto yy819; - goto yy777; + if(yych == 'y') goto yy830; + goto yy788; } } -yy843: - YYDEBUG(843, *YYCURSOR); +yy854: + YYDEBUG(854, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych == 'I') goto yy819; - goto yy777; + if(yych <= '9') goto yy824; + if(yych == 'I') goto yy830; + goto yy788; } -yy844: - YYDEBUG(844, *YYCURSOR); +yy855: + YYDEBUG(855, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych != 'I') goto yy777; - goto yy845; + if(yych <= '9') goto yy824; + if(yych != 'I') goto yy788; + goto yy856; } -yy845: - YYDEBUG(845, *YYCURSOR); +yy856: + YYDEBUG(856, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych == 'I') goto yy819; - goto yy777; + if(yych <= '9') goto yy824; + if(yych == 'I') goto yy830; + goto yy788; } -yy846: - YYDEBUG(846, *YYCURSOR); +yy857: + YYDEBUG(857, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + goto yy788; } else { - if(yych <= '9') goto yy813; - if(yych == 'I') goto yy819; - goto yy777; + if(yych <= '9') goto yy824; + if(yych == 'I') goto yy830; + goto yy788; } -yy847: - YYDEBUG(847, *YYCURSOR); +yy858: + YYDEBUG(858, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy888; + goto yy797; + } else { + if(yych <= '9') goto yy897; + if(yych <= ':') goto yy799; + goto yy797; + } +yy859: + YYDEBUG(859, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy888; + goto yy797; + } else { + if(yych <= '2') goto yy897; + if(yych <= '9') goto yy814; + if(yych <= ':') goto yy799; + goto yy797; + } +yy860: + YYDEBUG(860, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy888; + goto yy797; + } else { + if(yych <= '9') goto yy814; + if(yych <= ':') goto yy799; + goto yy797; + } +yy861: + YYDEBUG(861, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy888; + if(yych == ':') goto yy799; + goto yy797; +yy862: + YYDEBUG(862, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy876; - if(yych == 'e') goto yy876; + if(yych == 'E') goto yy882; + if(yych == 'e') goto yy882; goto yy54; -yy848: - YYDEBUG(848, *YYCURSOR); +yy863: + YYDEBUG(863, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy873; - if(yych == 'a') goto yy873; + if(yych == 'A') goto yy879; + if(yych == 'a') goto yy879; goto yy54; -yy849: - YYDEBUG(849, *YYCURSOR); +yy864: + YYDEBUG(864, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy866; - if(yych == 'e') goto yy866; - goto yy54; -yy850: - YYDEBUG(850, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'E') goto yy860; - if(yych == 'e') goto yy860; - goto yy54; -yy851: - YYDEBUG(851, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == '.') goto yy854; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy853; + if(yych == 'E') goto yy872; + if(yych == 'e') goto yy872; goto yy54; -yy852: - YYDEBUG(852, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == '.') goto yy854; - if(yych <= '/') goto yy54; - if(yych >= '3') goto yy54; - goto yy853; -yy853: - YYDEBUG(853, *YYCURSOR); - yych = *++YYCURSOR; - if(yych != '.') goto yy54; - goto yy854; -yy854: - YYDEBUG(854, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= ':') goto yy54; - goto yy855; -yy855: - YYDEBUG(855, *YYCURSOR); - ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy856; - if(yych <= '9') goto yy857; - goto yy856; -yy856: - YYDEBUG(856, *YYCURSOR); - -#line 1101 "resource/parse_date.re" -{ - TIMELIB_INIT; - TIMELIB_HAVE_DATE(); - s->time->d = timelib_get_nr((char **) &ptr, 2); - s->time->m = timelib_get_nr((char **) &ptr, 2); - s->time->y = timelib_get_nr((char **) &ptr, 4); - TIMELIB_PROCESS_YEAR(s->time->y); - TIMELIB_DEINIT; - return TIMELIB_DATE_FULL_POINTED; - } -#line 12274 "" -yy857: - YYDEBUG(857, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy856; - if(yych >= ':') goto yy856; - goto yy858; -yy858: - YYDEBUG(858, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy856; - if(yych >= ':') goto yy856; - goto yy859; -yy859: - YYDEBUG(859, *YYCURSOR); +yy865: + YYDEBUG(865, *YYCURSOR); yych = *++YYCURSOR; - goto yy856; -yy860: - YYDEBUG(860, *YYCURSOR); + if(yych == 'E') goto yy866; + if(yych != 'e') goto yy54; + goto yy866; +yy866: + YYDEBUG(866, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy861; + if(yych == 'C') goto yy867; if(yych != 'c') goto yy54; - goto yy861; -yy861: - YYDEBUG(861, *YYCURSOR); + goto yy867; +yy867: + YYDEBUG(867, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy777; - goto yy862; + if(yych <= 'D') goto yy788; + goto yy868; } else { - if(yych != 'e') goto yy777; - goto yy862; + if(yych != 'e') goto yy788; + goto yy868; } } -yy862: - YYDEBUG(862, *YYCURSOR); +yy868: + YYDEBUG(868, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy863; + if(yych == 'M') goto yy869; if(yych != 'm') goto yy54; - goto yy863; -yy863: - YYDEBUG(863, *YYCURSOR); + goto yy869; +yy869: + YYDEBUG(869, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy864; + if(yych == 'B') goto yy870; if(yych != 'b') goto yy54; - goto yy864; -yy864: - YYDEBUG(864, *YYCURSOR); + goto yy870; +yy870: + YYDEBUG(870, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy865; + if(yych == 'E') goto yy871; if(yych != 'e') goto yy54; - goto yy865; -yy865: - YYDEBUG(865, *YYCURSOR); + goto yy871; +yy871: + YYDEBUG(871, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy819; - if(yych == 'r') goto yy819; + if(yych == 'R') goto yy830; + if(yych == 'r') goto yy830; goto yy54; -yy866: - YYDEBUG(866, *YYCURSOR); +yy872: + YYDEBUG(872, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy867; + if(yych == 'P') goto yy873; if(yych != 'p') goto yy54; - goto yy867; -yy867: - YYDEBUG(867, *YYCURSOR); + goto yy873; +yy873: + YYDEBUG(873, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'T'){ - if(yych <= 'S') goto yy777; - goto yy868; + if(yych <= 'S') goto yy788; + goto yy874; } else { - if(yych != 't') goto yy777; - goto yy868; + if(yych != 't') goto yy788; + goto yy874; } } -yy868: - YYDEBUG(868, *YYCURSOR); +yy874: + YYDEBUG(874, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'E'){ - if(yych <= 'D') goto yy777; - goto yy869; + if(yych <= 'D') goto yy788; + goto yy875; } else { - if(yych != 'e') goto yy777; - goto yy869; + if(yych != 'e') goto yy788; + goto yy875; } } -yy869: - YYDEBUG(869, *YYCURSOR); +yy875: + YYDEBUG(875, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy870; + if(yych == 'M') goto yy876; if(yych != 'm') goto yy54; - goto yy870; -yy870: - YYDEBUG(870, *YYCURSOR); + goto yy876; +yy876: + YYDEBUG(876, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy871; + if(yych == 'B') goto yy877; if(yych != 'b') goto yy54; - goto yy871; -yy871: - YYDEBUG(871, *YYCURSOR); + goto yy877; +yy877: + YYDEBUG(877, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy872; + if(yych == 'E') goto yy878; if(yych != 'e') goto yy54; - goto yy872; -yy872: - YYDEBUG(872, *YYCURSOR); + goto yy878; +yy878: + YYDEBUG(878, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy819; - if(yych == 'r') goto yy819; + if(yych == 'R') goto yy830; + if(yych == 'r') goto yy830; goto yy54; -yy873: - YYDEBUG(873, *YYCURSOR); +yy879: + YYDEBUG(879, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Y'){ - if(yych == 'R') goto yy874; + if(yych == 'R') goto yy880; if(yych <= 'X') goto yy54; - goto yy819; + goto yy830; } else { if(yych <= 'r'){ if(yych <= 'q') goto yy54; - goto yy874; + goto yy880; } else { - if(yych == 'y') goto yy819; + if(yych == 'y') goto yy830; goto yy54; } } -yy874: - YYDEBUG(874, *YYCURSOR); +yy880: + YYDEBUG(880, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'C'){ - if(yych <= 'B') goto yy777; - goto yy875; + if(yych <= 'B') goto yy788; + goto yy881; } else { - if(yych != 'c') goto yy777; - goto yy875; + if(yych != 'c') goto yy788; + goto yy881; } } -yy875: - YYDEBUG(875, *YYCURSOR); +yy881: + YYDEBUG(881, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'H') goto yy819; - if(yych == 'h') goto yy819; + if(yych == 'H') goto yy830; + if(yych == 'h') goto yy830; goto yy54; -yy876: - YYDEBUG(876, *YYCURSOR); +yy882: + YYDEBUG(882, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy877; + if(yych == 'B') goto yy883; if(yych != 'b') goto yy54; - goto yy877; -yy877: - YYDEBUG(877, *YYCURSOR); + goto yy883; +yy883: + YYDEBUG(883, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '9'){ - if(yych <= 0x1F) goto yy777; - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - goto yy813; + if(yych <= 0x1F) goto yy788; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + goto yy824; } else { if(yych <= 'R'){ - if(yych <= 'Q') goto yy777; - goto yy878; + if(yych <= 'Q') goto yy788; + goto yy884; } else { - if(yych != 'r') goto yy777; - goto yy878; + if(yych != 'r') goto yy788; + goto yy884; } } -yy878: - YYDEBUG(878, *YYCURSOR); +yy884: + YYDEBUG(884, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'U') goto yy879; + if(yych == 'U') goto yy885; if(yych != 'u') goto yy54; - goto yy879; -yy879: - YYDEBUG(879, *YYCURSOR); + goto yy885; +yy885: + YYDEBUG(885, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy880; + if(yych == 'A') goto yy886; if(yych != 'a') goto yy54; - goto yy880; -yy880: - YYDEBUG(880, *YYCURSOR); + goto yy886; +yy886: + YYDEBUG(886, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy881; + if(yych == 'R') goto yy887; if(yych != 'r') goto yy54; - goto yy881; -yy881: - YYDEBUG(881, *YYCURSOR); + goto yy887; +yy887: + YYDEBUG(887, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'Y') goto yy819; - if(yych == 'y') goto yy819; + if(yych == 'Y') goto yy830; + if(yych == 'y') goto yy830; goto yy54; -yy882: - YYDEBUG(882, *YYCURSOR); +yy888: + YYDEBUG(888, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy921; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy884; + if(yych <= '5') goto yy889; + if(yych <= '6') goto yy890; + if(yych <= '9') goto yy891; goto yy54; -yy883: - YYDEBUG(883, *YYCURSOR); +yy889: + YYDEBUG(889, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy896; + goto yy797; +yy890: + YYDEBUG(890, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy803; + goto yy797; + } else { + if(yych <= '0') goto yy896; + if(yych <= '9') goto yy892; + goto yy797; + } +yy891: + YYDEBUG(891, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych >= ':') goto yy797; + goto yy892; +yy892: + YYDEBUG(892, *YYCURSOR); + ++YYCURSOR; + if((yych = *YYCURSOR) <= '/') goto yy893; + if(yych <= '9') goto yy894; + goto yy893; +yy893: + YYDEBUG(893, *YYCURSOR); + +#line 1105 "resource/parse_date.re" +{ + DEBUG_OUTPUT("pointed date"); + TIMELIB_INIT; + TIMELIB_HAVE_DATE(); + s->time->d = timelib_get_nr((char **) &ptr, 2); + s->time->m = timelib_get_nr((char **) &ptr, 2); + s->time->y = timelib_get_nr((char **) &ptr, 4); + TIMELIB_PROCESS_YEAR(s->time->y); + TIMELIB_DEINIT; + return TIMELIB_DATE_FULL_POINTED; + } +#line 12685 "" +yy894: + YYDEBUG(894, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy893; + if(yych >= ':') goto yy893; + goto yy895; +yy895: + YYDEBUG(895, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy921; + goto yy893; +yy896: + YYDEBUG(896, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '@'){ + if(yych <= '-'){ + if(yych == ' ') goto yy807; + goto yy797; + } else { + if(yych <= '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy894; + goto yy797; + } + } else { + if(yych <= '`'){ + if(yych <= 'A') goto yy809; + if(yych == 'P') goto yy809; + goto yy797; + } else { + if(yych <= 'a') goto yy809; + if(yych == 'p') goto yy809; + goto yy797; + } + } +yy897: + YYDEBUG(897, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '@'){ + if(yych <= '-'){ + if(yych == ' ') goto yy815; + goto yy797; + } else { + if(yych <= '.') goto yy888; + if(yych == ':') goto yy799; + goto yy797; + } + } else { + if(yych <= '`'){ + if(yych <= 'A') goto yy817; + if(yych == 'P') goto yy817; + goto yy797; + } else { + if(yych <= 'a') goto yy817; + if(yych == 'p') goto yy817; + goto yy797; + } + } +yy898: + YYDEBUG(898, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == '-') goto yy937; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy900; + goto yy54; +yy899: + YYDEBUG(899, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == '-') goto yy937; if(yych <= '/') goto yy54; if(yych >= '3') goto yy54; - goto yy884; -yy884: - YYDEBUG(884, *YYCURSOR); + goto yy900; +yy900: + YYDEBUG(900, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy921; + if(yych == '-') goto yy937; goto yy54; -yy885: - YYDEBUG(885, *YYCURSOR); +yy901: + YYDEBUG(901, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy917; + if(yych == 'A') goto yy933; if(yych <= 'T') goto yy54; - goto yy916; + goto yy932; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy917; + goto yy933; } else { - if(yych == 'u') goto yy916; + if(yych == 'u') goto yy932; goto yy54; } } -yy886: - YYDEBUG(886, *YYCURSOR); +yy902: + YYDEBUG(902, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy914; - if(yych == 'e') goto yy914; + if(yych == 'E') goto yy930; + if(yych == 'e') goto yy930; goto yy54; -yy887: - YYDEBUG(887, *YYCURSOR); +yy903: + YYDEBUG(903, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy911; - if(yych == 'a') goto yy911; + if(yych == 'A') goto yy927; + if(yych == 'a') goto yy927; goto yy54; -yy888: - YYDEBUG(888, *YYCURSOR); +yy904: + YYDEBUG(904, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy908; + if(yych == 'P') goto yy924; if(yych <= 'T') goto yy54; - goto yy907; + goto yy923; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy908; + goto yy924; } else { - if(yych == 'u') goto yy907; + if(yych == 'u') goto yy923; goto yy54; } } -yy889: - YYDEBUG(889, *YYCURSOR); +yy905: + YYDEBUG(905, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy904; - if(yych == 'e') goto yy904; + if(yych == 'E') goto yy920; + if(yych == 'e') goto yy920; goto yy54; -yy890: - YYDEBUG(890, *YYCURSOR); +yy906: + YYDEBUG(906, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy902; - if(yych == 'c') goto yy902; + if(yych == 'C') goto yy918; + if(yych == 'c') goto yy918; goto yy54; -yy891: - YYDEBUG(891, *YYCURSOR); +yy907: + YYDEBUG(907, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy900; - if(yych == 'o') goto yy900; + if(yych == 'O') goto yy916; + if(yych == 'o') goto yy916; goto yy54; -yy892: - YYDEBUG(892, *YYCURSOR); +yy908: + YYDEBUG(908, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy893; + if(yych == 'E') goto yy909; if(yych != 'e') goto yy54; - goto yy893; -yy893: - YYDEBUG(893, *YYCURSOR); + goto yy909; +yy909: + YYDEBUG(909, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy894; + if(yych == 'C') goto yy910; if(yych != 'c') goto yy54; - goto yy894; -yy894: - YYDEBUG(894, *YYCURSOR); + goto yy910; +yy910: + YYDEBUG(910, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'E'){ - if(yych <= '9') goto yy813; - if(yych <= 'D') goto yy777; - goto yy862; + if(yych <= '9') goto yy824; + if(yych <= 'D') goto yy788; + goto yy868; } else { - if(yych == 'e') goto yy862; - goto yy777; + if(yych == 'e') goto yy868; + goto yy788; } } -yy895: - YYDEBUG(895, *YYCURSOR); +yy911: + YYDEBUG(911, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy812; - if(yych <= '0') goto yy896; - if(yych <= '2') goto yy897; - if(yych <= '3') goto yy898; - goto yy812; -yy896: - YYDEBUG(896, *YYCURSOR); + if(yych <= '/') goto yy823; + if(yych <= '0') goto yy912; + if(yych <= '2') goto yy913; + if(yych <= '3') goto yy914; + goto yy823; +yy912: + YYDEBUG(912, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych <= '0') goto yy820; - if(yych <= '9') goto yy899; - goto yy814; -yy897: - YYDEBUG(897, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych <= '0') goto yy831; + if(yych <= '9') goto yy915; + goto yy825; +yy913: + YYDEBUG(913, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych <= '9') goto yy899; - goto yy814; -yy898: - YYDEBUG(898, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych <= '9') goto yy915; + goto yy825; +yy914: + YYDEBUG(914, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych <= '1') goto yy899; - if(yych <= '9') goto yy820; - goto yy814; -yy899: - YYDEBUG(899, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych <= '1') goto yy915; + if(yych <= '9') goto yy831; + goto yy825; +yy915: + YYDEBUG(915, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy814; - if(yych <= '9') goto yy821; - goto yy814; -yy900: - YYDEBUG(900, *YYCURSOR); + if(yych <= '/') goto yy825; + if(yych <= '9') goto yy832; + goto yy825; +yy916: + YYDEBUG(916, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy901; + if(yych == 'V') goto yy917; if(yych != 'v') goto yy54; - goto yy901; -yy901: - YYDEBUG(901, *YYCURSOR); + goto yy917; +yy917: + YYDEBUG(917, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'E'){ - if(yych <= '9') goto yy813; - if(yych <= 'D') goto yy777; - goto yy815; + if(yych <= '9') goto yy824; + if(yych <= 'D') goto yy788; + goto yy826; } else { - if(yych == 'e') goto yy815; - goto yy777; + if(yych == 'e') goto yy826; + goto yy788; } } -yy902: - YYDEBUG(902, *YYCURSOR); +yy918: + YYDEBUG(918, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy903; + if(yych == 'T') goto yy919; if(yych != 't') goto yy54; - goto yy903; -yy903: - YYDEBUG(903, *YYCURSOR); + goto yy919; +yy919: + YYDEBUG(919, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'O'){ - if(yych <= '9') goto yy813; - if(yych <= 'N') goto yy777; - goto yy825; + if(yych <= '9') goto yy824; + if(yych <= 'N') goto yy788; + goto yy836; } else { - if(yych == 'o') goto yy825; - goto yy777; + if(yych == 'o') goto yy836; + goto yy788; } } -yy904: - YYDEBUG(904, *YYCURSOR); +yy920: + YYDEBUG(920, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy905; + if(yych == 'P') goto yy921; if(yych != 'p') goto yy54; - goto yy905; -yy905: - YYDEBUG(905, *YYCURSOR); + goto yy921; +yy921: + YYDEBUG(921, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'T'){ - if(yych <= '9') goto yy813; - if(yych <= 'S') goto yy777; - goto yy906; + if(yych <= '9') goto yy824; + if(yych <= 'S') goto yy788; + goto yy922; } else { - if(yych != 't') goto yy777; - goto yy906; + if(yych != 't') goto yy788; + goto yy922; } } -yy906: - YYDEBUG(906, *YYCURSOR); +yy922: + YYDEBUG(922, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'E'){ - if(yych <= '9') goto yy813; - if(yych <= 'D') goto yy777; - goto yy869; + if(yych <= '9') goto yy824; + if(yych <= 'D') goto yy788; + goto yy875; } else { - if(yych == 'e') goto yy869; - goto yy777; + if(yych == 'e') goto yy875; + goto yy788; } } -yy907: - YYDEBUG(907, *YYCURSOR); +yy923: + YYDEBUG(923, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy910; - if(yych == 'g') goto yy910; + if(yych == 'G') goto yy926; + if(yych == 'g') goto yy926; goto yy54; -yy908: - YYDEBUG(908, *YYCURSOR); +yy924: + YYDEBUG(924, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy909; + if(yych == 'R') goto yy925; if(yych != 'r') goto yy54; - goto yy909; -yy909: - YYDEBUG(909, *YYCURSOR); + goto yy925; +yy925: + YYDEBUG(925, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'I'){ - if(yych <= '9') goto yy813; - if(yych <= 'H') goto yy777; - goto yy831; + if(yych <= '9') goto yy824; + if(yych <= 'H') goto yy788; + goto yy842; } else { - if(yych == 'i') goto yy831; - goto yy777; + if(yych == 'i') goto yy842; + goto yy788; } } -yy910: - YYDEBUG(910, *YYCURSOR); +yy926: + YYDEBUG(926, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'U'){ - if(yych <= '9') goto yy813; - if(yych <= 'T') goto yy777; - goto yy833; + if(yych <= '9') goto yy824; + if(yych <= 'T') goto yy788; + goto yy844; } else { - if(yych == 'u') goto yy833; - goto yy777; + if(yych == 'u') goto yy844; + goto yy788; } } -yy911: - YYDEBUG(911, *YYCURSOR); +yy927: + YYDEBUG(927, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Y'){ - if(yych == 'R') goto yy912; + if(yych == 'R') goto yy928; if(yych <= 'X') goto yy54; - goto yy913; + goto yy929; } else { if(yych <= 'r'){ if(yych <= 'q') goto yy54; - goto yy912; + goto yy928; } else { - if(yych == 'y') goto yy913; + if(yych == 'y') goto yy929; goto yy54; } } -yy912: - YYDEBUG(912, *YYCURSOR); +yy928: + YYDEBUG(928, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'C'){ - if(yych <= '9') goto yy813; - if(yych <= 'B') goto yy777; - goto yy875; + if(yych <= '9') goto yy824; + if(yych <= 'B') goto yy788; + goto yy881; } else { - if(yych == 'c') goto yy875; - goto yy777; + if(yych == 'c') goto yy881; + goto yy788; } } -yy913: - YYDEBUG(913, *YYCURSOR); +yy929: + YYDEBUG(929, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '-'){ - if(yych <= 0x1F) goto yy777; - if(yych <= ',') goto yy811; - goto yy895; + if(yych <= 0x1F) goto yy788; + if(yych <= ',') goto yy822; + goto yy911; } else { - if(yych <= '.') goto yy811; - if(yych <= '/') goto yy777; - if(yych <= '9') goto yy813; - goto yy777; + if(yych <= '.') goto yy822; + if(yych <= '/') goto yy788; + if(yych <= '9') goto yy824; + goto yy788; } -yy914: - YYDEBUG(914, *YYCURSOR); +yy930: + YYDEBUG(930, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy915; + if(yych == 'B') goto yy931; if(yych != 'b') goto yy54; - goto yy915; -yy915: - YYDEBUG(915, *YYCURSOR); + goto yy931; +yy931: + YYDEBUG(931, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'R'){ - if(yych <= '9') goto yy813; - if(yych <= 'Q') goto yy777; - goto yy878; + if(yych <= '9') goto yy824; + if(yych <= 'Q') goto yy788; + goto yy884; } else { - if(yych == 'r') goto yy878; - goto yy777; + if(yych == 'r') goto yy884; + goto yy788; } } -yy916: - YYDEBUG(916, *YYCURSOR); +yy932: + YYDEBUG(932, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'N'){ - if(yych == 'L') goto yy920; + if(yych == 'L') goto yy936; if(yych <= 'M') goto yy54; - goto yy919; + goto yy935; } else { if(yych <= 'l'){ if(yych <= 'k') goto yy54; - goto yy920; + goto yy936; } else { - if(yych == 'n') goto yy919; + if(yych == 'n') goto yy935; goto yy54; } } -yy917: - YYDEBUG(917, *YYCURSOR); +yy933: + YYDEBUG(933, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy918; + if(yych == 'N') goto yy934; if(yych != 'n') goto yy54; - goto yy918; -yy918: - YYDEBUG(918, *YYCURSOR); + goto yy934; +yy934: + YYDEBUG(934, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'U'){ - if(yych <= '9') goto yy813; - if(yych <= 'T') goto yy777; - goto yy838; + if(yych <= '9') goto yy824; + if(yych <= 'T') goto yy788; + goto yy849; } else { - if(yych == 'u') goto yy838; - goto yy777; + if(yych == 'u') goto yy849; + goto yy788; } } -yy919: - YYDEBUG(919, *YYCURSOR); +yy935: + YYDEBUG(935, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'E'){ - if(yych <= '9') goto yy813; - if(yych <= 'D') goto yy777; - goto yy819; + if(yych <= '9') goto yy824; + if(yych <= 'D') goto yy788; + goto yy830; } else { - if(yych == 'e') goto yy819; - goto yy777; + if(yych == 'e') goto yy830; + goto yy788; } } -yy920: - YYDEBUG(920, *YYCURSOR); +yy936: + YYDEBUG(936, *YYCURSOR); yyaccept = 10; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ if(yych <= ','){ - if(yych <= 0x1F) goto yy777; - goto yy811; + if(yych <= 0x1F) goto yy788; + goto yy822; } else { - if(yych <= '-') goto yy895; - if(yych <= '.') goto yy811; - goto yy777; + if(yych <= '-') goto yy911; + if(yych <= '.') goto yy822; + goto yy788; } } else { if(yych <= 'Y'){ - if(yych <= '9') goto yy813; - if(yych <= 'X') goto yy777; - goto yy819; + if(yych <= '9') goto yy824; + if(yych <= 'X') goto yy788; + goto yy830; } else { - if(yych == 'y') goto yy819; - goto yy777; + if(yych == 'y') goto yy830; + goto yy788; } } -yy921: - YYDEBUG(921, *YYCURSOR); +yy937: + YYDEBUG(937, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '2') goto yy922; - if(yych <= '3') goto yy924; - if(yych <= '9') goto yy925; + if(yych <= '2') goto yy938; + if(yych <= '3') goto yy940; + if(yych <= '9') goto yy941; goto yy54; -yy922: - YYDEBUG(922, *YYCURSOR); +yy938: + YYDEBUG(938, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy923; - if(yych <= '9') goto yy925; - goto yy923; -yy923: - YYDEBUG(923, *YYCURSOR); + if((yych = *YYCURSOR) <= '/') goto yy939; + if(yych <= '9') goto yy941; + goto yy939; +yy939: + YYDEBUG(939, *YYCURSOR); -#line 1077 "resource/parse_date.re" +#line 1079 "resource/parse_date.re" { + DEBUG_OUTPUT("gnudateshort"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -14751,30 +15080,31 @@ yy923: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 12878 "" -yy924: - YYDEBUG(924, *YYCURSOR); +#line 13173 "" +yy940: + YYDEBUG(940, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy923; - if(yych >= '2') goto yy923; - goto yy925; -yy925: - YYDEBUG(925, *YYCURSOR); + if(yych <= '/') goto yy939; + if(yych >= '2') goto yy939; + goto yy941; +yy941: + YYDEBUG(941, *YYCURSOR); yych = *++YYCURSOR; - goto yy923; -yy926: - YYDEBUG(926, *YYCURSOR); + goto yy939; +yy942: + YYDEBUG(942, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '.') goto yy927; - if(yych <= '/') goto yy978; - if(yych <= '9') goto yy929; - goto yy927; -yy927: - YYDEBUG(927, *YYCURSOR); + if(yych <= '.') goto yy943; + if(yych <= '/') goto yy994; + if(yych <= '9') goto yy945; + goto yy943; +yy943: + YYDEBUG(943, *YYCURSOR); #line 1052 "resource/parse_date.re" { + DEBUG_OUTPUT("americanshort | american"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_nr((char **) &ptr, 2); @@ -14786,231 +15116,232 @@ yy927: TIMELIB_DEINIT; return TIMELIB_AMERICAN; } -#line 12905 "" -yy928: - YYDEBUG(928, *YYCURSOR); +#line 13201 "" +yy944: + YYDEBUG(944, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '.') goto yy927; - if(yych <= '/') goto yy978; - if(yych >= '2') goto yy927; - goto yy929; -yy929: - YYDEBUG(929, *YYCURSOR); + if(yych <= '.') goto yy943; + if(yych <= '/') goto yy994; + if(yych >= '2') goto yy943; + goto yy945; +yy945: + YYDEBUG(945, *YYCURSOR); yyaccept = 12; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '/') goto yy978; - goto yy927; -yy930: - YYDEBUG(930, *YYCURSOR); + if(yych == '/') goto yy994; + goto yy943; +yy946: + YYDEBUG(946, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy977; + if(yych == 'A') goto yy993; if(yych <= 'T') goto yy54; - goto yy976; + goto yy992; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy977; + goto yy993; } else { - if(yych == 'u') goto yy976; + if(yych == 'u') goto yy992; goto yy54; } } -yy931: - YYDEBUG(931, *YYCURSOR); +yy947: + YYDEBUG(947, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy975; - if(yych == 'e') goto yy975; + if(yych == 'E') goto yy991; + if(yych == 'e') goto yy991; goto yy54; -yy932: - YYDEBUG(932, *YYCURSOR); +yy948: + YYDEBUG(948, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy974; - if(yych == 'a') goto yy974; + if(yych == 'A') goto yy990; + if(yych == 'a') goto yy990; goto yy54; -yy933: - YYDEBUG(933, *YYCURSOR); +yy949: + YYDEBUG(949, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy973; + if(yych == 'P') goto yy989; if(yych <= 'T') goto yy54; - goto yy972; + goto yy988; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy973; + goto yy989; } else { - if(yych == 'u') goto yy972; + if(yych == 'u') goto yy988; goto yy54; } } -yy934: - YYDEBUG(934, *YYCURSOR); +yy950: + YYDEBUG(950, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy970; - if(yych == 'e') goto yy970; + if(yych == 'E') goto yy986; + if(yych == 'e') goto yy986; goto yy54; -yy935: - YYDEBUG(935, *YYCURSOR); +yy951: + YYDEBUG(951, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy969; - if(yych == 'c') goto yy969; + if(yych == 'C') goto yy985; + if(yych == 'c') goto yy985; goto yy54; -yy936: - YYDEBUG(936, *YYCURSOR); +yy952: + YYDEBUG(952, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy968; - if(yych == 'o') goto yy968; + if(yych == 'O') goto yy984; + if(yych == 'o') goto yy984; goto yy54; -yy937: - YYDEBUG(937, *YYCURSOR); +yy953: + YYDEBUG(953, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy938; + if(yych == 'E') goto yy954; if(yych != 'e') goto yy54; - goto yy938; -yy938: - YYDEBUG(938, *YYCURSOR); + goto yy954; +yy954: + YYDEBUG(954, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy939; + if(yych == 'C') goto yy955; if(yych != 'c') goto yy54; - goto yy939; -yy939: - YYDEBUG(939, *YYCURSOR); + goto yy955; +yy955: + YYDEBUG(955, *YYCURSOR); yych = *++YYCURSOR; - if(yych != '/') goto yy54; - goto yy940; -yy940: - YYDEBUG(940, *YYCURSOR); + if(yych != '/') goto yy54; + goto yy956; +yy956: + YYDEBUG(956, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy941; -yy941: - YYDEBUG(941, *YYCURSOR); + goto yy957; +yy957: + YYDEBUG(957, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy942; -yy942: - YYDEBUG(942, *YYCURSOR); + goto yy958; +yy958: + YYDEBUG(958, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy943; -yy943: - YYDEBUG(943, *YYCURSOR); + goto yy959; +yy959: + YYDEBUG(959, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy944; -yy944: - YYDEBUG(944, *YYCURSOR); + goto yy960; +yy960: + YYDEBUG(960, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy945; -yy945: - YYDEBUG(945, *YYCURSOR); + goto yy961; +yy961: + YYDEBUG(961, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '1') goto yy946; - if(yych <= '2') goto yy947; + if(yych <= '1') goto yy962; + if(yych <= '2') goto yy963; goto yy54; -yy946: - YYDEBUG(946, *YYCURSOR); +yy962: + YYDEBUG(962, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy948; + if(yych <= '9') goto yy964; goto yy54; -yy947: - YYDEBUG(947, *YYCURSOR); +yy963: + YYDEBUG(963, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '4') goto yy54; - goto yy948; -yy948: - YYDEBUG(948, *YYCURSOR); + goto yy964; +yy964: + YYDEBUG(964, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy949; -yy949: - YYDEBUG(949, *YYCURSOR); + goto yy965; +yy965: + YYDEBUG(965, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '6') goto yy54; - goto yy950; -yy950: - YYDEBUG(950, *YYCURSOR); + goto yy966; +yy966: + YYDEBUG(966, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy951; -yy951: - YYDEBUG(951, *YYCURSOR); + goto yy967; +yy967: + YYDEBUG(967, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy952; -yy952: - YYDEBUG(952, *YYCURSOR); + goto yy968; +yy968: + YYDEBUG(968, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy953; - if(yych <= '6') goto yy954; + if(yych <= '5') goto yy969; + if(yych <= '6') goto yy970; goto yy54; -yy953: - YYDEBUG(953, *YYCURSOR); +yy969: + YYDEBUG(969, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy955; + if(yych <= '9') goto yy971; goto yy54; -yy954: - YYDEBUG(954, *YYCURSOR); +yy970: + YYDEBUG(970, *YYCURSOR); yych = *++YYCURSOR; if(yych != '0') goto yy54; - goto yy955; -yy955: - YYDEBUG(955, *YYCURSOR); + goto yy971; +yy971: + YYDEBUG(971, *YYCURSOR); yych = *++YYCURSOR; if(yych != ' ') goto yy54; - goto yy956; -yy956: - YYDEBUG(956, *YYCURSOR); + goto yy972; +yy972: + YYDEBUG(972, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 6) YYFILL(6); yych = *YYCURSOR; - goto yy957; -yy957: - YYDEBUG(957, *YYCURSOR); + goto yy973; +yy973: + YYDEBUG(973, *YYCURSOR); if(yych <= '*'){ - if(yych == ' ') goto yy956; + if(yych == ' ') goto yy972; goto yy54; } else { if(yych == ',') goto yy54; if(yych >= '.') goto yy54; - goto yy958; + goto yy974; } -yy958: - YYDEBUG(958, *YYCURSOR); +yy974: + YYDEBUG(974, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '1') goto yy959; - if(yych <= '2') goto yy961; - if(yych <= '9') goto yy962; + if(yych <= '1') goto yy975; + if(yych <= '2') goto yy977; + if(yych <= '9') goto yy978; goto yy54; -yy959: - YYDEBUG(959, *YYCURSOR); +yy975: + YYDEBUG(975, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy960; - if(yych <= '5') goto yy966; - if(yych <= '9') goto yy962; - if(yych <= ':') goto yy963; - goto yy960; -yy960: - YYDEBUG(960, *YYCURSOR); + if((yych = *YYCURSOR) <= '/') goto yy976; + if(yych <= '5') goto yy982; + if(yych <= '9') goto yy978; + if(yych <= ':') goto yy979; + goto yy976; +yy976: + YYDEBUG(976, *YYCURSOR); -#line 1265 "resource/parse_date.re" +#line 1279 "resource/parse_date.re" { int tz_not_found; + DEBUG_OUTPUT("clf"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -15025,185 +15356,185 @@ yy960: TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 13078 "" -yy961: - YYDEBUG(961, *YYCURSOR); +#line 13375 "" +yy977: + YYDEBUG(977, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '5'){ - if(yych <= '/') goto yy960; - if(yych <= '3') goto yy966; - goto yy964; + if(yych <= '/') goto yy976; + if(yych <= '3') goto yy982; + goto yy980; } else { - if(yych == ':') goto yy963; - goto yy960; + if(yych == ':') goto yy979; + goto yy976; } -yy962: - YYDEBUG(962, *YYCURSOR); +yy978: + YYDEBUG(978, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy960; - if(yych <= '5') goto yy964; - if(yych != ':') goto yy960; - goto yy963; -yy963: - YYDEBUG(963, *YYCURSOR); + if(yych <= '/') goto yy976; + if(yych <= '5') goto yy980; + if(yych != ':') goto yy976; + goto yy979; +yy979: + YYDEBUG(979, *YYCURSOR); yyaccept = 13; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy960; - if(yych >= '6') goto yy960; - goto yy964; -yy964: - YYDEBUG(964, *YYCURSOR); + if(yych <= '/') goto yy976; + if(yych >= '6') goto yy976; + goto yy980; +yy980: + YYDEBUG(980, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy965; -yy965: - YYDEBUG(965, *YYCURSOR); + goto yy981; +yy981: + YYDEBUG(981, *YYCURSOR); yych = *++YYCURSOR; - goto yy960; -yy966: - YYDEBUG(966, *YYCURSOR); + goto yy976; +yy982: + YYDEBUG(982, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy960; - if(yych <= '5') goto yy967; - if(yych <= '9') goto yy965; - if(yych <= ':') goto yy963; - goto yy960; -yy967: - YYDEBUG(967, *YYCURSOR); + if(yych <= '/') goto yy976; + if(yych <= '5') goto yy983; + if(yych <= '9') goto yy981; + if(yych <= ':') goto yy979; + goto yy976; +yy983: + YYDEBUG(983, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy960; - if(yych <= '9') goto yy965; - goto yy960; -yy968: - YYDEBUG(968, *YYCURSOR); + if(yych <= '/') goto yy976; + if(yych <= '9') goto yy981; + goto yy976; +yy984: + YYDEBUG(984, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy939; - if(yych == 'v') goto yy939; + if(yych == 'V') goto yy955; + if(yych == 'v') goto yy955; goto yy54; -yy969: - YYDEBUG(969, *YYCURSOR); +yy985: + YYDEBUG(985, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy939; - if(yych == 't') goto yy939; + if(yych == 'T') goto yy955; + if(yych == 't') goto yy955; goto yy54; -yy970: - YYDEBUG(970, *YYCURSOR); +yy986: + YYDEBUG(986, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy971; + if(yych == 'P') goto yy987; if(yych != 'p') goto yy54; - goto yy971; -yy971: - YYDEBUG(971, *YYCURSOR); + goto yy987; +yy987: + YYDEBUG(987, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'S'){ - if(yych == '/') goto yy940; + if(yych == '/') goto yy956; goto yy54; } else { - if(yych <= 'T') goto yy939; - if(yych == 't') goto yy939; + if(yych <= 'T') goto yy955; + if(yych == 't') goto yy955; goto yy54; } -yy972: - YYDEBUG(972, *YYCURSOR); +yy988: + YYDEBUG(988, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy939; - if(yych == 'g') goto yy939; + if(yych == 'G') goto yy955; + if(yych == 'g') goto yy955; goto yy54; -yy973: - YYDEBUG(973, *YYCURSOR); +yy989: + YYDEBUG(989, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy939; - if(yych == 'r') goto yy939; + if(yych == 'R') goto yy955; + if(yych == 'r') goto yy955; goto yy54; -yy974: - YYDEBUG(974, *YYCURSOR); +yy990: + YYDEBUG(990, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Y'){ - if(yych == 'R') goto yy939; + if(yych == 'R') goto yy955; if(yych <= 'X') goto yy54; - goto yy939; + goto yy955; } else { if(yych <= 'r'){ if(yych <= 'q') goto yy54; - goto yy939; + goto yy955; } else { - if(yych == 'y') goto yy939; + if(yych == 'y') goto yy955; goto yy54; } } -yy975: - YYDEBUG(975, *YYCURSOR); +yy991: + YYDEBUG(991, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy939; - if(yych == 'b') goto yy939; + if(yych == 'B') goto yy955; + if(yych == 'b') goto yy955; goto yy54; -yy976: - YYDEBUG(976, *YYCURSOR); +yy992: + YYDEBUG(992, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'N'){ - if(yych == 'L') goto yy939; + if(yych == 'L') goto yy955; if(yych <= 'M') goto yy54; - goto yy939; + goto yy955; } else { if(yych <= 'l'){ if(yych <= 'k') goto yy54; - goto yy939; + goto yy955; } else { - if(yych == 'n') goto yy939; + if(yych == 'n') goto yy955; goto yy54; } } -yy977: - YYDEBUG(977, *YYCURSOR); +yy993: + YYDEBUG(993, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy939; - if(yych == 'n') goto yy939; + if(yych == 'N') goto yy955; + if(yych == 'n') goto yy955; goto yy54; -yy978: - YYDEBUG(978, *YYCURSOR); +yy994: + YYDEBUG(994, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy979; -yy979: - YYDEBUG(979, *YYCURSOR); + goto yy995; +yy995: + YYDEBUG(995, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy927; - if(yych >= ':') goto yy927; - goto yy980; -yy980: - YYDEBUG(980, *YYCURSOR); + if(yych <= '/') goto yy943; + if(yych >= ':') goto yy943; + goto yy996; +yy996: + YYDEBUG(996, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy927; - if(yych >= ':') goto yy927; - goto yy981; -yy981: - YYDEBUG(981, *YYCURSOR); + if(yych <= '/') goto yy943; + if(yych >= ':') goto yy943; + goto yy997; +yy997: + YYDEBUG(997, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy927; - if(yych >= ':') goto yy927; - goto yy982; -yy982: - YYDEBUG(982, *YYCURSOR); + if(yych <= '/') goto yy943; + if(yych >= ':') goto yy943; + goto yy998; +yy998: + YYDEBUG(998, *YYCURSOR); yych = *++YYCURSOR; - goto yy927; -yy983: - YYDEBUG(983, *YYCURSOR); + goto yy943; +yy999: + YYDEBUG(999, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy984; + if(yych == '-') goto yy1000; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1011; + if(yych <= '9') goto yy1027; goto yy67; -yy984: - YYDEBUG(984, *YYCURSOR); +yy1000: + YYDEBUG(1000, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch(yych){ - case '0': goto yy882; - case '1': goto yy883; + case '0': goto yy898; + case '1': goto yy899; case '2': case '3': case '4': @@ -15211,131 +15542,132 @@ yy984: case '6': case '7': case '8': - case '9': goto yy884; - case 'A': case 'a': goto yy988; - case 'D': case 'd': goto yy992; - case 'F': case 'f': goto yy986; - case 'J': case 'j': goto yy985; - case 'M': case 'm': goto yy987; - case 'N': case 'n': goto yy991; - case 'O': case 'o': goto yy990; - case 'S': case 's': goto yy989; + case '9': goto yy900; + case 'A': case 'a': goto yy1004; + case 'D': case 'd': goto yy1008; + case 'F': case 'f': goto yy1002; + case 'J': case 'j': goto yy1001; + case 'M': case 'm': goto yy1003; + case 'N': case 'n': goto yy1007; + case 'O': case 'o': goto yy1006; + case 'S': case 's': goto yy1005; default: goto yy54; } -yy985: - YYDEBUG(985, *YYCURSOR); +yy1001: + YYDEBUG(1001, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy1010; + if(yych == 'A') goto yy1026; if(yych <= 'T') goto yy54; - goto yy1009; + goto yy1025; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy1010; + goto yy1026; } else { - if(yych == 'u') goto yy1009; + if(yych == 'u') goto yy1025; goto yy54; } } -yy986: - YYDEBUG(986, *YYCURSOR); +yy1002: + YYDEBUG(1002, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1008; - if(yych == 'e') goto yy1008; + if(yych == 'E') goto yy1024; + if(yych == 'e') goto yy1024; goto yy54; -yy987: - YYDEBUG(987, *YYCURSOR); +yy1003: + YYDEBUG(1003, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy1007; - if(yych == 'a') goto yy1007; + if(yych == 'A') goto yy1023; + if(yych == 'a') goto yy1023; goto yy54; -yy988: - YYDEBUG(988, *YYCURSOR); +yy1004: + YYDEBUG(1004, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy1006; + if(yych == 'P') goto yy1022; if(yych <= 'T') goto yy54; - goto yy1005; + goto yy1021; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy1006; + goto yy1022; } else { - if(yych == 'u') goto yy1005; + if(yych == 'u') goto yy1021; goto yy54; } } -yy989: - YYDEBUG(989, *YYCURSOR); +yy1005: + YYDEBUG(1005, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1003; - if(yych == 'e') goto yy1003; + if(yych == 'E') goto yy1019; + if(yych == 'e') goto yy1019; goto yy54; -yy990: - YYDEBUG(990, *YYCURSOR); +yy1006: + YYDEBUG(1006, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy1002; - if(yych == 'c') goto yy1002; + if(yych == 'C') goto yy1018; + if(yych == 'c') goto yy1018; goto yy54; -yy991: - YYDEBUG(991, *YYCURSOR); +yy1007: + YYDEBUG(1007, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy1001; - if(yych == 'o') goto yy1001; + if(yych == 'O') goto yy1017; + if(yych == 'o') goto yy1017; goto yy54; -yy992: - YYDEBUG(992, *YYCURSOR); +yy1008: + YYDEBUG(1008, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy993; + if(yych == 'E') goto yy1009; if(yych != 'e') goto yy54; - goto yy993; -yy993: - YYDEBUG(993, *YYCURSOR); + goto yy1009; +yy1009: + YYDEBUG(1009, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy994; + if(yych == 'C') goto yy1010; if(yych != 'c') goto yy54; - goto yy994; -yy994: - YYDEBUG(994, *YYCURSOR); + goto yy1010; +yy1010: + YYDEBUG(1010, *YYCURSOR); yych = *++YYCURSOR; if(yych != '-') goto yy54; - goto yy995; -yy995: - YYDEBUG(995, *YYCURSOR); + goto yy1011; +yy1011: + YYDEBUG(1011, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '0') goto yy996; - if(yych <= '2') goto yy997; - if(yych <= '3') goto yy998; + if(yych <= '0') goto yy1012; + if(yych <= '2') goto yy1013; + if(yych <= '3') goto yy1014; goto yy54; -yy996: - YYDEBUG(996, *YYCURSOR); +yy1012: + YYDEBUG(1012, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '0') goto yy54; - if(yych <= '9') goto yy999; + if(yych <= '9') goto yy1015; goto yy54; -yy997: - YYDEBUG(997, *YYCURSOR); +yy1013: + YYDEBUG(1013, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy999; + if(yych <= '9') goto yy1015; goto yy54; -yy998: - YYDEBUG(998, *YYCURSOR); +yy1014: + YYDEBUG(1014, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '2') goto yy54; - goto yy999; -yy999: - YYDEBUG(999, *YYCURSOR); + goto yy1015; +yy1015: + YYDEBUG(1015, *YYCURSOR); ++YYCURSOR; - goto yy1000; -yy1000: - YYDEBUG(1000, *YYCURSOR); + goto yy1016; +yy1016: + YYDEBUG(1016, *YYCURSOR); -#line 1253 "resource/parse_date.re" +#line 1266 "resource/parse_date.re" { + DEBUG_OUTPUT("pgtextreverse"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -15345,94 +15677,94 @@ yy1000: TIMELIB_DEINIT; return TIMELIB_PG_TEXT; } -#line 13317 "" -yy1001: - YYDEBUG(1001, *YYCURSOR); +#line 13615 "" +yy1017: + YYDEBUG(1017, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy994; - if(yych == 'v') goto yy994; + if(yych == 'V') goto yy1010; + if(yych == 'v') goto yy1010; goto yy54; -yy1002: - YYDEBUG(1002, *YYCURSOR); +yy1018: + YYDEBUG(1018, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy994; - if(yych == 't') goto yy994; + if(yych == 'T') goto yy1010; + if(yych == 't') goto yy1010; goto yy54; -yy1003: - YYDEBUG(1003, *YYCURSOR); +yy1019: + YYDEBUG(1019, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy1004; + if(yych == 'P') goto yy1020; if(yych != 'p') goto yy54; - goto yy1004; -yy1004: - YYDEBUG(1004, *YYCURSOR); + goto yy1020; +yy1020: + YYDEBUG(1020, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'S'){ - if(yych == '-') goto yy995; + if(yych == '-') goto yy1011; goto yy54; } else { - if(yych <= 'T') goto yy994; - if(yych == 't') goto yy994; + if(yych <= 'T') goto yy1010; + if(yych == 't') goto yy1010; goto yy54; } -yy1005: - YYDEBUG(1005, *YYCURSOR); +yy1021: + YYDEBUG(1021, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy994; - if(yych == 'g') goto yy994; + if(yych == 'G') goto yy1010; + if(yych == 'g') goto yy1010; goto yy54; -yy1006: - YYDEBUG(1006, *YYCURSOR); +yy1022: + YYDEBUG(1022, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy994; - if(yych == 'r') goto yy994; + if(yych == 'R') goto yy1010; + if(yych == 'r') goto yy1010; goto yy54; -yy1007: - YYDEBUG(1007, *YYCURSOR); +yy1023: + YYDEBUG(1023, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Y'){ - if(yych == 'R') goto yy994; + if(yych == 'R') goto yy1010; if(yych <= 'X') goto yy54; - goto yy994; + goto yy1010; } else { if(yych <= 'r'){ if(yych <= 'q') goto yy54; - goto yy994; + goto yy1010; } else { - if(yych == 'y') goto yy994; + if(yych == 'y') goto yy1010; goto yy54; } } -yy1008: - YYDEBUG(1008, *YYCURSOR); +yy1024: + YYDEBUG(1024, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy994; - if(yych == 'b') goto yy994; + if(yych == 'B') goto yy1010; + if(yych == 'b') goto yy1010; goto yy54; -yy1009: - YYDEBUG(1009, *YYCURSOR); +yy1025: + YYDEBUG(1025, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'N'){ - if(yych == 'L') goto yy994; + if(yych == 'L') goto yy1010; if(yych <= 'M') goto yy54; - goto yy994; + goto yy1010; } else { if(yych <= 'l'){ if(yych <= 'k') goto yy54; - goto yy994; + goto yy1010; } else { - if(yych == 'n') goto yy994; + if(yych == 'n') goto yy1010; goto yy54; } } -yy1010: - YYDEBUG(1010, *YYCURSOR); +yy1026: + YYDEBUG(1026, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy994; - if(yych == 'n') goto yy994; + if(yych == 'N') goto yy1010; + if(yych == 'n') goto yy1010; goto yy54; -yy1011: - YYDEBUG(1011, *YYCURSOR); +yy1027: + YYDEBUG(1027, *YYCURSOR); yyaccept = 14; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -15458,41 +15790,42 @@ yy1011: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy1016; - case '-': goto yy1013; - case '.': goto yy1019; - case '/': goto yy1014; - case '0': goto yy1032; - case '1': goto yy1033; - case '2': goto yy1034; - case '3': goto yy1035; + case 't': case 'w': case 'y': goto yy1032; + case '-': goto yy1029; + case '.': goto yy1035; + case '/': goto yy1030; + case '0': goto yy1048; + case '1': goto yy1049; + case '2': goto yy1050; + case '3': goto yy1051; case '4': case '5': case '6': case '7': case '8': case '9': goto yy76; - case 'W': goto yy1036; - default: goto yy1012; + case 'W': goto yy1052; + default: goto yy1028; } -yy1012: - YYDEBUG(1012, *YYCURSOR); +yy1028: + YYDEBUG(1028, *YYCURSOR); -#line 1283 "resource/parse_date.re" +#line 1298 "resource/parse_date.re" { + DEBUG_OUTPUT("year4"); TIMELIB_INIT; s->time->y = timelib_get_nr((char **) &ptr, 4); TIMELIB_DEINIT; return TIMELIB_CLF; } -#line 13432 "" -yy1013: - YYDEBUG(1013, *YYCURSOR); +#line 13731 "" +yy1029: + YYDEBUG(1029, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch(yych){ - case '0': goto yy1169; - case '1': goto yy1170; + case '0': goto yy1185; + case '1': goto yy1186; case '2': case '3': case '4': @@ -15500,35 +15833,36 @@ yy1013: case '6': case '7': case '8': - case '9': goto yy884; - case 'A': case 'a': goto yy1164; - case 'D': case 'd': goto yy1168; - case 'F': case 'f': goto yy1162; - case 'J': case 'j': goto yy1161; - case 'M': case 'm': goto yy1163; - case 'N': case 'n': goto yy1167; - case 'O': case 'o': goto yy1166; - case 'S': case 's': goto yy1165; - default: goto yy1018; + case '9': goto yy900; + case 'A': case 'a': goto yy1180; + case 'D': case 'd': goto yy1184; + case 'F': case 'f': goto yy1178; + case 'J': case 'j': goto yy1177; + case 'M': case 'm': goto yy1179; + case 'N': case 'n': goto yy1183; + case 'O': case 'o': goto yy1182; + case 'S': case 's': goto yy1181; + default: goto yy1034; } -yy1014: - YYDEBUG(1014, *YYCURSOR); +yy1030: + YYDEBUG(1030, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '0') goto yy1151; - if(yych <= '1') goto yy1152; + if(yych <= '0') goto yy1167; + if(yych <= '1') goto yy1168; + if(yych <= '9') goto yy1169; goto yy54; -yy1015: - YYDEBUG(1015, *YYCURSOR); +yy1031: + YYDEBUG(1031, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; - goto yy1016; -yy1016: - YYDEBUG(1016, *YYCURSOR); + goto yy1032; +yy1032: + YYDEBUG(1032, *YYCURSOR); YYDEBUG(-1, yych); switch(yych){ - case ' ': goto yy1015; + case ' ': goto yy1031; case '!': case '"': case '#': @@ -15542,32 +15876,32 @@ yy1016: case '+': case ',': case '-': - case '.': goto yy1017; - case 'A': case 'a': goto yy1027; - case 'D': case 'd': goto yy1031; - case 'F': case 'f': goto yy1025; + case '.': goto yy1033; + case 'A': case 'a': goto yy1043; + case 'D': case 'd': goto yy1047; + case 'F': case 'f': goto yy1041; case 'H': case 'h': goto yy70; - case 'I': goto yy1020; - case 'J': case 'j': goto yy1024; - case 'M': case 'm': goto yy1026; - case 'N': case 'n': goto yy1030; - case 'O': case 'o': goto yy1029; - case 'S': case 's': goto yy1028; + case 'I': goto yy1036; + case 'J': case 'j': goto yy1040; + case 'M': case 'm': goto yy1042; + case 'N': case 'n': goto yy1046; + case 'O': case 'o': goto yy1045; + case 'S': case 's': goto yy1044; case 'T': case 't': goto yy75; - case 'V': goto yy1022; + case 'V': goto yy1038; case 'W': case 'w': goto yy72; - case 'X': goto yy1023; + case 'X': goto yy1039; case 'Y': case 'y': goto yy74; default: goto yy54; } -yy1017: - YYDEBUG(1017, *YYCURSOR); +yy1033: + YYDEBUG(1033, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 9) YYFILL(9); yych = *YYCURSOR; - goto yy1018; -yy1018: - YYDEBUG(1018, *YYCURSOR); + goto yy1034; +yy1034: + YYDEBUG(1034, *YYCURSOR); YYDEBUG(-1, yych); switch(yych){ case ' ': @@ -15584,44 +15918,45 @@ yy1018: case '+': case ',': case '-': - case '.': goto yy1017; - case 'A': case 'a': goto yy1027; - case 'D': case 'd': goto yy1143; - case 'F': case 'f': goto yy1140; - case 'I': goto yy1020; - case 'J': case 'j': goto yy1024; - case 'M': case 'm': goto yy1141; - case 'N': case 'n': goto yy1030; - case 'O': case 'o': goto yy1029; - case 'S': case 's': goto yy1142; - case 'V': goto yy1022; - case 'X': goto yy1023; + case '.': goto yy1033; + case 'A': case 'a': goto yy1043; + case 'D': case 'd': goto yy1159; + case 'F': case 'f': goto yy1156; + case 'I': goto yy1036; + case 'J': case 'j': goto yy1040; + case 'M': case 'm': goto yy1157; + case 'N': case 'n': goto yy1046; + case 'O': case 'o': goto yy1045; + case 'S': case 's': goto yy1158; + case 'V': goto yy1038; + case 'X': goto yy1039; default: goto yy54; } -yy1019: - YYDEBUG(1019, *YYCURSOR); +yy1035: + YYDEBUG(1035, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy1018; - if(yych <= '0') goto yy1137; - if(yych <= '2') goto yy1138; - if(yych <= '3') goto yy1139; - goto yy1018; -yy1020: - YYDEBUG(1020, *YYCURSOR); + if(yych <= '/') goto yy1034; + if(yych <= '0') goto yy1153; + if(yych <= '2') goto yy1154; + if(yych <= '3') goto yy1155; + goto yy1034; +yy1036: + YYDEBUG(1036, *YYCURSOR); ++YYCURSOR; if((yych = *YYCURSOR) <= 'U'){ - if(yych == 'I') goto yy1136; - goto yy1021; + if(yych == 'I') goto yy1152; + goto yy1037; } else { - if(yych == 'W') goto yy1021; - if(yych <= 'X') goto yy1090; - goto yy1021; + if(yych == 'W') goto yy1037; + if(yych <= 'X') goto yy1106; + goto yy1037; } -yy1021: - YYDEBUG(1021, *YYCURSOR); +yy1037: + YYDEBUG(1037, *YYCURSOR); -#line 1125 "resource/parse_date.re" +#line 1131 "resource/parse_date.re" { + DEBUG_OUTPUT("datenodayrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -15631,39 +15966,39 @@ yy1021: TIMELIB_DEINIT; return TIMELIB_DATE_NO_DAY; } -#line 13557 "" -yy1022: - YYDEBUG(1022, *YYCURSOR); +#line 13858 "" +yy1038: + YYDEBUG(1038, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'I') goto yy1134; - goto yy1021; -yy1023: - YYDEBUG(1023, *YYCURSOR); + if(yych == 'I') goto yy1150; + goto yy1037; +yy1039: + YYDEBUG(1039, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'I') goto yy1133; - goto yy1021; -yy1024: - YYDEBUG(1024, *YYCURSOR); + if(yych == 'I') goto yy1149; + goto yy1037; +yy1040: + YYDEBUG(1040, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy1126; + if(yych == 'A') goto yy1142; if(yych <= 'T') goto yy54; - goto yy1125; + goto yy1141; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy1126; + goto yy1142; } else { - if(yych == 'u') goto yy1125; + if(yych == 'u') goto yy1141; goto yy54; } } -yy1025: - YYDEBUG(1025, *YYCURSOR); +yy1041: + YYDEBUG(1041, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'R'){ if(yych <= 'N'){ - if(yych == 'E') goto yy1119; + if(yych == 'E') goto yy1135; goto yy54; } else { if(yych <= 'O') goto yy96; @@ -15672,7 +16007,7 @@ yy1025: } } else { if(yych <= 'n'){ - if(yych == 'e') goto yy1119; + if(yych == 'e') goto yy1135; goto yy54; } else { if(yych <= 'o') goto yy96; @@ -15680,12 +16015,12 @@ yy1025: goto yy54; } } -yy1026: - YYDEBUG(1026, *YYCURSOR); +yy1042: + YYDEBUG(1042, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'O'){ if(yych <= 'H'){ - if(yych == 'A') goto yy1116; + if(yych == 'A') goto yy1132; goto yy54; } else { if(yych <= 'I') goto yy123; @@ -15694,7 +16029,7 @@ yy1026: } } else { if(yych <= 'h'){ - if(yych == 'a') goto yy1116; + if(yych == 'a') goto yy1132; goto yy54; } else { if(yych <= 'i') goto yy123; @@ -15702,31 +16037,31 @@ yy1026: goto yy54; } } -yy1027: - YYDEBUG(1027, *YYCURSOR); +yy1043: + YYDEBUG(1043, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy1110; + if(yych == 'P') goto yy1126; if(yych <= 'T') goto yy54; - goto yy1109; + goto yy1125; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy1110; + goto yy1126; } else { - if(yych == 'u') goto yy1109; + if(yych == 'u') goto yy1125; goto yy54; } } -yy1028: - YYDEBUG(1028, *YYCURSOR); +yy1044: + YYDEBUG(1044, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ if(yych <= 'D'){ if(yych == 'A') goto yy131; goto yy54; } else { - if(yych <= 'E') goto yy1102; + if(yych <= 'E') goto yy1118; if(yych <= 'T') goto yy54; goto yy132; } @@ -15735,75 +16070,75 @@ yy1028: if(yych == 'a') goto yy131; goto yy54; } else { - if(yych <= 'e') goto yy1102; + if(yych <= 'e') goto yy1118; if(yych == 'u') goto yy132; goto yy54; } } -yy1029: - YYDEBUG(1029, *YYCURSOR); +yy1045: + YYDEBUG(1045, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy1097; - if(yych == 'c') goto yy1097; + if(yych == 'C') goto yy1113; + if(yych == 'c') goto yy1113; goto yy54; -yy1030: - YYDEBUG(1030, *YYCURSOR); +yy1046: + YYDEBUG(1046, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy1091; - if(yych == 'o') goto yy1091; + if(yych == 'O') goto yy1107; + if(yych == 'o') goto yy1107; goto yy54; -yy1031: - YYDEBUG(1031, *YYCURSOR); +yy1047: + YYDEBUG(1047, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'E'){ if(yych == 'A') goto yy119; if(yych <= 'D') goto yy54; - goto yy1084; + goto yy1100; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; goto yy119; } else { - if(yych == 'e') goto yy1084; + if(yych == 'e') goto yy1100; goto yy54; } } -yy1032: - YYDEBUG(1032, *YYCURSOR); +yy1048: + YYDEBUG(1048, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '0') goto yy1082; - if(yych <= '9') goto yy1083; + if(yych <= '0') goto yy1098; + if(yych <= '9') goto yy1099; goto yy67; -yy1033: - YYDEBUG(1033, *YYCURSOR); +yy1049: + YYDEBUG(1049, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '2') goto yy1049; - if(yych <= '9') goto yy1048; + if(yych <= '2') goto yy1065; + if(yych <= '9') goto yy1064; goto yy67; -yy1034: - YYDEBUG(1034, *YYCURSOR); +yy1050: + YYDEBUG(1050, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1048; + if(yych <= '9') goto yy1064; goto yy67; -yy1035: - YYDEBUG(1035, *YYCURSOR); +yy1051: + YYDEBUG(1051, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '5') goto yy1044; - if(yych <= '6') goto yy1045; + if(yych <= '5') goto yy1060; + if(yych <= '6') goto yy1061; if(yych <= '9') goto yy76; goto yy67; -yy1036: - YYDEBUG(1036, *YYCURSOR); +yy1052: + YYDEBUG(1052, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '5'){ if(yych <= '/') goto yy54; - if(yych <= '0') goto yy1037; - if(yych <= '4') goto yy1038; - goto yy1039; + if(yych <= '0') goto yy1053; + if(yych <= '4') goto yy1054; + goto yy1055; } else { if(yych <= 'E'){ if(yych <= 'D') goto yy54; @@ -15813,37 +16148,37 @@ yy1036: goto yy54; } } -yy1037: - YYDEBUG(1037, *YYCURSOR); +yy1053: + YYDEBUG(1053, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '0') goto yy54; - if(yych <= '9') goto yy1040; + if(yych <= '9') goto yy1056; goto yy54; -yy1038: - YYDEBUG(1038, *YYCURSOR); +yy1054: + YYDEBUG(1054, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1040; + if(yych <= '9') goto yy1056; goto yy54; -yy1039: - YYDEBUG(1039, *YYCURSOR); +yy1055: + YYDEBUG(1055, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '4') goto yy54; - goto yy1040; -yy1040: - YYDEBUG(1040, *YYCURSOR); + goto yy1056; +yy1056: + YYDEBUG(1056, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '/') goto yy1041; - if(yych <= '7') goto yy1042; - goto yy1041; -yy1041: - YYDEBUG(1041, *YYCURSOR); + if((yych = *YYCURSOR) <= '/') goto yy1057; + if(yych <= '7') goto yy1058; + goto yy1057; +yy1057: + YYDEBUG(1057, *YYCURSOR); -#line 1222 "resource/parse_date.re" +#line 1234 "resource/parse_date.re" { timelib_sll w, d; - + DEBUG_OUTPUT("isoweek"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -15858,18 +16193,18 @@ yy1041: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13744 "" -yy1042: - YYDEBUG(1042, *YYCURSOR); +#line 14045 "" +yy1058: + YYDEBUG(1058, *YYCURSOR); ++YYCURSOR; - goto yy1043; -yy1043: - YYDEBUG(1043, *YYCURSOR); + goto yy1059; +yy1059: + YYDEBUG(1059, *YYCURSOR); -#line 1203 "resource/parse_date.re" +#line 1215 "resource/parse_date.re" { timelib_sll w, d; - + DEBUG_OUTPUT("isoweekday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -15884,22 +16219,22 @@ yy1043: TIMELIB_DEINIT; return TIMELIB_ISO_WEEK; } -#line 13766 "" -yy1044: - YYDEBUG(1044, *YYCURSOR); +#line 14067 "" +yy1060: + YYDEBUG(1060, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1046; + if(yych <= '9') goto yy1062; goto yy67; -yy1045: - YYDEBUG(1045, *YYCURSOR); +yy1061: + YYDEBUG(1061, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '6') goto yy1046; + if(yych <= '6') goto yy1062; if(yych <= '9') goto yy76; goto yy67; -yy1046: - YYDEBUG(1046, *YYCURSOR); +yy1062: + YYDEBUG(1062, *YYCURSOR); yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); if(yybm[0+yych] & 32) { @@ -15909,21 +16244,21 @@ yy1046: if(yych <= 'G'){ if(yych <= 'C'){ if(yych == ' ') goto yy67; - goto yy1047; + goto yy1063; } else { - if(yych == 'E') goto yy1047; + if(yych == 'E') goto yy1063; if(yych <= 'F') goto yy67; - goto yy1047; + goto yy1063; } } else { if(yych <= 'R'){ if(yych <= 'H') goto yy67; if(yych == 'M') goto yy67; - goto yy1047; + goto yy1063; } else { if(yych <= 'T') goto yy67; if(yych == 'W') goto yy67; - goto yy1047; + goto yy1063; } } } else { @@ -15931,30 +16266,31 @@ yy1046: if(yych <= 'e'){ if(yych <= 'Y') goto yy67; if(yych == 'd') goto yy67; - goto yy1047; + goto yy1063; } else { - if(yych == 'g') goto yy1047; + if(yych == 'g') goto yy1063; if(yych <= 'h') goto yy67; - goto yy1047; + goto yy1063; } } else { if(yych <= 'v'){ if(yych <= 'm') goto yy67; - if(yych <= 'r') goto yy1047; + if(yych <= 'r') goto yy1063; if(yych <= 't') goto yy67; - goto yy1047; + goto yy1063; } else { - if(yych == 'x') goto yy1047; + if(yych == 'x') goto yy1063; if(yych <= 'y') goto yy67; - goto yy1047; + goto yy1063; } } } -yy1047: - YYDEBUG(1047, *YYCURSOR); +yy1063: + YYDEBUG(1063, *YYCURSOR); -#line 1191 "resource/parse_date.re" +#line 1202 "resource/parse_date.re" { + DEBUG_OUTPUT("pgydotd"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -15964,27 +16300,27 @@ yy1047: TIMELIB_DEINIT; return TIMELIB_PG_YEARDAY; } -#line 13838 "" -yy1048: - YYDEBUG(1048, *YYCURSOR); +#line 14140 "" +yy1064: + YYDEBUG(1064, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1046; + if(yych <= '9') goto yy1062; goto yy67; -yy1049: - YYDEBUG(1049, *YYCURSOR); +yy1065: + YYDEBUG(1065, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '2'){ if(yych <= '/') goto yy67; - if(yych >= '1') goto yy1051; - goto yy1050; + if(yych >= '1') goto yy1067; + goto yy1066; } else { - if(yych <= '3') goto yy1052; - if(yych <= '9') goto yy1046; + if(yych <= '3') goto yy1068; + if(yych <= '9') goto yy1062; goto yy67; } -yy1050: - YYDEBUG(1050, *YYCURSOR); +yy1066: + YYDEBUG(1066, *YYCURSOR); yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -16001,11 +16337,11 @@ yy1050: case '6': case '7': case '8': - case '9': goto yy1053; - default: goto yy1047; + case '9': goto yy1069; + default: goto yy1063; } -yy1051: - YYDEBUG(1051, *YYCURSOR); +yy1067: + YYDEBUG(1067, *YYCURSOR); yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -16022,11 +16358,11 @@ yy1051: case '6': case '7': case '8': - case '9': goto yy1053; - default: goto yy1047; + case '9': goto yy1069; + default: goto yy1063; } -yy1052: - YYDEBUG(1052, *YYCURSOR); +yy1068: + YYDEBUG(1068, *YYCURSOR); yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -16035,7 +16371,7 @@ yy1052: case 'T': case 'W': case 'Y': case 'd': case 'f': case 'h': case 'm': case 's': case 't': case 'w': case 'y': goto yy67; case '0': - case '1': goto yy1053; + case '1': goto yy1069; case '2': case '3': case '4': @@ -16044,10 +16380,10 @@ yy1052: case '7': case '8': case '9': goto yy76; - default: goto yy1047; + default: goto yy1063; } -yy1053: - YYDEBUG(1053, *YYCURSOR); +yy1069: + YYDEBUG(1069, *YYCURSOR); yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); if(yybm[0+yych] & 16) { @@ -16070,17 +16406,18 @@ yy1053: case 'H': case 'h': goto yy70; case 'M': case 'm': goto yy69; case 'S': case 's': goto yy68; - case 'T': goto yy1055; + case 'T': goto yy1071; case 'W': case 'w': goto yy72; case 'Y': case 'y': goto yy74; - case 't': goto yy1056; - default: goto yy1054; + case 't': goto yy1072; + default: goto yy1070; } -yy1054: - YYDEBUG(1054, *YYCURSOR); +yy1070: + YYDEBUG(1070, *YYCURSOR); -#line 1159 "resource/parse_date.re" +#line 1168 "resource/parse_date.re" { + DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -16089,17 +16426,17 @@ yy1054: TIMELIB_DEINIT; return TIMELIB_DATE_NOCOLON; } -#line 13945 "" -yy1055: - YYDEBUG(1055, *YYCURSOR); +#line 14248 "" +yy1071: + YYDEBUG(1071, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'H'){ if(yych <= '2'){ if(yych <= '/') goto yy54; - if(yych <= '1') goto yy1072; - goto yy1073; + if(yych <= '1') goto yy1088; + goto yy1089; } else { - if(yych <= '9') goto yy1074; + if(yych <= '9') goto yy1090; if(yych <= 'G') goto yy54; goto yy78; } @@ -16113,16 +16450,16 @@ yy1055: goto yy54; } } -yy1056: - YYDEBUG(1056, *YYCURSOR); +yy1072: + YYDEBUG(1072, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'H'){ if(yych <= '2'){ if(yych <= '/') goto yy54; - if(yych >= '2') goto yy1058; - goto yy1057; + if(yych >= '2') goto yy1074; + goto yy1073; } else { - if(yych <= '9') goto yy1059; + if(yych <= '9') goto yy1075; if(yych <= 'G') goto yy54; goto yy78; } @@ -16136,60 +16473,61 @@ yy1056: goto yy54; } } -yy1057: - YYDEBUG(1057, *YYCURSOR); +yy1073: + YYDEBUG(1073, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1066; - if(yych <= '9') goto yy1059; + if(yych <= '5') goto yy1082; + if(yych <= '9') goto yy1075; goto yy54; -yy1058: - YYDEBUG(1058, *YYCURSOR); +yy1074: + YYDEBUG(1074, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '3') goto yy1066; - if(yych <= '5') goto yy1060; + if(yych <= '3') goto yy1082; + if(yych <= '5') goto yy1076; goto yy54; -yy1059: - YYDEBUG(1059, *YYCURSOR); +yy1075: + YYDEBUG(1075, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '6') goto yy54; - goto yy1060; -yy1060: - YYDEBUG(1060, *YYCURSOR); + goto yy1076; +yy1076: + YYDEBUG(1076, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy1061; -yy1061: - YYDEBUG(1061, *YYCURSOR); + goto yy1077; +yy1077: + YYDEBUG(1077, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1062; - if(yych <= '6') goto yy1063; + if(yych <= '5') goto yy1078; + if(yych <= '6') goto yy1079; goto yy54; -yy1062: - YYDEBUG(1062, *YYCURSOR); +yy1078: + YYDEBUG(1078, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1064; + if(yych <= '9') goto yy1080; goto yy54; -yy1063: - YYDEBUG(1063, *YYCURSOR); +yy1079: + YYDEBUG(1079, *YYCURSOR); yych = *++YYCURSOR; if(yych != '0') goto yy54; - goto yy1064; -yy1064: - YYDEBUG(1064, *YYCURSOR); + goto yy1080; +yy1080: + YYDEBUG(1080, *YYCURSOR); ++YYCURSOR; - goto yy1065; -yy1065: - YYDEBUG(1065, *YYCURSOR); + goto yy1081; +yy1081: + YYDEBUG(1081, *YYCURSOR); -#line 1170 "resource/parse_date.re" +#line 1180 "resource/parse_date.re" { int tz_not_found; + DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -16207,625 +16545,628 @@ yy1065: TIMELIB_DEINIT; return TIMELIB_XMLRPC_SOAP; } -#line 14041 "" -yy1066: - YYDEBUG(1066, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1067; - if(yych <= '9') goto yy1061; - goto yy54; -yy1067: - YYDEBUG(1067, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1068; - if(yych <= '6') goto yy1069; - if(yych <= '9') goto yy1061; - goto yy54; -yy1068: - YYDEBUG(1068, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1070; - if(yych <= '6') goto yy1071; - if(yych <= '9') goto yy1064; - goto yy54; -yy1069: - YYDEBUG(1069, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '0') goto yy1070; - if(yych <= '5') goto yy1062; - if(yych <= '6') goto yy1063; - goto yy54; -yy1070: - YYDEBUG(1070, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy1065; - if(yych <= '9') goto yy1064; - goto yy1065; -yy1071: - YYDEBUG(1071, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == '0') goto yy1064; - goto yy1065; -yy1072: - YYDEBUG(1072, *YYCURSOR); +#line 14345 "" +yy1082: + YYDEBUG(1082, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1081; - if(yych <= '9') goto yy1074; - if(yych <= ':') goto yy1075; + if(yych <= '5') goto yy1083; + if(yych <= '9') goto yy1077; goto yy54; -yy1073: - YYDEBUG(1073, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '5'){ - if(yych <= '/') goto yy54; - if(yych <= '3') goto yy1081; - goto yy1060; - } else { - if(yych == ':') goto yy1075; - goto yy54; - } -yy1074: - YYDEBUG(1074, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1060; - if(yych != ':') goto yy54; - goto yy1075; -yy1075: - YYDEBUG(1075, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= '6') goto yy54; - goto yy1076; -yy1076: - YYDEBUG(1076, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= ':') goto yy54; - goto yy1077; -yy1077: - YYDEBUG(1077, *YYCURSOR); - yych = *++YYCURSOR; - if(yych != ':') goto yy54; - goto yy1078; -yy1078: - YYDEBUG(1078, *YYCURSOR); +yy1083: + YYDEBUG(1083, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1079; - if(yych <= '6') goto yy1080; + if(yych <= '5') goto yy1084; + if(yych <= '6') goto yy1085; + if(yych <= '9') goto yy1077; goto yy54; -yy1079: - YYDEBUG(1079, *YYCURSOR); +yy1084: + YYDEBUG(1084, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1064; - goto yy54; -yy1080: - YYDEBUG(1080, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == '0') goto yy1064; + if(yych <= '5') goto yy1086; + if(yych <= '6') goto yy1087; + if(yych <= '9') goto yy1080; goto yy54; -yy1081: - YYDEBUG(1081, *YYCURSOR); +yy1085: + YYDEBUG(1085, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1067; - if(yych <= '9') goto yy1061; - if(yych <= ':') goto yy1075; + if(yych <= '0') goto yy1086; + if(yych <= '5') goto yy1078; + if(yych <= '6') goto yy1079; goto yy54; -yy1082: - YYDEBUG(1082, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '/') goto yy67; - if(yych <= '0') goto yy76; - if(yych <= '9') goto yy1046; - goto yy67; -yy1083: - YYDEBUG(1083, *YYCURSOR); - yych = *++YYCURSOR; - if(yych <= '2'){ - if(yych <= '/') goto yy67; - if(yych <= '0') goto yy1050; - goto yy1051; - } else { - if(yych <= '3') goto yy1052; - if(yych <= '9') goto yy1046; - goto yy67; - } -yy1084: - YYDEBUG(1084, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'C') goto yy1085; - if(yych != 'c') goto yy54; - goto yy1085; -yy1085: - YYDEBUG(1085, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'E') goto yy1086; - if(yych != 'e') goto yy1021; - goto yy1086; yy1086: YYDEBUG(1086, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy1087; - if(yych != 'm') goto yy54; - goto yy1087; + if(yych <= '/') goto yy1081; + if(yych <= '9') goto yy1080; + goto yy1081; yy1087: YYDEBUG(1087, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1088; - if(yych != 'b') goto yy54; - goto yy1088; + if(yych == '0') goto yy1080; + goto yy1081; yy1088: YYDEBUG(1088, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1089; - if(yych != 'e') goto yy54; - goto yy1089; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1097; + if(yych <= '9') goto yy1090; + if(yych <= ':') goto yy1091; + goto yy54; yy1089: YYDEBUG(1089, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy1090; - if(yych != 'r') goto yy54; - goto yy1090; + if(yych <= '5'){ + if(yych <= '/') goto yy54; + if(yych <= '3') goto yy1097; + goto yy1076; + } else { + if(yych == ':') goto yy1091; + goto yy54; + } yy1090: YYDEBUG(1090, *YYCURSOR); yych = *++YYCURSOR; - goto yy1021; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1076; + if(yych != ':') goto yy54; + goto yy1091; yy1091: YYDEBUG(1091, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy1092; - if(yych != 'v') goto yy54; + if(yych <= '/') goto yy54; + if(yych >= '6') goto yy54; goto yy1092; yy1092: YYDEBUG(1092, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'E') goto yy1093; - if(yych != 'e') goto yy1021; + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych >= ':') goto yy54; goto yy1093; yy1093: YYDEBUG(1093, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy1094; - if(yych != 'm') goto yy54; + if(yych != ':') goto yy54; goto yy1094; yy1094: YYDEBUG(1094, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1095; - if(yych != 'b') goto yy54; - goto yy1095; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1095; + if(yych <= '6') goto yy1096; + goto yy54; yy1095: YYDEBUG(1095, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1096; - if(yych != 'e') goto yy54; - goto yy1096; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy1080; + goto yy54; yy1096: YYDEBUG(1096, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy1090; - if(yych == 'r') goto yy1090; + if(yych == '0') goto yy1080; goto yy54; yy1097: YYDEBUG(1097, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy1098; - if(yych != 't') goto yy54; - goto yy1098; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1083; + if(yych <= '9') goto yy1077; + if(yych <= ':') goto yy1091; + goto yy54; yy1098: YYDEBUG(1098, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'O') goto yy1099; - if(yych != 'o') goto yy1021; - goto yy1099; + yych = *++YYCURSOR; + if(yych <= '/') goto yy67; + if(yych <= '0') goto yy76; + if(yych <= '9') goto yy1062; + goto yy67; yy1099: YYDEBUG(1099, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1100; - if(yych != 'b') goto yy54; - goto yy1100; + if(yych <= '2'){ + if(yych <= '/') goto yy67; + if(yych <= '0') goto yy1066; + goto yy1067; + } else { + if(yych <= '3') goto yy1068; + if(yych <= '9') goto yy1062; + goto yy67; + } yy1100: YYDEBUG(1100, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1101; - if(yych != 'e') goto yy54; + if(yych == 'C') goto yy1101; + if(yych != 'c') goto yy54; goto yy1101; yy1101: YYDEBUG(1101, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'R') goto yy1090; - if(yych == 'r') goto yy1090; - goto yy54; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'E') goto yy1102; + if(yych != 'e') goto yy1037; + goto yy1102; yy1102: YYDEBUG(1102, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= 'P'){ - if(yych == 'C') goto yy134; - if(yych <= 'O') goto yy54; - goto yy1103; - } else { - if(yych <= 'c'){ - if(yych <= 'b') goto yy54; - goto yy134; - } else { - if(yych != 'p') goto yy54; - goto yy1103; - } - } + if(yych == 'M') goto yy1103; + if(yych != 'm') goto yy54; + goto yy1103; yy1103: YYDEBUG(1103, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy1104; - if(yych != 't') goto yy1021; + if(yych == 'B') goto yy1104; + if(yych != 'b') goto yy54; goto yy1104; yy1104: YYDEBUG(1104, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); + yych = *++YYCURSOR; if(yych == 'E') goto yy1105; - if(yych != 'e') goto yy1021; + if(yych != 'e') goto yy54; goto yy1105; yy1105: YYDEBUG(1105, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'M') goto yy1106; - if(yych != 'm') goto yy54; + if(yych == 'R') goto yy1106; + if(yych != 'r') goto yy54; goto yy1106; yy1106: YYDEBUG(1106, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1107; - if(yych != 'b') goto yy54; - goto yy1107; + goto yy1037; yy1107: YYDEBUG(1107, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1108; - if(yych != 'e') goto yy54; + if(yych == 'V') goto yy1108; + if(yych != 'v') goto yy54; goto yy1108; yy1108: YYDEBUG(1108, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'R') goto yy1090; - if(yych == 'r') goto yy1090; - goto yy54; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'E') goto yy1109; + if(yych != 'e') goto yy1037; + goto yy1109; yy1109: YYDEBUG(1109, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy1113; - if(yych == 'g') goto yy1113; - goto yy54; + if(yych == 'M') goto yy1110; + if(yych != 'm') goto yy54; + goto yy1110; yy1110: YYDEBUG(1110, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy1111; - if(yych != 'r') goto yy54; + if(yych == 'B') goto yy1111; + if(yych != 'b') goto yy54; goto yy1111; yy1111: YYDEBUG(1111, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'I') goto yy1112; - if(yych != 'i') goto yy1021; + yych = *++YYCURSOR; + if(yych == 'E') goto yy1112; + if(yych != 'e') goto yy54; goto yy1112; yy1112: YYDEBUG(1112, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'L') goto yy1090; - if(yych == 'l') goto yy1090; + if(yych == 'R') goto yy1106; + if(yych == 'r') goto yy1106; goto yy54; yy1113: YYDEBUG(1113, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'U') goto yy1114; - if(yych != 'u') goto yy1021; + yych = *++YYCURSOR; + if(yych == 'T') goto yy1114; + if(yych != 't') goto yy54; goto yy1114; yy1114: YYDEBUG(1114, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'S') goto yy1115; - if(yych != 's') goto yy54; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'O') goto yy1115; + if(yych != 'o') goto yy1037; goto yy1115; yy1115: YYDEBUG(1115, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy1090; - if(yych == 't') goto yy1090; - goto yy54; + if(yych == 'B') goto yy1116; + if(yych != 'b') goto yy54; + goto yy1116; yy1116: YYDEBUG(1116, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= 'Y'){ - if(yych == 'R') goto yy1117; - if(yych <= 'X') goto yy54; - goto yy1090; - } else { - if(yych <= 'r'){ - if(yych <= 'q') goto yy54; - goto yy1117; - } else { - if(yych == 'y') goto yy1090; - goto yy54; - } - } + if(yych == 'E') goto yy1117; + if(yych != 'e') goto yy54; + goto yy1117; yy1117: YYDEBUG(1117, *YYCURSOR); - yyaccept = 17; - yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'C') goto yy1118; - if(yych != 'c') goto yy1021; - goto yy1118; + yych = *++YYCURSOR; + if(yych == 'R') goto yy1106; + if(yych == 'r') goto yy1106; + goto yy54; yy1118: YYDEBUG(1118, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'H') goto yy1090; - if(yych == 'h') goto yy1090; - goto yy54; + if(yych <= 'P'){ + if(yych == 'C') goto yy134; + if(yych <= 'O') goto yy54; + goto yy1119; + } else { + if(yych <= 'c'){ + if(yych <= 'b') goto yy54; + goto yy134; + } else { + if(yych != 'p') goto yy54; + goto yy1119; + } + } yy1119: YYDEBUG(1119, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1120; - if(yych != 'b') goto yy54; + if(yych == 'T') goto yy1120; + if(yych != 't') goto yy1037; goto yy1120; yy1120: YYDEBUG(1120, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'R') goto yy1121; - if(yych != 'r') goto yy1021; + if(yych == 'E') goto yy1121; + if(yych != 'e') goto yy1037; goto yy1121; yy1121: YYDEBUG(1121, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'U') goto yy1122; - if(yych != 'u') goto yy54; + if(yych == 'M') goto yy1122; + if(yych != 'm') goto yy54; goto yy1122; yy1122: YYDEBUG(1122, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy1123; - if(yych != 'a') goto yy54; + if(yych == 'B') goto yy1123; + if(yych != 'b') goto yy54; goto yy1123; yy1123: YYDEBUG(1123, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy1124; - if(yych != 'r') goto yy54; + if(yych == 'E') goto yy1124; + if(yych != 'e') goto yy54; goto yy1124; yy1124: YYDEBUG(1124, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'Y') goto yy1090; - if(yych == 'y') goto yy1090; + if(yych == 'R') goto yy1106; + if(yych == 'r') goto yy1106; goto yy54; yy1125: YYDEBUG(1125, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= 'N'){ - if(yych == 'L') goto yy1132; - if(yych <= 'M') goto yy54; - goto yy1131; - } else { - if(yych <= 'l'){ - if(yych <= 'k') goto yy54; - goto yy1132; - } else { - if(yych == 'n') goto yy1131; - goto yy54; - } - } + if(yych == 'G') goto yy1129; + if(yych == 'g') goto yy1129; + goto yy54; yy1126: YYDEBUG(1126, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy1127; - if(yych != 'n') goto yy54; + if(yych == 'R') goto yy1127; + if(yych != 'r') goto yy54; goto yy1127; yy1127: YYDEBUG(1127, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); - if(yych == 'U') goto yy1128; - if(yych != 'u') goto yy1021; + if(yych == 'I') goto yy1128; + if(yych != 'i') goto yy1037; goto yy1128; yy1128: YYDEBUG(1128, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy1129; - if(yych != 'a') goto yy54; - goto yy1129; + if(yych == 'L') goto yy1106; + if(yych == 'l') goto yy1106; + goto yy54; yy1129: YYDEBUG(1129, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'R') goto yy1130; - if(yych != 'r') goto yy54; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'U') goto yy1130; + if(yych != 'u') goto yy1037; goto yy1130; yy1130: YYDEBUG(1130, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'Y') goto yy1090; - if(yych == 'y') goto yy1090; - goto yy54; + if(yych == 'S') goto yy1131; + if(yych != 's') goto yy54; + goto yy1131; yy1131: YYDEBUG(1131, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1090; - if(yych == 'e') goto yy1090; - goto yy1021; + if(yych == 'T') goto yy1106; + if(yych == 't') goto yy1106; + goto yy54; yy1132: YYDEBUG(1132, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'Y') goto yy1090; - if(yych == 'y') goto yy1090; - goto yy1021; + if(yych <= 'Y'){ + if(yych == 'R') goto yy1133; + if(yych <= 'X') goto yy54; + goto yy1106; + } else { + if(yych <= 'r'){ + if(yych <= 'q') goto yy54; + goto yy1133; + } else { + if(yych == 'y') goto yy1106; + goto yy54; + } + } yy1133: YYDEBUG(1133, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'I') goto yy1090; - goto yy1021; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'C') goto yy1134; + if(yych != 'c') goto yy1037; + goto yy1134; yy1134: YYDEBUG(1134, *YYCURSOR); yych = *++YYCURSOR; - if(yych != 'I') goto yy1021; - goto yy1135; + if(yych == 'H') goto yy1106; + if(yych == 'h') goto yy1106; + goto yy54; yy1135: YYDEBUG(1135, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'I') goto yy1090; - goto yy1021; + if(yych == 'B') goto yy1136; + if(yych != 'b') goto yy54; + goto yy1136; yy1136: YYDEBUG(1136, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'I') goto yy1090; - goto yy1021; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'R') goto yy1137; + if(yych != 'r') goto yy1037; + goto yy1137; yy1137: YYDEBUG(1137, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '0') goto yy1150; - if(yych <= '9') goto yy1149; - goto yy54; + if(yych == 'U') goto yy1138; + if(yych != 'u') goto yy54; + goto yy1138; yy1138: YYDEBUG(1138, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1148; - goto yy54; + if(yych == 'A') goto yy1139; + if(yych != 'a') goto yy54; + goto yy1139; yy1139: YYDEBUG(1139, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1146; - if(yych <= '6') goto yy1145; - goto yy54; + if(yych == 'R') goto yy1140; + if(yych != 'r') goto yy54; + goto yy1140; yy1140: YYDEBUG(1140, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1119; - if(yych == 'e') goto yy1119; + if(yych == 'Y') goto yy1106; + if(yych == 'y') goto yy1106; goto yy54; yy1141: YYDEBUG(1141, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy1116; - if(yych == 'a') goto yy1116; - goto yy54; + if(yych <= 'N'){ + if(yych == 'L') goto yy1148; + if(yych <= 'M') goto yy54; + goto yy1147; + } else { + if(yych <= 'l'){ + if(yych <= 'k') goto yy54; + goto yy1148; + } else { + if(yych == 'n') goto yy1147; + goto yy54; + } + } yy1142: YYDEBUG(1142, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1144; - if(yych == 'e') goto yy1144; - goto yy54; + if(yych == 'N') goto yy1143; + if(yych != 'n') goto yy54; + goto yy1143; yy1143: YYDEBUG(1143, *YYCURSOR); - yych = *++YYCURSOR; - if(yych == 'E') goto yy1084; - if(yych == 'e') goto yy1084; - goto yy54; + yyaccept = 17; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == 'U') goto yy1144; + if(yych != 'u') goto yy1037; + goto yy1144; yy1144: YYDEBUG(1144, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy1103; - if(yych == 'p') goto yy1103; - goto yy54; + if(yych == 'A') goto yy1145; + if(yych != 'a') goto yy54; + goto yy1145; yy1145: YYDEBUG(1145, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '6') goto yy1147; - goto yy54; + if(yych == 'R') goto yy1146; + if(yych != 'r') goto yy54; + goto yy1146; yy1146: YYDEBUG(1146, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= ':') goto yy54; - goto yy1147; + if(yych == 'Y') goto yy1106; + if(yych == 'y') goto yy1106; + goto yy54; yy1147: YYDEBUG(1147, *YYCURSOR); yych = *++YYCURSOR; - goto yy1047; + if(yych == 'E') goto yy1106; + if(yych == 'e') goto yy1106; + goto yy1037; yy1148: YYDEBUG(1148, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1147; - goto yy54; + if(yych == 'Y') goto yy1106; + if(yych == 'y') goto yy1106; + goto yy1037; yy1149: YYDEBUG(1149, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1147; - goto yy54; + if(yych == 'I') goto yy1106; + goto yy1037; yy1150: YYDEBUG(1150, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '0') goto yy54; - if(yych <= '9') goto yy1147; - goto yy54; + if(yych != 'I') goto yy1037; + goto yy1151; yy1151: YYDEBUG(1151, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '0') goto yy54; - if(yych <= '9') goto yy1153; - goto yy54; + if(yych == 'I') goto yy1106; + goto yy1037; yy1152: YYDEBUG(1152, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= '3') goto yy54; - goto yy1153; + if(yych == 'I') goto yy1106; + goto yy1037; yy1153: YYDEBUG(1153, *YYCURSOR); yych = *++YYCURSOR; - if(yych != '/') goto yy54; - goto yy1154; + if(yych <= '/') goto yy54; + if(yych <= '0') goto yy1166; + if(yych <= '9') goto yy1165; + goto yy54; yy1154: YYDEBUG(1154, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '0') goto yy1155; - if(yych <= '2') goto yy1156; - if(yych <= '3') goto yy1157; + if(yych <= '9') goto yy1164; goto yy54; yy1155: YYDEBUG(1155, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '0') goto yy54; - if(yych <= '9') goto yy1158; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1162; + if(yych <= '6') goto yy1161; goto yy54; yy1156: YYDEBUG(1156, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1158; + if(yych == 'E') goto yy1135; + if(yych == 'e') goto yy1135; goto yy54; yy1157: YYDEBUG(1157, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy54; - if(yych >= '2') goto yy54; - goto yy1158; + if(yych == 'A') goto yy1132; + if(yych == 'a') goto yy1132; + goto yy54; yy1158: YYDEBUG(1158, *YYCURSOR); - ++YYCURSOR; - if((yych = *YYCURSOR) == '/') goto yy1160; - goto yy1159; + yych = *++YYCURSOR; + if(yych == 'E') goto yy1160; + if(yych == 'e') goto yy1160; + goto yy54; yy1159: YYDEBUG(1159, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == 'E') goto yy1100; + if(yych == 'e') goto yy1100; + goto yy54; +yy1160: + YYDEBUG(1160, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == 'P') goto yy1119; + if(yych == 'p') goto yy1119; + goto yy54; +yy1161: + YYDEBUG(1161, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '6') goto yy1163; + goto yy54; +yy1162: + YYDEBUG(1162, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych >= ':') goto yy54; + goto yy1163; +yy1163: + YYDEBUG(1163, *YYCURSOR); + yych = *++YYCURSOR; + goto yy1063; +yy1164: + YYDEBUG(1164, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy1163; + goto yy54; +yy1165: + YYDEBUG(1165, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy1163; + goto yy54; +yy1166: + YYDEBUG(1166, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '0') goto yy54; + if(yych <= '9') goto yy1163; + goto yy54; +yy1167: + YYDEBUG(1167, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '.') goto yy54; + if(yych <= '/') goto yy1170; + if(yych <= '9') goto yy1169; + goto yy54; +yy1168: + YYDEBUG(1168, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '.') goto yy54; + if(yych <= '/') goto yy1170; + if(yych >= '3') goto yy54; + goto yy1169; +yy1169: + YYDEBUG(1169, *YYCURSOR); + yych = *++YYCURSOR; + if(yych != '/') goto yy54; + goto yy1170; +yy1170: + YYDEBUG(1170, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '0') goto yy1171; + if(yych <= '2') goto yy1172; + if(yych <= '3') goto yy1173; + goto yy54; +yy1171: + YYDEBUG(1171, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '0') goto yy54; + if(yych <= '9') goto yy1174; + goto yy54; +yy1172: + YYDEBUG(1172, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy1174; + goto yy54; +yy1173: + YYDEBUG(1173, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych >= '2') goto yy54; + goto yy1174; +yy1174: + YYDEBUG(1174, *YYCURSOR); + ++YYCURSOR; + if((yych = *YYCURSOR) == '/') goto yy1176; + goto yy1175; +yy1175: + YYDEBUG(1175, *YYCURSOR); -#line 1066 "resource/parse_date.re" +#line 1067 "resource/parse_date.re" { + DEBUG_OUTPUT("iso8601date | iso8601dateslash"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -16834,636 +17175,687 @@ yy1159: TIMELIB_DEINIT; return TIMELIB_ISO_DATE; } -#line 14480 "" -yy1160: - YYDEBUG(1160, *YYCURSOR); +#line 14787 "" +yy1176: + YYDEBUG(1176, *YYCURSOR); yych = *++YYCURSOR; - goto yy1159; -yy1161: - YYDEBUG(1161, *YYCURSOR); + goto yy1175; +yy1177: + YYDEBUG(1177, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'A') goto yy1225; + if(yych == 'A') goto yy1241; if(yych <= 'T') goto yy54; - goto yy1224; + goto yy1240; } else { if(yych <= 'a'){ if(yych <= '`') goto yy54; - goto yy1225; + goto yy1241; } else { - if(yych == 'u') goto yy1224; + if(yych == 'u') goto yy1240; goto yy54; } } -yy1162: - YYDEBUG(1162, *YYCURSOR); +yy1178: + YYDEBUG(1178, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1222; - if(yych == 'e') goto yy1222; + if(yych == 'E') goto yy1238; + if(yych == 'e') goto yy1238; goto yy54; -yy1163: - YYDEBUG(1163, *YYCURSOR); +yy1179: + YYDEBUG(1179, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'A') goto yy1219; - if(yych == 'a') goto yy1219; + if(yych == 'A') goto yy1235; + if(yych == 'a') goto yy1235; goto yy54; -yy1164: - YYDEBUG(1164, *YYCURSOR); +yy1180: + YYDEBUG(1180, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'U'){ - if(yych == 'P') goto yy1216; + if(yych == 'P') goto yy1232; if(yych <= 'T') goto yy54; - goto yy1215; + goto yy1231; } else { if(yych <= 'p'){ if(yych <= 'o') goto yy54; - goto yy1216; + goto yy1232; } else { - if(yych == 'u') goto yy1215; + if(yych == 'u') goto yy1231; goto yy54; } } -yy1165: - YYDEBUG(1165, *YYCURSOR); +yy1181: + YYDEBUG(1181, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1212; - if(yych == 'e') goto yy1212; + if(yych == 'E') goto yy1228; + if(yych == 'e') goto yy1228; goto yy54; -yy1166: - YYDEBUG(1166, *YYCURSOR); +yy1182: + YYDEBUG(1182, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy1210; - if(yych == 'c') goto yy1210; + if(yych == 'C') goto yy1226; + if(yych == 'c') goto yy1226; goto yy54; -yy1167: - YYDEBUG(1167, *YYCURSOR); +yy1183: + YYDEBUG(1183, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'O') goto yy1208; - if(yych == 'o') goto yy1208; + if(yych == 'O') goto yy1224; + if(yych == 'o') goto yy1224; goto yy54; -yy1168: - YYDEBUG(1168, *YYCURSOR); +yy1184: + YYDEBUG(1184, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'E') goto yy1206; - if(yych == 'e') goto yy1206; + if(yych == 'E') goto yy1222; + if(yych == 'e') goto yy1222; goto yy54; -yy1169: - YYDEBUG(1169, *YYCURSOR); +yy1185: + YYDEBUG(1185, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/'){ - if(yych == '-') goto yy921; + if(yych == '-') goto yy937; goto yy54; } else { - if(yych <= '0') goto yy884; - if(yych <= '9') goto yy1171; + if(yych <= '0') goto yy900; + if(yych <= '9') goto yy1187; goto yy54; } -yy1170: - YYDEBUG(1170, *YYCURSOR); +yy1186: + YYDEBUG(1186, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy921; + if(yych == '-') goto yy937; if(yych <= '/') goto yy54; if(yych >= '3') goto yy54; - goto yy1171; -yy1171: - YYDEBUG(1171, *YYCURSOR); + goto yy1187; +yy1187: + YYDEBUG(1187, *YYCURSOR); yych = *++YYCURSOR; if(yych != '-') goto yy54; - goto yy1172; -yy1172: - YYDEBUG(1172, *YYCURSOR); + goto yy1188; +yy1188: + YYDEBUG(1188, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '2'){ if(yych <= '/') goto yy54; - if(yych >= '1') goto yy1174; - goto yy1173; + if(yych >= '1') goto yy1190; + goto yy1189; } else { - if(yych <= '3') goto yy1175; - if(yych <= '9') goto yy925; + if(yych <= '3') goto yy1191; + if(yych <= '9') goto yy941; goto yy54; } -yy1173: - YYDEBUG(1173, *YYCURSOR); +yy1189: + YYDEBUG(1189, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy923; - if(yych <= '0') goto yy925; - if(yych <= '9') goto yy1176; - goto yy923; -yy1174: - YYDEBUG(1174, *YYCURSOR); + if(yych <= '/') goto yy939; + if(yych <= '0') goto yy941; + if(yych <= '9') goto yy1192; + goto yy939; +yy1190: + YYDEBUG(1190, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy923; - if(yych <= '9') goto yy1176; - goto yy923; -yy1175: - YYDEBUG(1175, *YYCURSOR); + if(yych <= '/') goto yy939; + if(yych <= '9') goto yy1192; + goto yy939; +yy1191: + YYDEBUG(1191, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy923; - if(yych >= '2') goto yy923; - goto yy1176; -yy1176: - YYDEBUG(1176, *YYCURSOR); + if(yych <= '/') goto yy939; + if(yych >= '2') goto yy939; + goto yy1192; +yy1192: + YYDEBUG(1192, *YYCURSOR); yyaccept = 18; yych = *(YYMARKER = ++YYCURSOR); - if(yych != 'T') goto yy1159; - goto yy1177; -yy1177: - YYDEBUG(1177, *YYCURSOR); + if(yych != 'T') goto yy1175; + goto yy1193; +yy1193: + YYDEBUG(1193, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '1') goto yy1178; - if(yych <= '2') goto yy1179; - if(yych <= '9') goto yy1180; + if(yych <= '1') goto yy1194; + if(yych <= '2') goto yy1195; + if(yych <= '9') goto yy1196; goto yy54; -yy1178: - YYDEBUG(1178, *YYCURSOR); +yy1194: + YYDEBUG(1194, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1187; - if(yych <= ':') goto yy1181; + if(yych <= '9') goto yy1203; + if(yych <= ':') goto yy1197; goto yy54; -yy1179: - YYDEBUG(1179, *YYCURSOR); +yy1195: + YYDEBUG(1195, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '3') goto yy1187; - if(yych == ':') goto yy1181; + if(yych <= '3') goto yy1203; + if(yych == ':') goto yy1197; goto yy54; -yy1180: - YYDEBUG(1180, *YYCURSOR); +yy1196: + YYDEBUG(1196, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy1181; -yy1181: - YYDEBUG(1181, *YYCURSOR); + goto yy1197; +yy1197: + YYDEBUG(1197, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '6') goto yy54; - goto yy1182; -yy1182: - YYDEBUG(1182, *YYCURSOR); + goto yy1198; +yy1198: + YYDEBUG(1198, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy1183; -yy1183: - YYDEBUG(1183, *YYCURSOR); + goto yy1199; +yy1199: + YYDEBUG(1199, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy1184; -yy1184: - YYDEBUG(1184, *YYCURSOR); + goto yy1200; +yy1200: + YYDEBUG(1200, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1185; - if(yych <= '6') goto yy1186; + if(yych <= '5') goto yy1201; + if(yych <= '6') goto yy1202; goto yy54; -yy1185: - YYDEBUG(1185, *YYCURSOR); +yy1201: + YYDEBUG(1201, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1064; + if(yych <= '9') goto yy1080; goto yy54; -yy1186: - YYDEBUG(1186, *YYCURSOR); +yy1202: + YYDEBUG(1202, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '0') goto yy1064; + if(yych == '0') goto yy1080; goto yy54; -yy1187: - YYDEBUG(1187, *YYCURSOR); +yy1203: + YYDEBUG(1203, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy1188; -yy1188: - YYDEBUG(1188, *YYCURSOR); + goto yy1204; +yy1204: + YYDEBUG(1204, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= '6') goto yy54; - goto yy1189; -yy1189: - YYDEBUG(1189, *YYCURSOR); + goto yy1205; +yy1205: + YYDEBUG(1205, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy1190; -yy1190: - YYDEBUG(1190, *YYCURSOR); + goto yy1206; +yy1206: + YYDEBUG(1206, *YYCURSOR); yych = *++YYCURSOR; if(yych != ':') goto yy54; - goto yy1191; -yy1191: - YYDEBUG(1191, *YYCURSOR); + goto yy1207; +yy1207: + YYDEBUG(1207, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1192; - if(yych <= '6') goto yy1193; + if(yych <= '5') goto yy1208; + if(yych <= '6') goto yy1209; goto yy54; -yy1192: - YYDEBUG(1192, *YYCURSOR); +yy1208: + YYDEBUG(1208, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1194; + if(yych <= '9') goto yy1210; goto yy54; -yy1193: - YYDEBUG(1193, *YYCURSOR); +yy1209: + YYDEBUG(1209, *YYCURSOR); yych = *++YYCURSOR; if(yych != '0') goto yy54; - goto yy1194; -yy1194: - YYDEBUG(1194, *YYCURSOR); + goto yy1210; +yy1210: + YYDEBUG(1210, *YYCURSOR); yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if(yych != '.') goto yy1065; - goto yy1195; -yy1195: - YYDEBUG(1195, *YYCURSOR); + if(yych != '.') goto yy1081; + goto yy1211; +yy1211: + YYDEBUG(1211, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; if(yych >= ':') goto yy54; - goto yy1196; -yy1196: - YYDEBUG(1196, *YYCURSOR); + goto yy1212; +yy1212: + YYDEBUG(1212, *YYCURSOR); ++YYCURSOR; if((YYLIMIT - YYCURSOR) < 6) YYFILL(6); yych = *YYCURSOR; - goto yy1197; -yy1197: - YYDEBUG(1197, *YYCURSOR); + goto yy1213; +yy1213: + YYDEBUG(1213, *YYCURSOR); if(yych <= ','){ if(yych != '+') goto yy54; - goto yy1198; + goto yy1214; } else { - if(yych <= '-') goto yy1198; + if(yych <= '-') goto yy1214; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1196; + if(yych <= '9') goto yy1212; goto yy54; } -yy1198: - YYDEBUG(1198, *YYCURSOR); +yy1214: + YYDEBUG(1214, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '1') goto yy1199; - if(yych <= '2') goto yy1200; - if(yych <= '9') goto yy1201; + if(yych <= '1') goto yy1215; + if(yych <= '2') goto yy1216; + if(yych <= '9') goto yy1217; goto yy54; -yy1199: - YYDEBUG(1199, *YYCURSOR); +yy1215: + YYDEBUG(1215, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy1065; - if(yych <= '5') goto yy1204; - if(yych <= '9') goto yy1201; - if(yych <= ':') goto yy1202; - goto yy1065; -yy1200: - YYDEBUG(1200, *YYCURSOR); + if(yych <= '/') goto yy1081; + if(yych <= '5') goto yy1220; + if(yych <= '9') goto yy1217; + if(yych <= ':') goto yy1218; + goto yy1081; +yy1216: + YYDEBUG(1216, *YYCURSOR); yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); if(yych <= '5'){ - if(yych <= '/') goto yy1065; - if(yych <= '3') goto yy1204; - goto yy1203; + if(yych <= '/') goto yy1081; + if(yych <= '3') goto yy1220; + goto yy1219; } else { - if(yych == ':') goto yy1202; - goto yy1065; + if(yych == ':') goto yy1218; + goto yy1081; } -yy1201: - YYDEBUG(1201, *YYCURSOR); +yy1217: + YYDEBUG(1217, *YYCURSOR); yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy1065; - if(yych <= '5') goto yy1203; - if(yych != ':') goto yy1065; - goto yy1202; -yy1202: - YYDEBUG(1202, *YYCURSOR); + if(yych <= '/') goto yy1081; + if(yych <= '5') goto yy1219; + if(yych != ':') goto yy1081; + goto yy1218; +yy1218: + YYDEBUG(1218, *YYCURSOR); yyaccept = 19; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy1065; - if(yych >= '6') goto yy1065; - goto yy1203; -yy1203: - YYDEBUG(1203, *YYCURSOR); + if(yych <= '/') goto yy1081; + if(yych >= '6') goto yy1081; + goto yy1219; +yy1219: + YYDEBUG(1219, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '9') goto yy1064; + if(yych <= '9') goto yy1080; goto yy54; -yy1204: - YYDEBUG(1204, *YYCURSOR); +yy1220: + YYDEBUG(1220, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy1065; - if(yych <= '5') goto yy1205; - if(yych <= '9') goto yy1064; - if(yych <= ':') goto yy1202; - goto yy1065; -yy1205: - YYDEBUG(1205, *YYCURSOR); + if(yych <= '/') goto yy1081; + if(yych <= '5') goto yy1221; + if(yych <= '9') goto yy1080; + if(yych <= ':') goto yy1218; + goto yy1081; +yy1221: + YYDEBUG(1221, *YYCURSOR); yych = *++YYCURSOR; - if(yych <= '/') goto yy1065; - if(yych <= '9') goto yy1064; - goto yy1065; -yy1206: - YYDEBUG(1206, *YYCURSOR); + if(yych <= '/') goto yy1081; + if(yych <= '9') goto yy1080; + goto yy1081; +yy1222: + YYDEBUG(1222, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'C') goto yy1207; + if(yych == 'C') goto yy1223; if(yych != 'c') goto yy54; - goto yy1207; -yy1207: - YYDEBUG(1207, *YYCURSOR); + goto yy1223; +yy1223: + YYDEBUG(1223, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'E') goto yy1086; - if(yych == 'e') goto yy1086; - goto yy1021; + if(yych <= 'E') goto yy1102; + if(yych == 'e') goto yy1102; + goto yy1037; } -yy1208: - YYDEBUG(1208, *YYCURSOR); +yy1224: + YYDEBUG(1224, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'V') goto yy1209; + if(yych == 'V') goto yy1225; if(yych != 'v') goto yy54; - goto yy1209; -yy1209: - YYDEBUG(1209, *YYCURSOR); + goto yy1225; +yy1225: + YYDEBUG(1225, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'E') goto yy1093; - if(yych == 'e') goto yy1093; - goto yy1021; + if(yych <= 'E') goto yy1109; + if(yych == 'e') goto yy1109; + goto yy1037; } -yy1210: - YYDEBUG(1210, *YYCURSOR); +yy1226: + YYDEBUG(1226, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'T') goto yy1211; + if(yych == 'T') goto yy1227; if(yych != 't') goto yy54; - goto yy1211; -yy1211: - YYDEBUG(1211, *YYCURSOR); + goto yy1227; +yy1227: + YYDEBUG(1227, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'N'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'O') goto yy1099; - if(yych == 'o') goto yy1099; - goto yy1021; + if(yych <= 'O') goto yy1115; + if(yych == 'o') goto yy1115; + goto yy1037; } -yy1212: - YYDEBUG(1212, *YYCURSOR); +yy1228: + YYDEBUG(1228, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'P') goto yy1213; + if(yych == 'P') goto yy1229; if(yych != 'p') goto yy54; - goto yy1213; -yy1213: - YYDEBUG(1213, *YYCURSOR); + goto yy1229; +yy1229: + YYDEBUG(1229, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'S'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'T') goto yy1214; - if(yych != 't') goto yy1021; - goto yy1214; + if(yych <= 'T') goto yy1230; + if(yych != 't') goto yy1037; + goto yy1230; } -yy1214: - YYDEBUG(1214, *YYCURSOR); +yy1230: + YYDEBUG(1230, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'E') goto yy1105; - if(yych == 'e') goto yy1105; - goto yy1021; + if(yych <= 'E') goto yy1121; + if(yych == 'e') goto yy1121; + goto yy1037; } -yy1215: - YYDEBUG(1215, *YYCURSOR); +yy1231: + YYDEBUG(1231, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'G') goto yy1218; - if(yych == 'g') goto yy1218; + if(yych == 'G') goto yy1234; + if(yych == 'g') goto yy1234; goto yy54; -yy1216: - YYDEBUG(1216, *YYCURSOR); +yy1232: + YYDEBUG(1232, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'R') goto yy1217; + if(yych == 'R') goto yy1233; if(yych != 'r') goto yy54; - goto yy1217; -yy1217: - YYDEBUG(1217, *YYCURSOR); + goto yy1233; +yy1233: + YYDEBUG(1233, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'H'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'I') goto yy1112; - if(yych == 'i') goto yy1112; - goto yy1021; + if(yych <= 'I') goto yy1128; + if(yych == 'i') goto yy1128; + goto yy1037; } -yy1218: - YYDEBUG(1218, *YYCURSOR); +yy1234: + YYDEBUG(1234, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'T'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'U') goto yy1114; - if(yych == 'u') goto yy1114; - goto yy1021; + if(yych <= 'U') goto yy1130; + if(yych == 'u') goto yy1130; + goto yy1037; } -yy1219: - YYDEBUG(1219, *YYCURSOR); +yy1235: + YYDEBUG(1235, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'Y'){ - if(yych == 'R') goto yy1220; + if(yych == 'R') goto yy1236; if(yych <= 'X') goto yy54; - goto yy1221; + goto yy1237; } else { if(yych <= 'r'){ if(yych <= 'q') goto yy54; - goto yy1220; + goto yy1236; } else { - if(yych == 'y') goto yy1221; + if(yych == 'y') goto yy1237; goto yy54; } } -yy1220: - YYDEBUG(1220, *YYCURSOR); +yy1236: + YYDEBUG(1236, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'B'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'C') goto yy1118; - if(yych == 'c') goto yy1118; - goto yy1021; + if(yych <= 'C') goto yy1134; + if(yych == 'c') goto yy1134; + goto yy1037; } -yy1221: - YYDEBUG(1221, *YYCURSOR); +yy1237: + YYDEBUG(1237, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '-') goto yy995; - goto yy1021; -yy1222: - YYDEBUG(1222, *YYCURSOR); + if(yych == '-') goto yy1011; + goto yy1037; +yy1238: + YYDEBUG(1238, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'B') goto yy1223; + if(yych == 'B') goto yy1239; if(yych != 'b') goto yy54; - goto yy1223; -yy1223: - YYDEBUG(1223, *YYCURSOR); + goto yy1239; +yy1239: + YYDEBUG(1239, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'Q'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'R') goto yy1121; - if(yych == 'r') goto yy1121; - goto yy1021; + if(yych <= 'R') goto yy1137; + if(yych == 'r') goto yy1137; + goto yy1037; } -yy1224: - YYDEBUG(1224, *YYCURSOR); +yy1240: + YYDEBUG(1240, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'N'){ - if(yych == 'L') goto yy1228; + if(yych == 'L') goto yy1244; if(yych <= 'M') goto yy54; - goto yy1227; + goto yy1243; } else { if(yych <= 'l'){ if(yych <= 'k') goto yy54; - goto yy1228; + goto yy1244; } else { - if(yych == 'n') goto yy1227; + if(yych == 'n') goto yy1243; goto yy54; } } -yy1225: - YYDEBUG(1225, *YYCURSOR); +yy1241: + YYDEBUG(1241, *YYCURSOR); yych = *++YYCURSOR; - if(yych == 'N') goto yy1226; + if(yych == 'N') goto yy1242; if(yych != 'n') goto yy54; - goto yy1226; -yy1226: - YYDEBUG(1226, *YYCURSOR); + goto yy1242; +yy1242: + YYDEBUG(1242, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'T'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'U') goto yy1128; - if(yych == 'u') goto yy1128; - goto yy1021; + if(yych <= 'U') goto yy1144; + if(yych == 'u') goto yy1144; + goto yy1037; } -yy1227: - YYDEBUG(1227, *YYCURSOR); +yy1243: + YYDEBUG(1243, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'D'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'E') goto yy1090; - if(yych == 'e') goto yy1090; - goto yy1021; + if(yych <= 'E') goto yy1106; + if(yych == 'e') goto yy1106; + goto yy1037; } -yy1228: - YYDEBUG(1228, *YYCURSOR); +yy1244: + YYDEBUG(1244, *YYCURSOR); yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); if(yych <= 'X'){ - if(yych == '-') goto yy995; - goto yy1021; + if(yych == '-') goto yy1011; + goto yy1037; } else { - if(yych <= 'Y') goto yy1090; - if(yych == 'y') goto yy1090; - goto yy1021; + if(yych <= 'Y') goto yy1106; + if(yych == 'y') goto yy1106; + goto yy1037; } -yy1229: - YYDEBUG(1229, *YYCURSOR); +yy1245: + YYDEBUG(1245, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'P'){ if(yych == 'C') goto yy134; if(yych <= 'O') goto yy54; - goto yy867; + goto yy873; } else { if(yych <= 'c'){ if(yych <= 'b') goto yy54; goto yy134; } else { - if(yych == 'p') goto yy867; + if(yych == 'p') goto yy873; goto yy54; } } -yy1230: - YYDEBUG(1230, *YYCURSOR); +yy1246: + YYDEBUG(1246, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '.'){ - if(yych <= ',') goto yy765; - if(yych <= '-') goto yy772; - goto yy775; + if(yych <= ',') goto yy776; + if(yych <= '-') goto yy783; + goto yy1247; } else { - if(yych <= '/') goto yy1231; - if(yych <= '9') goto yy983; - goto yy765; + if(yych <= '/') goto yy1248; + if(yych <= '9') goto yy999; + goto yy776; } -yy1231: - YYDEBUG(1231, *YYCURSOR); +yy1247: + YYDEBUG(1247, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy785; + if(yych <= '0') goto yy1249; + if(yych <= '1') goto yy1250; + if(yych <= '9') goto yy1251; + goto yy785; +yy1248: + YYDEBUG(1248, *YYCURSOR); yych = *++YYCURSOR; YYDEBUG(-1, yych); switch(yych){ - case 'A': case 'a': goto yy933; - case 'D': case 'd': goto yy937; - case 'F': case 'f': goto yy931; - case 'J': case 'j': goto yy930; - case 'M': case 'm': goto yy932; - case 'N': case 'n': goto yy936; - case 'O': case 'o': goto yy935; - case 'S': case 's': goto yy934; + case 'A': case 'a': goto yy949; + case 'D': case 'd': goto yy953; + case 'F': case 'f': goto yy947; + case 'J': case 'j': goto yy946; + case 'M': case 'm': goto yy948; + case 'N': case 'n': goto yy952; + case 'O': case 'o': goto yy951; + case 'S': case 's': goto yy950; default: goto yy54; } -yy1232: - YYDEBUG(1232, *YYCURSOR); +yy1249: + YYDEBUG(1249, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == '.') goto yy1252; + if(yych <= '/') goto yy54; + if(yych <= '9') goto yy1251; + goto yy54; +yy1250: + YYDEBUG(1250, *YYCURSOR); + yych = *++YYCURSOR; + if(yych == '.') goto yy1252; + if(yych <= '/') goto yy54; + if(yych >= '3') goto yy54; + goto yy1251; +yy1251: + YYDEBUG(1251, *YYCURSOR); + yych = *++YYCURSOR; + if(yych != '.') goto yy54; + goto yy1252; +yy1252: + YYDEBUG(1252, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych >= ':') goto yy54; + goto yy1253; +yy1253: + YYDEBUG(1253, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/') goto yy893; + if(yych <= '9') goto yy892; + goto yy893; +yy1254: + YYDEBUG(1254, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/'){ - if(yych <= ',') goto yy765; - if(yych <= '-') goto yy772; - if(yych <= '.') goto yy775; - goto yy1231; + if(yych <= ',') goto yy776; + if(yych <= '-') goto yy783; + if(yych >= '/') goto yy1248; + goto yy1255; } else { - if(yych <= '5') goto yy1234; - if(yych <= '9') goto yy983; - if(yych >= ';') goto yy765; - goto yy1233; + if(yych <= '5') goto yy1257; + if(yych <= '9') goto yy999; + if(yych <= ':') goto yy1256; + goto yy776; } -yy1233: - YYDEBUG(1233, *YYCURSOR); +yy1255: + YYDEBUG(1255, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '1'){ + if(yych <= '/') goto yy785; + if(yych <= '0') goto yy1279; + goto yy1280; + } else { + if(yych <= '5') goto yy1281; + if(yych <= '9') goto yy1282; + goto yy785; + } +yy1256: + YYDEBUG(1256, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1251; - if(yych <= '9') goto yy1252; + if(yych <= '5') goto yy1274; + if(yych <= '9') goto yy1275; goto yy54; -yy1234: - YYDEBUG(1234, *YYCURSOR); +yy1257: + YYDEBUG(1257, *YYCURSOR); yych = *++YYCURSOR; - if(yych == '-') goto yy984; + if(yych == '-') goto yy1000; if(yych <= '/') goto yy67; if(yych >= ':') goto yy67; - goto yy1235; -yy1235: - YYDEBUG(1235, *YYCURSOR); + goto yy1258; +yy1258: + YYDEBUG(1258, *YYCURSOR); yyaccept = 20; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17489,25 +17881,25 @@ yy1235: case 'Y': case 'a': case 'd': case 'f': case 'h': case 'j': case 'm': case 'n': case 'o': case 's': - case 't': case 'w': case 'y': goto yy1016; - case '-': goto yy1013; - case '.': goto yy1019; - case '/': goto yy1014; - case '0': goto yy1237; - case '1': goto yy1238; - case '2': goto yy1239; - case '3': goto yy1240; + case 't': case 'w': case 'y': goto yy1032; + case '-': goto yy1029; + case '.': goto yy1035; + case '/': goto yy1030; + case '0': goto yy1260; + case '1': goto yy1261; + case '2': goto yy1262; + case '3': goto yy1263; case '4': - case '5': goto yy1241; - case '6': goto yy1242; + case '5': goto yy1264; + case '6': goto yy1265; case '7': case '8': case '9': goto yy76; - case 'W': goto yy1036; - default: goto yy1236; + case 'W': goto yy1052; + default: goto yy1259; } -yy1236: - YYDEBUG(1236, *YYCURSOR); +yy1259: + YYDEBUG(1259, *YYCURSOR); #line 989 "resource/parse_date.re" { @@ -17530,50 +17922,50 @@ yy1236: TIMELIB_DEINIT; return TIMELIB_GNU_NOCOLON; } -#line 15020 "" -yy1237: - YYDEBUG(1237, *YYCURSOR); +#line 15364 "" +yy1260: + YYDEBUG(1260, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '0') goto yy1249; - if(yych <= '9') goto yy1250; + if(yych <= '0') goto yy1272; + if(yych <= '9') goto yy1273; goto yy67; -yy1238: - YYDEBUG(1238, *YYCURSOR); +yy1261: + YYDEBUG(1261, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '2') goto yy1248; - if(yych <= '9') goto yy1247; + if(yych <= '2') goto yy1271; + if(yych <= '9') goto yy1270; goto yy67; -yy1239: - YYDEBUG(1239, *YYCURSOR); +yy1262: + YYDEBUG(1262, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1247; + if(yych <= '9') goto yy1270; goto yy67; -yy1240: - YYDEBUG(1240, *YYCURSOR); +yy1263: + YYDEBUG(1263, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '5') goto yy1245; - if(yych <= '6') goto yy1246; - if(yych <= '9') goto yy1243; + if(yych <= '5') goto yy1268; + if(yych <= '6') goto yy1269; + if(yych <= '9') goto yy1266; goto yy67; -yy1241: - YYDEBUG(1241, *YYCURSOR); +yy1264: + YYDEBUG(1264, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '9') goto yy1243; + if(yych <= '9') goto yy1266; goto yy67; -yy1242: - YYDEBUG(1242, *YYCURSOR); +yy1265: + YYDEBUG(1265, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy67; - if(yych <= '0') goto yy1243; + if(yych <= '0') goto yy1266; if(yych <= '9') goto yy76; goto yy67; -yy1243: - YYDEBUG(1243, *YYCURSOR); +yy1266: + YYDEBUG(1266, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); if(yybm[0+yych] & 32) { @@ -17583,21 +17975,21 @@ yy1243: if(yych <= 'G'){ if(yych <= 'C'){ if(yych == ' ') goto yy67; - goto yy1244; + goto yy1267; } else { - if(yych == 'E') goto yy1244; + if(yych == 'E') goto yy1267; if(yych <= 'F') goto yy67; - goto yy1244; + goto yy1267; } } else { if(yych <= 'R'){ if(yych <= 'H') goto yy67; if(yych == 'M') goto yy67; - goto yy1244; + goto yy1267; } else { if(yych <= 'T') goto yy67; if(yych == 'W') goto yy67; - goto yy1244; + goto yy1267; } } } else { @@ -17605,27 +17997,27 @@ yy1243: if(yych <= 'e'){ if(yych <= 'Y') goto yy67; if(yych == 'd') goto yy67; - goto yy1244; + goto yy1267; } else { - if(yych == 'g') goto yy1244; + if(yych == 'g') goto yy1267; if(yych <= 'h') goto yy67; - goto yy1244; + goto yy1267; } } else { if(yych <= 'v'){ if(yych <= 'm') goto yy67; - if(yych <= 'r') goto yy1244; + if(yych <= 'r') goto yy1267; if(yych <= 't') goto yy67; - goto yy1244; + goto yy1267; } else { - if(yych == 'x') goto yy1244; + if(yych == 'x') goto yy1267; if(yych <= 'y') goto yy67; - goto yy1244; + goto yy1267; } } } -yy1244: - YYDEBUG(1244, *YYCURSOR); +yy1267: + YYDEBUG(1267, *YYCURSOR); #line 1034 "resource/parse_date.re" { @@ -17644,9 +18036,9 @@ yy1244: TIMELIB_DEINIT; return TIMELIB_ISO_NOCOLON; } -#line 15118 "" -yy1245: - YYDEBUG(1245, *YYCURSOR); +#line 15462 "" +yy1268: + YYDEBUG(1268, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17663,11 +18055,11 @@ yy1245: case '6': case '7': case '8': - case '9': goto yy1046; - default: goto yy1244; + case '9': goto yy1062; + default: goto yy1267; } -yy1246: - YYDEBUG(1246, *YYCURSOR); +yy1269: + YYDEBUG(1269, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17681,14 +18073,14 @@ yy1246: case '3': case '4': case '5': - case '6': goto yy1046; + case '6': goto yy1062; case '7': case '8': case '9': goto yy76; - default: goto yy1244; + default: goto yy1267; } -yy1247: - YYDEBUG(1247, *YYCURSOR); +yy1270: + YYDEBUG(1270, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17705,11 +18097,11 @@ yy1247: case '6': case '7': case '8': - case '9': goto yy1046; - default: goto yy1244; + case '9': goto yy1062; + default: goto yy1267; } -yy1248: - YYDEBUG(1248, *YYCURSOR); +yy1271: + YYDEBUG(1271, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17717,20 +18109,20 @@ yy1248: case ' ': case 'D': case 'F': case 'H': case 'M': case 'S': case 'T': case 'W': case 'Y': case 'd': case 'f': case 'h': case 'm': case 's': case 't': case 'w': case 'y': goto yy67; - case '0': goto yy1050; + case '0': goto yy1066; case '1': - case '2': goto yy1051; - case '3': goto yy1052; + case '2': goto yy1067; + case '3': goto yy1068; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1046; - default: goto yy1244; + case '9': goto yy1062; + default: goto yy1267; } -yy1249: - YYDEBUG(1249, *YYCURSOR); +yy1272: + YYDEBUG(1272, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17747,11 +18139,11 @@ yy1249: case '6': case '7': case '8': - case '9': goto yy1046; - default: goto yy1244; + case '9': goto yy1062; + default: goto yy1267; } -yy1250: - YYDEBUG(1250, *YYCURSOR); +yy1273: + YYDEBUG(1273, *YYCURSOR); yyaccept = 21; yych = *(YYMARKER = ++YYCURSOR); YYDEBUG(-1, yych); @@ -17759,102 +18151,187 @@ yy1250: case ' ': case 'D': case 'F': case 'H': case 'M': case 'S': case 'T': case 'W': case 'Y': case 'd': case 'f': case 'h': case 'm': case 's': case 't': case 'w': case 'y': goto yy67; - case '0': goto yy1050; + case '0': goto yy1066; case '1': - case '2': goto yy1051; - case '3': goto yy1052; + case '2': goto yy1067; + case '3': goto yy1068; case '4': case '5': case '6': case '7': case '8': - case '9': goto yy1046; - default: goto yy1244; + case '9': goto yy1062; + default: goto yy1267; } -yy1251: - YYDEBUG(1251, *YYCURSOR); +yy1274: + YYDEBUG(1274, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych <= '/') goto yy786; - if(yych <= '9') goto yy1252; - if(yych <= ':') goto yy1253; - goto yy786; -yy1252: - YYDEBUG(1252, *YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy1276; + goto yy797; + } else { + if(yych <= '9') goto yy1275; + if(yych <= ':') goto yy1276; + goto yy797; + } +yy1275: + YYDEBUG(1275, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych != ':') goto yy786; - goto yy1253; -yy1253: - YYDEBUG(1253, *YYCURSOR); + if(yych == '.') goto yy1276; + if(yych != ':') goto yy797; + goto yy1276; +yy1276: + YYDEBUG(1276, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/') goto yy54; - if(yych <= '5') goto yy1254; - if(yych <= '6') goto yy1255; - if(yych <= '9') goto yy791; + if(yych <= '5') goto yy1277; + if(yych <= '6') goto yy1278; + if(yych <= '9') goto yy802; goto yy54; -yy1254: - YYDEBUG(1254, *YYCURSOR); +yy1277: + YYDEBUG(1277, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '.') goto yy792; - if(yych <= '/') goto yy786; - if(yych <= '9') goto yy791; - goto yy786; -yy1255: - YYDEBUG(1255, *YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy802; + goto yy797; +yy1278: + YYDEBUG(1278, *YYCURSOR); yyaccept = 11; yych = *(YYMARKER = ++YYCURSOR); - if(yych == '.') goto yy792; - if(yych == '0') goto yy791; - goto yy786; -yy1256: - YYDEBUG(1256, *YYCURSOR); + if(yych == '.') goto yy803; + if(yych == '0') goto yy802; + goto yy797; +yy1279: + YYDEBUG(1279, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy1283; + goto yy797; + } else { + if(yych <= '9') goto yy1282; + if(yych <= ':') goto yy1276; + goto yy797; + } +yy1280: + YYDEBUG(1280, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy1283; + goto yy797; + } else { + if(yych <= '2') goto yy1282; + if(yych <= '9') goto yy1275; + if(yych <= ':') goto yy1276; + goto yy797; + } +yy1281: + YYDEBUG(1281, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych <= '/'){ + if(yych == '.') goto yy1283; + goto yy797; + } else { + if(yych <= '9') goto yy1275; + if(yych <= ':') goto yy1276; + goto yy797; + } +yy1282: + YYDEBUG(1282, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy1283; + if(yych == ':') goto yy1276; + goto yy797; +yy1283: + YYDEBUG(1283, *YYCURSOR); yych = *++YYCURSOR; + if(yych <= '/') goto yy54; + if(yych <= '5') goto yy1284; + if(yych <= '6') goto yy1285; + if(yych <= '9') goto yy891; + goto yy54; +yy1284: + YYDEBUG(1284, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy1286; + goto yy797; +yy1285: + YYDEBUG(1285, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); if(yych <= '/'){ - if(yych <= ',') goto yy765; - if(yych <= '-') goto yy772; - if(yych <= '.') goto yy775; - goto yy771; + if(yych == '.') goto yy803; + goto yy797; } else { - if(yych <= '5') goto yy1234; - if(yych <= '9') goto yy983; - if(yych <= ':') goto yy784; - goto yy765; + if(yych <= '0') goto yy1286; + if(yych <= '9') goto yy892; + goto yy797; } -yy1257: - YYDEBUG(1257, *YYCURSOR); +yy1286: + YYDEBUG(1286, *YYCURSOR); + yyaccept = 11; + yych = *(YYMARKER = ++YYCURSOR); + if(yych == '.') goto yy803; + if(yych <= '/') goto yy797; + if(yych <= '9') goto yy894; + goto yy797; +yy1287: + YYDEBUG(1287, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '/'){ - if(yych <= ',') goto yy765; - if(yych <= '-') goto yy772; - if(yych <= '.') goto yy775; - goto yy771; + if(yych <= ',') goto yy776; + if(yych <= '-') goto yy783; + if(yych <= '.') goto yy786; + goto yy782; } else { - if(yych <= '5') goto yy1234; - if(yych <= '9') goto yy983; - if(yych <= ':') goto yy1233; - goto yy765; + if(yych <= '5') goto yy1257; + if(yych <= '9') goto yy999; + if(yych <= ':') goto yy795; + goto yy776; } -yy1258: - YYDEBUG(1258, *YYCURSOR); +yy1288: + YYDEBUG(1288, *YYCURSOR); + yych = *++YYCURSOR; + if(yych <= '/'){ + if(yych <= ',') goto yy776; + if(yych <= '-') goto yy783; + if(yych <= '.') goto yy1255; + goto yy782; + } else { + if(yych <= '5') goto yy1257; + if(yych <= '9') goto yy999; + if(yych <= ':') goto yy1256; + goto yy776; + } +yy1289: + YYDEBUG(1289, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '0') goto yy54; if(yych >= ':') goto yy54; - goto yy1259; -yy1259: - YYDEBUG(1259, *YYCURSOR); + goto yy1290; +yy1290: + YYDEBUG(1290, *YYCURSOR); ++YYCURSOR; if(YYLIMIT == YYCURSOR) YYFILL(1); yych = *YYCURSOR; - goto yy1260; -yy1260: - YYDEBUG(1260, *YYCURSOR); - if(yych <= '/') goto yy1261; - if(yych <= '9') goto yy1259; - goto yy1261; -yy1261: - YYDEBUG(1261, *YYCURSOR); + goto yy1291; +yy1291: + YYDEBUG(1291, *YYCURSOR); + if(yych <= '/') goto yy1292; + if(yych <= '9') goto yy1290; + goto yy1292; +yy1292: + YYDEBUG(1292, *YYCURSOR); #line 926 "resource/parse_date.re" { @@ -17879,9 +18356,9 @@ yy1261: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 15313 "" -yy1262: - YYDEBUG(1262, *YYCURSOR); +#line 15726 "" +yy1293: + YYDEBUG(1293, *YYCURSOR); yych = *++YYCURSOR; if(yych <= 'c'){ if(yych <= '@') goto yy3; @@ -17891,64 +18368,64 @@ yy1262: } else { if(yych <= 'l'){ if(yych >= 'e') goto yy49; - goto yy1263; + goto yy1294; } else { - if(yych <= 'm') goto yy1264; + if(yych <= 'm') goto yy1295; if(yych <= 'z') goto yy49; goto yy3; } } -yy1263: - YYDEBUG(1263, *YYCURSOR); +yy1294: + YYDEBUG(1294, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '`'){ if(yych <= '@') goto yy3; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych <= 'a') goto yy1271; + if(yych <= 'a') goto yy1302; if(yych <= 'z') goto yy50; goto yy3; } -yy1264: - YYDEBUG(1264, *YYCURSOR); +yy1295: + YYDEBUG(1295, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '`'){ if(yych <= '@') goto yy3; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 'o') goto yy1265; + if(yych == 'o') goto yy1296; if(yych <= 'z') goto yy50; goto yy3; } -yy1265: - YYDEBUG(1265, *YYCURSOR); +yy1296: + YYDEBUG(1296, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych != 'r') goto yy3; - goto yy1266; -yy1266: - YYDEBUG(1266, *YYCURSOR); + goto yy1297; +yy1297: + YYDEBUG(1297, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'r') goto yy54; - goto yy1267; -yy1267: - YYDEBUG(1267, *YYCURSOR); + goto yy1298; +yy1298: + YYDEBUG(1298, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'o') goto yy54; - goto yy1268; -yy1268: - YYDEBUG(1268, *YYCURSOR); + goto yy1299; +yy1299: + YYDEBUG(1299, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'w') goto yy54; - goto yy1269; -yy1269: - YYDEBUG(1269, *YYCURSOR); + goto yy1300; +yy1300: + YYDEBUG(1300, *YYCURSOR); ++YYCURSOR; - goto yy1270; -yy1270: - YYDEBUG(1270, *YYCURSOR); + goto yy1301; +yy1301: + YYDEBUG(1301, *YYCURSOR); #line 914 "resource/parse_date.re" { @@ -17961,18 +18438,18 @@ yy1270: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 15377 "" -yy1271: - YYDEBUG(1271, *YYCURSOR); +#line 15790 "" +yy1302: + YYDEBUG(1302, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'y') goto yy3; - goto yy1272; -yy1272: - YYDEBUG(1272, *YYCURSOR); + goto yy1303; +yy1303: + YYDEBUG(1303, *YYCURSOR); ++YYCURSOR; - goto yy1273; -yy1273: - YYDEBUG(1273, *YYCURSOR); + goto yy1304; +yy1304: + YYDEBUG(1304, *YYCURSOR); #line 904 "resource/parse_date.re" { @@ -17983,39 +18460,39 @@ yy1273: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 15393 "" -yy1274: - YYDEBUG(1274, *YYCURSOR); +#line 15806 "" +yy1305: + YYDEBUG(1305, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '`'){ if(yych <= 'U'){ if(yych <= '@') goto yy3; goto yy49; } else { - if(yych <= 'V') goto yy601; + if(yych <= 'V') goto yy612; if(yych <= 'Z') goto yy49; goto yy3; } } else { if(yych <= 'v'){ if(yych <= 'u') goto yy49; - goto yy601; + goto yy612; } else { - if(yych <= 'w') goto yy1275; + if(yych <= 'w') goto yy1306; if(yych <= 'z') goto yy49; goto yy3; } } -yy1275: - YYDEBUG(1275, *YYCURSOR); +yy1306: + YYDEBUG(1306, *YYCURSOR); ++YYCURSOR; - if((yych = *YYCURSOR) <= '@') goto yy1276; + if((yych = *YYCURSOR) <= '@') goto yy1307; if(yych <= 'Z') goto yy50; - if(yych <= '`') goto yy1276; + if(yych <= '`') goto yy1307; if(yych <= 'z') goto yy50; - goto yy1276; -yy1276: - YYDEBUG(1276, *YYCURSOR); + goto yy1307; +yy1307: + YYDEBUG(1307, *YYCURSOR); #line 895 "resource/parse_date.re" { @@ -18025,63 +18502,63 @@ yy1276: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 15429 "" -yy1277: - YYDEBUG(1277, *YYCURSOR); +#line 15842 "" +yy1308: + YYDEBUG(1308, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '`'){ if(yych <= '@') goto yy3; if(yych <= 'Z') goto yy49; goto yy3; } else { - if(yych == 's') goto yy1278; + if(yych == 's') goto yy1309; if(yych <= 'z') goto yy49; goto yy3; } -yy1278: - YYDEBUG(1278, *YYCURSOR); +yy1309: + YYDEBUG(1309, *YYCURSOR); yych = *++YYCURSOR; if(yych <= '`'){ if(yych <= '@') goto yy3; if(yych <= 'Z') goto yy50; goto yy3; } else { - if(yych == 't') goto yy1279; + if(yych == 't') goto yy1310; if(yych <= 'z') goto yy50; goto yy3; } -yy1279: - YYDEBUG(1279, *YYCURSOR); +yy1310: + YYDEBUG(1310, *YYCURSOR); yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); if(yych != 'e') goto yy3; - goto yy1280; -yy1280: - YYDEBUG(1280, *YYCURSOR); + goto yy1311; +yy1311: + YYDEBUG(1311, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'r') goto yy54; - goto yy1281; -yy1281: - YYDEBUG(1281, *YYCURSOR); + goto yy1312; +yy1312: + YYDEBUG(1312, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'd') goto yy54; - goto yy1282; -yy1282: - YYDEBUG(1282, *YYCURSOR); + goto yy1313; +yy1313: + YYDEBUG(1313, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'a') goto yy54; - goto yy1283; -yy1283: - YYDEBUG(1283, *YYCURSOR); + goto yy1314; +yy1314: + YYDEBUG(1314, *YYCURSOR); yych = *++YYCURSOR; if(yych != 'y') goto yy54; - goto yy1284; -yy1284: - YYDEBUG(1284, *YYCURSOR); + goto yy1315; +yy1315: + YYDEBUG(1315, *YYCURSOR); ++YYCURSOR; - goto yy1285; -yy1285: - YYDEBUG(1285, *YYCURSOR); + goto yy1316; +yy1316: + YYDEBUG(1316, *YYCURSOR); #line 883 "resource/parse_date.re" { @@ -18094,14 +18571,14 @@ yy1285: TIMELIB_DEINIT; return TIMELIB_RELATIVE; } -#line 15480 "" +#line 15893 "" } } -#line 1411 "resource/parse_date.re" +#line 1431 "resource/parse_date.re" } -#define YYMAXFILL 25 +#define YYMAXFILL 26 timelib_time* timelib_strtotime(char *s, int *errors) @@ -18110,10 +18587,10 @@ timelib_time* timelib_strtotime(char *s, int *errors) int t; memset(&in, 0, sizeof(in)); - in.str = malloc(strlen(s) + 25); - memset(in.str, 0, strlen(s) + 25); + in.str = malloc(strlen(s) + YYMAXFILL); + memset(in.str, 0, strlen(s) + YYMAXFILL); memcpy(in.str, s, strlen(s)); - in.lim = in.str + strlen(s) + 25; + in.lim = in.str + strlen(s) + YYMAXFILL; in.cur = in.str; in.time = timelib_time_ctor(); in.time->y = -1; @@ -18129,7 +18606,9 @@ timelib_time* timelib_strtotime(char *s, int *errors) do { t = scan(&in); -/* printf("%d\n", t); */ +#ifdef DEBUG_PARSER + printf("%d\n", t); +#endif } while(t != EOI); free(in.str); diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re index 7575741c24..a589ea4089 100644 --- a/ext/date/lib/parse_date.re +++ b/ext/date/lib/parse_date.re @@ -812,15 +812,15 @@ monthroman = "I" | "II" | "III" | "IV" | "V" | "VI" | "VII" | "VIII" | "IX" | "X monthtext = monthfull | monthabbr | monthroman; /* Time formats */ -timeshort12 = hour12[:]minutelz space? meridian; -timelong12 = hour12[:]minute[:]secondlz space? meridian; +timeshort12 = hour12[:.]minutelz space? meridian; +timelong12 = hour12[:.]minute[:.]secondlz space? meridian; -timeshort24 = hour24[:]minute; -timelong24 = hour24[:]minute[:]second; -iso8601long = hour24 [:] minute [:] second frac; +timeshort24 = hour24[:.]minute; +timelong24 = hour24[:.]minute[:.]second; +iso8601long = hour24 [:.] minute [:.] second frac; /* iso8601shorttz = hour24 [:] minutelz space? (tzcorrection | tz); */ -iso8601normtz = hour24 [:] minute [:] secondlz space? (tzcorrection | tz); +iso8601normtz = hour24 [:.] minute [:.] secondlz space? (tzcorrection | tz); /* iso8601longtz = hour24 [:] minute [:] secondlz frac space? (tzcorrection | tz); */ gnunocolon = hour24lz minutelz; @@ -831,7 +831,7 @@ iso8601nocolon = hour24lz minutelz secondlz; /* Date formats */ americanshort = month "/" day; american = month "/" day "/" year; -iso8601dateslash = year4 "/" monthlz "/" daylz "/"?; +iso8601dateslash = year4 "/" month "/" daylz "/"?; gnudateshort = year "-" month "-" day; iso8601date = year4 "-" monthlz "-" daylz; pointeddate = day "." month "." year; @@ -969,7 +969,7 @@ relativetext = (reltextnumber space? reltextunit)+; TIMELIB_HAVE_TIME(); s->time->h = timelib_get_nr((char **) &ptr, 2); s->time->i = timelib_get_nr((char **) &ptr, 2); - if (*ptr == ':') { + if (*ptr == ':' || *ptr == '.') { s->time->s = timelib_get_nr((char **) &ptr, 2); if (*ptr == '.') { @@ -1050,6 +1050,7 @@ relativetext = (reltextnumber space? reltextunit)+; americanshort | american { + DEBUG_OUTPUT("americanshort | american"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_nr((char **) &ptr, 2); @@ -1064,6 +1065,7 @@ relativetext = (reltextnumber space? reltextunit)+; iso8601date | iso8601dateslash { + DEBUG_OUTPUT("iso8601date | iso8601dateslash"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1075,6 +1077,7 @@ relativetext = (reltextnumber space? reltextunit)+; gnudateshort { + DEBUG_OUTPUT("gnudateshort"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1087,6 +1090,7 @@ relativetext = (reltextnumber space? reltextunit)+; datefull { + DEBUG_OUTPUT("datefull"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1099,6 +1103,7 @@ relativetext = (reltextnumber space? reltextunit)+; pointeddate { + DEBUG_OUTPUT("pointed date"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1111,6 +1116,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenoday { + DEBUG_OUTPUT("datenoday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1123,6 +1129,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenodayrev { + DEBUG_OUTPUT("datenodayrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1135,6 +1142,7 @@ relativetext = (reltextnumber space? reltextunit)+; datetextual | datenoyear { + DEBUG_OUTPUT("datetextual | datenoyear"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1147,6 +1155,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenoyearrev { + DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1157,6 +1166,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenocolon { + DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1169,6 +1179,7 @@ relativetext = (reltextnumber space? reltextunit)+; xmlrpc | xmlrpcnocolon | soap | wddx { int tz_not_found; + DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -1189,6 +1200,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgydotd { + DEBUG_OUTPUT("pgydotd"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1202,7 +1214,7 @@ relativetext = (reltextnumber space? reltextunit)+; isoweekday { timelib_sll w, d; - + DEBUG_OUTPUT("isoweekday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -1221,7 +1233,7 @@ relativetext = (reltextnumber space? reltextunit)+; isoweek { timelib_sll w, d; - + DEBUG_OUTPUT("isoweek"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -1239,6 +1251,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgtextshort { + DEBUG_OUTPUT("pgtextshort"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1251,6 +1264,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgtextreverse { + DEBUG_OUTPUT("pgtextreverse"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1264,6 +1278,7 @@ relativetext = (reltextnumber space? reltextunit)+; clf { int tz_not_found; + DEBUG_OUTPUT("clf"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -1281,6 +1296,7 @@ relativetext = (reltextnumber space? reltextunit)+; year4 { + DEBUG_OUTPUT("year4"); TIMELIB_INIT; s->time->y = timelib_get_nr((char **) &ptr, 4); TIMELIB_DEINIT; @@ -1289,6 +1305,7 @@ relativetext = (reltextnumber space? reltextunit)+; ago { + DEBUG_OUTPUT("ago"); TIMELIB_INIT; s->time->relative.y = 0 - s->time->relative.y; s->time->relative.m = 0 - s->time->relative.m; @@ -1304,7 +1321,7 @@ relativetext = (reltextnumber space? reltextunit)+; relativetext { timelib_sll i; - + DEBUG_OUTPUT("relativetext"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -1320,7 +1337,7 @@ relativetext = (reltextnumber space? reltextunit)+; dayfull { const timelib_relunit* relunit; - + DEBUG_OUTPUT("dayfull"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); TIMELIB_HAVE_WEEKDAY_RELATIVE(); @@ -1335,12 +1352,14 @@ relativetext = (reltextnumber space? reltextunit)+; dayabbr { + DEBUG_OUTPUT("dayabbr"); goto std; } tzcorrection | tz { int tz_not_found; + DEBUG_OUTPUT("tzcorrection | tz"); TIMELIB_INIT; s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found); s->errors += tz_not_found; @@ -1351,6 +1370,7 @@ relativetext = (reltextnumber space? reltextunit)+; dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz { int tz_not_found; + DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1378,7 +1398,7 @@ relativetext = (reltextnumber space? reltextunit)+; relative { timelib_ull i; - + DEBUG_OUTPUT("relative"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -1419,10 +1439,10 @@ timelib_time* timelib_strtotime(char *s, int *errors) int t; memset(&in, 0, sizeof(in)); - in.str = malloc(strlen(s) + 25); - memset(in.str, 0, strlen(s) + 25); + in.str = malloc(strlen(s) + YYMAXFILL); + memset(in.str, 0, strlen(s) + YYMAXFILL); memcpy(in.str, s, strlen(s)); - in.lim = in.str + strlen(s) + 25; + in.lim = in.str + strlen(s) + YYMAXFILL; in.cur = in.str; in.time = timelib_time_ctor(); in.time->y = -1; @@ -1438,7 +1458,9 @@ timelib_time* timelib_strtotime(char *s, int *errors) do { t = scan(&in); -/* printf("%d\n", t); */ +#ifdef DEBUG_PARSER + printf("%d\n", t); +#endif } while(t != EOI); free(in.str); diff --git a/ext/date/lib/resource/parse_date.re b/ext/date/lib/resource/parse_date.re index 7575741c24..a589ea4089 100644 --- a/ext/date/lib/resource/parse_date.re +++ b/ext/date/lib/resource/parse_date.re @@ -812,15 +812,15 @@ monthroman = "I" | "II" | "III" | "IV" | "V" | "VI" | "VII" | "VIII" | "IX" | "X monthtext = monthfull | monthabbr | monthroman; /* Time formats */ -timeshort12 = hour12[:]minutelz space? meridian; -timelong12 = hour12[:]minute[:]secondlz space? meridian; +timeshort12 = hour12[:.]minutelz space? meridian; +timelong12 = hour12[:.]minute[:.]secondlz space? meridian; -timeshort24 = hour24[:]minute; -timelong24 = hour24[:]minute[:]second; -iso8601long = hour24 [:] minute [:] second frac; +timeshort24 = hour24[:.]minute; +timelong24 = hour24[:.]minute[:.]second; +iso8601long = hour24 [:.] minute [:.] second frac; /* iso8601shorttz = hour24 [:] minutelz space? (tzcorrection | tz); */ -iso8601normtz = hour24 [:] minute [:] secondlz space? (tzcorrection | tz); +iso8601normtz = hour24 [:.] minute [:.] secondlz space? (tzcorrection | tz); /* iso8601longtz = hour24 [:] minute [:] secondlz frac space? (tzcorrection | tz); */ gnunocolon = hour24lz minutelz; @@ -831,7 +831,7 @@ iso8601nocolon = hour24lz minutelz secondlz; /* Date formats */ americanshort = month "/" day; american = month "/" day "/" year; -iso8601dateslash = year4 "/" monthlz "/" daylz "/"?; +iso8601dateslash = year4 "/" month "/" daylz "/"?; gnudateshort = year "-" month "-" day; iso8601date = year4 "-" monthlz "-" daylz; pointeddate = day "." month "." year; @@ -969,7 +969,7 @@ relativetext = (reltextnumber space? reltextunit)+; TIMELIB_HAVE_TIME(); s->time->h = timelib_get_nr((char **) &ptr, 2); s->time->i = timelib_get_nr((char **) &ptr, 2); - if (*ptr == ':') { + if (*ptr == ':' || *ptr == '.') { s->time->s = timelib_get_nr((char **) &ptr, 2); if (*ptr == '.') { @@ -1050,6 +1050,7 @@ relativetext = (reltextnumber space? reltextunit)+; americanshort | american { + DEBUG_OUTPUT("americanshort | american"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_nr((char **) &ptr, 2); @@ -1064,6 +1065,7 @@ relativetext = (reltextnumber space? reltextunit)+; iso8601date | iso8601dateslash { + DEBUG_OUTPUT("iso8601date | iso8601dateslash"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1075,6 +1077,7 @@ relativetext = (reltextnumber space? reltextunit)+; gnudateshort { + DEBUG_OUTPUT("gnudateshort"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1087,6 +1090,7 @@ relativetext = (reltextnumber space? reltextunit)+; datefull { + DEBUG_OUTPUT("datefull"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1099,6 +1103,7 @@ relativetext = (reltextnumber space? reltextunit)+; pointeddate { + DEBUG_OUTPUT("pointed date"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1111,6 +1116,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenoday { + DEBUG_OUTPUT("datenoday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1123,6 +1129,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenodayrev { + DEBUG_OUTPUT("datenodayrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1135,6 +1142,7 @@ relativetext = (reltextnumber space? reltextunit)+; datetextual | datenoyear { + DEBUG_OUTPUT("datetextual | datenoyear"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1147,6 +1155,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenoyearrev { + DEBUG_OUTPUT("datenoyearrev"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->d = timelib_get_nr((char **) &ptr, 2); @@ -1157,6 +1166,7 @@ relativetext = (reltextnumber space? reltextunit)+; datenocolon { + DEBUG_OUTPUT("datenocolon"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1169,6 +1179,7 @@ relativetext = (reltextnumber space? reltextunit)+; xmlrpc | xmlrpcnocolon | soap | wddx { int tz_not_found; + DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -1189,6 +1200,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgydotd { + DEBUG_OUTPUT("pgydotd"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1202,7 +1214,7 @@ relativetext = (reltextnumber space? reltextunit)+; isoweekday { timelib_sll w, d; - + DEBUG_OUTPUT("isoweekday"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -1221,7 +1233,7 @@ relativetext = (reltextnumber space? reltextunit)+; isoweek { timelib_sll w, d; - + DEBUG_OUTPUT("isoweek"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); TIMELIB_HAVE_RELATIVE(); @@ -1239,6 +1251,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgtextshort { + DEBUG_OUTPUT("pgtextshort"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1251,6 +1264,7 @@ relativetext = (reltextnumber space? reltextunit)+; pgtextreverse { + DEBUG_OUTPUT("pgtextreverse"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->y = timelib_get_nr((char **) &ptr, 4); @@ -1264,6 +1278,7 @@ relativetext = (reltextnumber space? reltextunit)+; clf { int tz_not_found; + DEBUG_OUTPUT("clf"); TIMELIB_INIT; TIMELIB_HAVE_TIME(); TIMELIB_HAVE_DATE(); @@ -1281,6 +1296,7 @@ relativetext = (reltextnumber space? reltextunit)+; year4 { + DEBUG_OUTPUT("year4"); TIMELIB_INIT; s->time->y = timelib_get_nr((char **) &ptr, 4); TIMELIB_DEINIT; @@ -1289,6 +1305,7 @@ relativetext = (reltextnumber space? reltextunit)+; ago { + DEBUG_OUTPUT("ago"); TIMELIB_INIT; s->time->relative.y = 0 - s->time->relative.y; s->time->relative.m = 0 - s->time->relative.m; @@ -1304,7 +1321,7 @@ relativetext = (reltextnumber space? reltextunit)+; relativetext { timelib_sll i; - + DEBUG_OUTPUT("relativetext"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -1320,7 +1337,7 @@ relativetext = (reltextnumber space? reltextunit)+; dayfull { const timelib_relunit* relunit; - + DEBUG_OUTPUT("dayfull"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); TIMELIB_HAVE_WEEKDAY_RELATIVE(); @@ -1335,12 +1352,14 @@ relativetext = (reltextnumber space? reltextunit)+; dayabbr { + DEBUG_OUTPUT("dayabbr"); goto std; } tzcorrection | tz { int tz_not_found; + DEBUG_OUTPUT("tzcorrection | tz"); TIMELIB_INIT; s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found); s->errors += tz_not_found; @@ -1351,6 +1370,7 @@ relativetext = (reltextnumber space? reltextunit)+; dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz { int tz_not_found; + DEBUG_OUTPUT("dateshortwithtimeshort | dateshortwithtimelong | dateshortwithtimelongtz"); TIMELIB_INIT; TIMELIB_HAVE_DATE(); s->time->m = timelib_get_month((char **) &ptr); @@ -1378,7 +1398,7 @@ relativetext = (reltextnumber space? reltextunit)+; relative { timelib_ull i; - + DEBUG_OUTPUT("relative"); TIMELIB_INIT; TIMELIB_HAVE_RELATIVE(); @@ -1419,10 +1439,10 @@ timelib_time* timelib_strtotime(char *s, int *errors) int t; memset(&in, 0, sizeof(in)); - in.str = malloc(strlen(s) + 25); - memset(in.str, 0, strlen(s) + 25); + in.str = malloc(strlen(s) + YYMAXFILL); + memset(in.str, 0, strlen(s) + YYMAXFILL); memcpy(in.str, s, strlen(s)); - in.lim = in.str + strlen(s) + 25; + in.lim = in.str + strlen(s) + YYMAXFILL; in.cur = in.str; in.time = timelib_time_ctor(); in.time->y = -1; @@ -1438,7 +1458,9 @@ timelib_time* timelib_strtotime(char *s, int *errors) do { t = scan(&in); -/* printf("%d\n", t); */ +#ifdef DEBUG_PARSER + printf("%d\n", t); +#endif } while(t != EOI); free(in.str); diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 16e6ce806d..86cbe8d0dd 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -27,6 +27,7 @@ #include "php_date.h" #include "lib/timelib.h" #include +#include /* {{{ Function table */ function_entry date_functions[] = { @@ -50,6 +51,7 @@ function_entry date_functions[] = { /* Advanced Interface */ PHP_FE(date_create, NULL) PHP_FE(date_format, NULL) + PHP_FE(date_format_locale, NULL) PHP_FE(date_modify, NULL) PHP_FE(date_timezone_get, NULL) PHP_FE(date_timezone_set, NULL) @@ -328,6 +330,9 @@ static char *day_short_names[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; +static char *am_pm_lower_names[] = { "am", "pm" }; +static char *am_pm_upper_names[] = { "AM", "PM" }; + static char *english_suffix(timelib_sll number) { if (number >= 10 && number <= 19) { @@ -344,18 +349,113 @@ static char *english_suffix(timelib_sll number) /* }}} */ /* {{{ date_format - (gm)date helper */ -static char *date_format(char *format, int format_len, timelib_time *t, int localtime) + +typedef struct { + int day_shortname_lengths[7]; + int day_fullname_lengths[7]; + int month_shortname_lengths[12]; + int month_fullname_lengths[12]; + int am_pm_lenghts[2]; + + char* day_shortname[7]; + char* day_fullname[7]; + char* month_shortname[12]; + char* month_fullname[12]; + char* am_pm_name[2]; +} php_locale_data; + +static const UChar sLongPat [] = { 0x004D, 0x004D, 0x004D, 0x004D, 0x0020, + 0x0079, 0x0079, 0x0079, 0x0079 }; + + +#define DATE_LOC_READ(type, var, cor) \ + count = udat_countSymbols(fmt, (type)); \ + for (i = 0 - (cor); i < count; i++) { \ + array[i] = (UChar *) malloc(sizeof(UChar) * 15); \ + \ + status = U_ZERO_ERROR; \ + j = udat_getSymbols(fmt, (type), i, array[i], 15, &status); \ + \ + tmp->var[i + (cor)] = array[i]; \ + } + +static php_locale_data* date_get_locale_data(char *locale) +{ + php_locale_data *tmp = malloc(sizeof(php_locale_data)); + UDateFormat *fmt; + UErrorCode status = 0; + int32_t count, i, j; + UChar *array[15]; + UChar *pat = sLongPat; + int32_t len = 9; + + fmt = udat_open(UDAT_IGNORE,UDAT_IGNORE, locale, NULL, 0, pat, len, &status); + + DATE_LOC_READ(UDAT_WEEKDAYS, day_fullname, -1); + DATE_LOC_READ(UDAT_SHORT_WEEKDAYS, day_shortname, -1); + DATE_LOC_READ(UDAT_MONTHS, month_fullname, 0); + DATE_LOC_READ(UDAT_SHORT_MONTHS, month_shortname, 0); + DATE_LOC_READ(UDAT_AM_PMS, am_pm_name, 0); + + udat_close(fmt); + + return tmp; +} + +static void date_free_locale_data(php_locale_data *data) +{ + int i; + for (i = 0; i < 7; ++i) { + free(data->day_shortname[i]); + free(data->day_fullname[i]); + } + for (i = 0; i < 12; ++i) { + free(data->month_shortname[i]); + free(data->month_fullname[i]); + } + free(data->am_pm_name[0]); + free(data->am_pm_name[1]); + free(data); +} + +static inline int date_spprintf(char **str, size_t size TSRMLS_DC, const char *format, ...) +{ + int c; + va_list ap; + + va_start(ap, format); + + if (UG(unicode)) { + c = vuspprintf(str, size, format, ap); + } else { + c = vspprintf(str, size, format, ap); + } + va_end(ap); + return c; +} + +#define dayname_short(s,l) l ? loc_dat->day_shortname[s] : day_short_names[s] +#define dayname_full(s,l) l ? loc_dat->day_fullname[s] : day_full_names[s] +#define monthname_short(s,l) l ? loc_dat->month_shortname[s] : mon_short_names[s] +#define monthname_full(s,l) l ? loc_dat->month_fullname[s] : mon_full_names[s] +#define am_pm_lower_full(s,l) l ? loc_dat->am_pm_name[s] : am_pm_lower_names[s] +#define am_pm_upper_full(s,l) l ? loc_dat->am_pm_name[s] : am_pm_upper_names[s] + +static char *date_format(char *format, int format_len, int *return_len, timelib_time *t, int localtime, int localized) { smart_str string = {0}; - int i; - char buffer[33]; + int i, no_free, length; + char *buffer; timelib_time_offset *offset; timelib_sll isoweek, isoyear; + php_locale_data *loc_dat; if (!format_len) { return estrdup(""); } + loc_dat = date_get_locale_data(UG(default_locale)); + if (localtime) { if (t->zone_type == TIMELIB_ZONETYPE_ABBR) { offset = timelib_time_offset_ctor(); @@ -377,61 +477,61 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca offset = timelib_get_time_zone_info(t->sse, t->tz_info); } } - buffer[32] = '\0'; timelib_isoweek_from_date(t->y, t->m, t->d, &isoweek, &isoyear); for (i = 0; i < format_len; i++) { + no_free = 0; switch (format[i]) { /* day */ - case 'd': snprintf(buffer, 32, "%02d", (int) t->d); break; - case 'D': snprintf(buffer, 32, "%s", day_short_names[timelib_day_of_week(t->y, t->m, t->d)]); break; - case 'j': snprintf(buffer, 32, "%d", (int) t->d); break; - case 'l': snprintf(buffer, 32, "%s", day_full_names[timelib_day_of_week(t->y, t->m, t->d)]); break; - case 'S': snprintf(buffer, 32, "%s", english_suffix(t->d)); break; - case 'w': snprintf(buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break; - case 'z': snprintf(buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break; + case 'd': length = date_spprintf(&buffer, 32, "%02d", (int) t->d); break; + case 'D': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, dayname_short(timelib_day_of_week(t->y, t->m, t->d), localized)); break; + case 'j': length = date_spprintf(&buffer, 32, "%d", (int) t->d); break; + case 'l': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, dayname_full(timelib_day_of_week(t->y, t->m, t->d), localized)); break; + case 'S': length = date_spprintf(&buffer, 32, "%s", english_suffix(t->d)); break; + case 'w': length = date_spprintf(&buffer, 32, "%d", (int) timelib_day_of_week(t->y, t->m, t->d)); break; + case 'z': length = date_spprintf(&buffer, 32, "%d", (int) timelib_day_of_year(t->y, t->m, t->d)); break; /* week */ - case 'W': snprintf(buffer, 32, "%d", (int) isoweek); break; /* iso weeknr */ - case 'o': snprintf(buffer, 32, "%d", (int) isoyear); break; /* iso year */ + case 'W': length = date_spprintf(&buffer, 32, "%d", (int) isoweek); break; /* iso weeknr */ + case 'o': length = date_spprintf(&buffer, 32, "%d", (int) isoyear); break; /* iso year */ /* month */ - case 'F': snprintf(buffer, 32, "%s", mon_full_names[t->m - 1]); break; - case 'm': snprintf(buffer, 32, "%02d", (int) t->m); break; - case 'M': snprintf(buffer, 32, "%s", mon_short_names[t->m - 1]); break; - case 'n': snprintf(buffer, 32, "%d", (int) t->m); break; - case 't': snprintf(buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break; + case 'F': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, monthname_full(t->m - 1, localized)); break; + case 'm': length = date_spprintf(&buffer, 32, "%02d", (int) t->m); break; + case 'M': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, monthname_short(t->m - 1, localized)); break; + case 'n': length = date_spprintf(&buffer, 32, "%d", (int) t->m); break; + case 't': length = date_spprintf(&buffer, 32, "%d", (int) timelib_days_in_month(t->y, t->m)); break; /* year */ - case 'L': snprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break; - case 'y': snprintf(buffer, 32, "%02d", (int) t->y % 100); break; - case 'Y': snprintf(buffer, 32, "%04d", (int) t->y); break; + case 'L': length = date_spprintf(&buffer, 32, "%d", timelib_is_leap((int) t->y)); break; + case 'y': length = date_spprintf(&buffer, 32, "%02d", (int) t->y % 100); break; + case 'Y': length = date_spprintf(&buffer, 32, "%04d", (int) t->y); break; /* time */ - case 'a': snprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break; - case 'A': snprintf(buffer, 32, "%s", t->h >= 12 ? "PM" : "AM"); break; - case 'B': snprintf(buffer, 32, "[B unimplemented]"); break; - case 'g': snprintf(buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break; - case 'G': snprintf(buffer, 32, "%d", (int) t->h); break; - case 'h': snprintf(buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break; - case 'H': snprintf(buffer, 32, "%02d", (int) t->h); break; - case 'i': snprintf(buffer, 32, "%02d", (int) t->i); break; - case 's': snprintf(buffer, 32, "%02d", (int) t->s); break; + case 'a': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, am_pm_lower_full(t->h >= 12 ? 1 : 0, localized)); break; + case 'A': length = date_spprintf(&buffer, 32, "%R", localized ? IS_UNICODE : IS_STRING, am_pm_upper_full(t->h >= 12 ? 1 : 0, localized)); break; + case 'B': length = date_spprintf(&buffer, 32, "[B unimplemented]"); break; + case 'g': length = date_spprintf(&buffer, 32, "%d", (t->h % 12) ? (int) t->h % 12 : 12); break; + case 'G': length = date_spprintf(&buffer, 32, "%d", (int) t->h); break; + case 'h': length = date_spprintf(&buffer, 32, "%02d", (t->h % 12) ? (int) t->h % 12 : 12); break; + case 'H': length = date_spprintf(&buffer, 32, "%02d", (int) t->h); break; + case 'i': length = date_spprintf(&buffer, 32, "%02d", (int) t->i); break; + case 's': length = date_spprintf(&buffer, 32, "%02d", (int) t->s); break; /* timezone */ - case 'I': snprintf(buffer, 32, "%d", localtime ? offset->is_dst : 0); break; - case 'O': snprintf(buffer, 32, "%c%02d%02d", + case 'I': length = date_spprintf(&buffer, 32, "%d", localtime ? offset->is_dst : 0); break; + case 'O': length = date_spprintf(&buffer, 32, "%c%02d%02d", localtime ? ((offset->offset < 0) ? '-' : '+') : '+', localtime ? abs(offset->offset / 3600) : 0, localtime ? abs((offset->offset % 3600) / 60) : 0 ); break; - case 'T': snprintf(buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break; - case 'e': snprintf(buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break; - case 'Z': snprintf(buffer, 32, "%d", localtime ? offset->offset : 0); break; + case 'T': length = date_spprintf(&buffer, 32, "%s", localtime ? offset->abbr : "GMT"); break; + case 'e': length = date_spprintf(&buffer, 32, "%s", localtime ? t->tz_info->name : "UTC"); break; + case 'Z': length = date_spprintf(&buffer, 32, "%d", localtime ? offset->offset : 0); break; /* full date/time */ - case 'c': snprintf(buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", + case 'c': length = date_spprintf(&buffer, 32, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", (int) t->y, (int) t->m, (int) t->d, (int) t->h, (int) t->i, (int) t->s, localtime ? ((offset->offset < 0) ? '-' : '+') : '+', @@ -439,7 +539,7 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca localtime ? abs((offset->offset % 3600) / 60) : 0 ); break; - case 'r': snprintf(buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d", + case 'r': length = date_spprintf(&buffer, 32, "%3s, %02d %3s %04d %02d:%02d:%02d %c%02d%02d", day_short_names[timelib_day_of_week(t->y, t->m, t->d)], (int) t->d, mon_short_names[t->m - 1], (int) t->y, (int) t->h, (int) t->i, (int) t->s, @@ -448,22 +548,31 @@ static char *date_format(char *format, int format_len, timelib_time *t, int loca localtime ? abs((offset->offset % 3600) / 60) : 0 ); break; - case 'U': snprintf(buffer, 32, "%lld", (timelib_sll) t->sse); break; + case 'U': length = date_spprintf(&buffer, 32, "%lld", (timelib_sll) t->sse); break; - case '\\': if (i < format_len) i++; buffer[0] = format[i]; buffer[1] = '\0'; break; + case '\\': if (i < format_len) i++; length = date_spprintf(&buffer, 32, "%c", format[i]); break; - default: buffer[0] = format[i]; buffer[1] = '\0'; + default: length = date_spprintf(&buffer, 32, "%c", format[i]); + break; + } + smart_str_appendl(&string, buffer, length); + if (!no_free) { + efree(buffer); } - smart_str_appends(&string, buffer); - buffer[0] = '\0'; } smart_str_0(&string); + date_free_locale_data(loc_dat); if (localtime) { timelib_time_offset_dtor(offset); } + if (UG(unicode)) { + *return_len = string.len / 2; + } else { + *return_len = string.len; + } return string.c; } @@ -488,7 +597,8 @@ PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localt { timelib_time *t; timelib_tzinfo *tzi; - char *string; + char *string; + int return_len; t = timelib_time_ctor(); @@ -500,7 +610,7 @@ PHPAPI char *php_format_date(char *format, int format_len, time_t ts, int localt timelib_unixtime2gmt(t, ts); } - string = date_format(format, format_len, t, localtime); + string = date_format(format, format_len, &return_len, t, localtime, 0); if (localtime) { timelib_tzinfo_dtor(tzi); @@ -1055,14 +1165,39 @@ PHP_FUNCTION(date_format) { zval *object; php_date_obj *dateobj; - char *format; - int format_len; + char *format, *str; + int format_len, length; + + if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_date, &format, &format_len) == FAILURE) { + RETURN_FALSE; + } + dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); + str = date_format(format, format_len, &length, dateobj->time, dateobj->time->is_localtime, 0); + if (UG(unicode)) { + RETURN_UNICODEL((UChar*) str, length, 0); + } else { + RETURN_STRINGL(str, length, 0); + } +} + +PHP_FUNCTION(date_format_locale) +{ + zval *object; + php_date_obj *dateobj; + char *format, *str; + int format_len, length; if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, date_ce_date, &format, &format_len) == FAILURE) { RETURN_FALSE; } dateobj = (php_date_obj *) zend_object_store_get_object(object TSRMLS_CC); - RETURN_STRING(date_format(format, format_len, dateobj->time, dateobj->time->is_localtime), 0); + + str = date_format(format, format_len, &length, dateobj->time, dateobj->time->is_localtime, 1); + if (UG(unicode)) { + RETURN_UNICODEL((UChar*)str, length, 0); + } else { + RETURN_STRINGL(str, length, 0); + } } PHP_FUNCTION(date_modify) diff --git a/ext/date/php_date.h b/ext/date/php_date.h index 87c2311e7c..a9c8dcf37b 100644 --- a/ext/date/php_date.h +++ b/ext/date/php_date.h @@ -46,6 +46,7 @@ PHP_FUNCTION(getdate); /* Advanced Interface */ PHP_FUNCTION(date_create); PHP_FUNCTION(date_format); +PHP_FUNCTION(date_format_locale); PHP_FUNCTION(date_modify); PHP_FUNCTION(date_timezone_get); PHP_FUNCTION(date_timezone_set); diff --git a/ext/date/tests/bug34087.phpt b/ext/date/tests/bug34087.phpt new file mode 100644 index 0000000000..3736afa375 --- /dev/null +++ b/ext/date/tests/bug34087.phpt @@ -0,0 +1,10 @@ +--TEST-- +Bug #34087 (strtotime() does not work with date format "Y/m/d") +--FILE-- + +--EXPECT-- +Y/m/d: 1123804800 +Y-m-d: 1123804800 -- cgit v1.2.1