Touch + manual fix for re2c bug where it forgets {} in static int scan()

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index ac7f14d8a2948e8b84b1d1d5c445be46fd5211d1..9cd5a8d754809780d724c6ce01f728dfe7f5881a 100644 (file)
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.7.dev on Tue Jun 14 22:27:50 2005 */
+/* Generated by re2c 0.9.7 on Wed Jun 15 02:15:30 2005 */
 #line 1 "parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -25,6 +25,11 @@
 #include <string.h>
 #include "datetime.h"
 
+#ifdef PHP_WIN32
+#define strcasecmp stricmp
+#define strtoll(s, f, b) _atoi64(s)
+#endif
+
 #define TIMELIB_SECOND  1
 #define TIMELIB_MINUTE  2
 #define TIMELIB_HOUR    3
@@ -115,14 +120,14 @@ typedef unsigned char uchar;
 #include "timelib_structs.h"
 
 typedef struct timelib_elems {
-       uint c;   /* Number of elements */
+       unsigned int c;   /* Number of elements */
        char **v; /* Values */
 } timelib_elems;
 
 typedef struct Scanner {
        int    fd;
        uchar  *lim, *str, *ptr, *cur, *tok, *pos;
-       uint   line, len;
+       unsigned int   line, len;
 
        struct timelib_time *time;
 } Scanner;
@@ -367,7 +372,7 @@ static char* timelib_ltrim(char *s)
 #if 0
 uchar *fill(Scanner *s, uchar *cursor){
        if(!s->eof){
-               uint cnt = s->tok - s->bot;
+               unsigned int cnt = s->tok - s->bot;
                if(cnt){
                        memcpy(s->bot, s->tok, s->lim - s->tok);
                        s->tok = s->bot;
@@ -736,8 +741,8 @@ static int scan(Scanner *s)
 std:
        s->tok = cursor;
        s->len = 0;
-#line 839 "parse_date.re"
-
+#line 844 "parse_date.re"
+{
 
        static unsigned char yybm[] = {
          0,   0,   0,   0,   0,   0,   0,   0, 
@@ -774,7 +779,7 @@ std:
          0,   0,   0,   0,   0,   0,   0,   0, 
        };
 
-#line 778 "<stdout>"
+#line 40 "<stdout>"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -852,14 +857,14 @@ yy2:
 yy3:
        YYDEBUG(3, *YYCURSOR);
 
-#line 1257 "parse_date.re"
+#line 1262 "parse_date.re"
 {
                TIMELIB_INIT;
                s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst, s->time);
                TIMELIB_DEINIT;
                return TIMELIB_TIMEZONE;
        }
-#line 856 "<stdout>"
+#line 118 "<stdout>"
 yy4:
        YYDEBUG(4, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -928,12 +933,12 @@ yy6:
 yy7:
        YYDEBUG(7, *YYCURSOR);
 
-#line 1317 "parse_date.re"
+#line 1322 "parse_date.re"
 {
                printf("unexpected character: #%d, %c\n", *s->tok, *s->tok);
                goto std;
        }
-#line 922 "<stdout>"
+#line 184 "<stdout>"
 yy8:
        YYDEBUG(8, *YYCURSOR);
        yyaccept = 0;
@@ -1667,11 +1672,11 @@ yy43:
 yy44:
        YYDEBUG(44, *YYCURSOR);
 
-#line 1306 "parse_date.re"
+#line 1311 "parse_date.re"
 {
                goto std;
        }
-#line 1581 "<stdout>"
+#line 843 "<stdout>"
 yy45:
        YYDEBUG(45, *YYCURSOR);
        ++YYCURSOR;
@@ -1679,12 +1684,12 @@ yy45:
 yy46:
        YYDEBUG(46, *YYCURSOR);
 
-#line 1311 "parse_date.re"
+#line 1316 "parse_date.re"
 {
                s->pos = cursor; s->line++;
                goto std;
        }
-#line 1590 "<stdout>"
+#line 852 "<stdout>"
 yy47:
        YYDEBUG(47, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -2037,7 +2042,7 @@ yy80:
 yy81:
        YYDEBUG(81, *YYCURSOR);
 
-#line 1290 "parse_date.re"
+#line 1295 "parse_date.re"
 {
                timelib_ull i;
 
@@ -2052,7 +2057,7 @@ yy81:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 1887 "<stdout>"
+#line 1149 "<stdout>"
 yy82:
        YYDEBUG(82, *YYCURSOR);
        ++YYCURSOR;
@@ -2675,11 +2680,11 @@ yy147:
 yy148:
        YYDEBUG(148, *YYCURSOR);
 
-#line 1252 "parse_date.re"
+#line 1257 "parse_date.re"
 {
                goto std;
        }
-#line 2380 "<stdout>"
+#line 1642 "<stdout>"
 yy149:
        YYDEBUG(149, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -2721,7 +2726,7 @@ yy154:
 yy155:
        YYDEBUG(155, *YYCURSOR);
 
-#line 1236 "parse_date.re"
+#line 1241 "parse_date.re"
 {
                const timelib_relunit* relunit;
 
@@ -2736,7 +2741,7 @@ yy155:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 2423 "<stdout>"
+#line 1685 "<stdout>"
 yy156:
        YYDEBUG(156, *YYCURSOR);
        yyaccept = 1;
@@ -3120,7 +3125,7 @@ yy187:
 yy188:
        YYDEBUG(188, *YYCURSOR);
 
-#line 1220 "parse_date.re"
+#line 1225 "parse_date.re"
 {
                long i;
 
@@ -3135,7 +3140,7 @@ yy188:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 2754 "<stdout>"
+#line 2016 "<stdout>"
 yy189:
        YYDEBUG(189, *YYCURSOR);
        ++YYCURSOR;
@@ -5281,7 +5286,7 @@ yy385:
 yy386:
        YYDEBUG(386, *YYCURSOR);
 
-#line 1093 "parse_date.re"
+#line 1098 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5292,7 +5297,7 @@ yy386:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_TEXT;
        }
-#line 4511 "<stdout>"
+#line 3773 "<stdout>"
 yy387:
        YYDEBUG(387, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -5362,7 +5367,7 @@ yy396:
 yy397:
        YYDEBUG(397, *YYCURSOR);
 
-#line 1069 "parse_date.re"
+#line 1074 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5373,7 +5378,7 @@ yy397:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NO_DAY;
        }
-#line 4570 "<stdout>"
+#line 3832 "<stdout>"
 yy398:
        YYDEBUG(398, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -5416,7 +5421,7 @@ yy403:
 yy404:
        YYDEBUG(404, *YYCURSOR);
 
-#line 1166 "parse_date.re"
+#line 1171 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5427,7 +5432,7 @@ yy404:
                TIMELIB_DEINIT;
                return TIMELIB_PG_TEXT;
        }
-#line 4610 "<stdout>"
+#line 3872 "<stdout>"
 yy405:
        YYDEBUG(405, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -5563,7 +5568,7 @@ yy422:
 yy423:
        YYDEBUG(423, *YYCURSOR);
 
-#line 1265 "parse_date.re"
+#line 1270 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -5587,7 +5592,7 @@ yy423:
                TIMELIB_DEINIT;
                return TIMELIB_SHORTDATE_WITH_TIME;
        }
-#line 4732 "<stdout>"
+#line 3994 "<stdout>"
 yy424:
        YYDEBUG(424, *YYCURSOR);
        yyaccept = 7;
@@ -7250,7 +7255,7 @@ yy558:
 yy559:
        YYDEBUG(559, *YYCURSOR);
 
-#line 1206 "parse_date.re"
+#line 1211 "parse_date.re"
 {
                TIMELIB_INIT;
                s->time->relative.y = 0 - s->time->relative.y;
@@ -7263,7 +7268,7 @@ yy559:
                TIMELIB_DEINIT;
                return TIMELIB_AGO;
        }
-#line 6136 "<stdout>"
+#line 5398 "<stdout>"
 yy560:
        YYDEBUG(560, *YYCURSOR);
        yyaccept = 1;
@@ -8897,7 +8902,7 @@ yy668:
 yy669:
        YYDEBUG(669, *YYCURSOR);
 
-#line 925 "parse_date.re"
+#line 930 "parse_date.re"
 {
                DEBUG_OUTPUT("timeshort24 | timelong24 | iso8601long");
                TIMELIB_INIT;
@@ -8918,7 +8923,7 @@ yy669:
                TIMELIB_DEINIT;
                return TIMELIB_TIME24_WITH_ZONE;
        }
-#line 7567 "<stdout>"
+#line 6829 "<stdout>"
 yy670:
        YYDEBUG(670, *YYCURSOR);
        yyaccept = 10;
@@ -9045,7 +9050,7 @@ yy683:
 yy684:
        YYDEBUG(684, *YYCURSOR);
 
-#line 910 "parse_date.re"
+#line 915 "parse_date.re"
 {
                DEBUG_OUTPUT("timeshort12 | timelong12");
                TIMELIB_INIT;
@@ -9059,7 +9064,7 @@ yy684:
                TIMELIB_DEINIT;
                return TIMELIB_TIME12;
        }
-#line 7678 "<stdout>"
+#line 6940 "<stdout>"
 yy685:
        YYDEBUG(685, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -9169,7 +9174,7 @@ yy696:
 yy697:
        YYDEBUG(697, *YYCURSOR);
 
-#line 1045 "parse_date.re"
+#line 1050 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -9180,7 +9185,7 @@ yy697:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_FULL;
        }
-#line 7773 "<stdout>"
+#line 7035 "<stdout>"
 yy698:
        YYDEBUG(698, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -9547,7 +9552,7 @@ yy755:
 yy756:
        YYDEBUG(756, *YYCURSOR);
 
-#line 1057 "parse_date.re"
+#line 1062 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -9558,7 +9563,7 @@ yy756:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_FULL_POINTED;
        }
-#line 8033 "<stdout>"
+#line 7295 "<stdout>"
 yy757:
        YYDEBUG(757, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -9930,7 +9935,7 @@ yy800:
 yy801:
        YYDEBUG(801, *YYCURSOR);
 
-#line 1033 "parse_date.re"
+#line 1038 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -9941,7 +9946,7 @@ yy801:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_DATE;
        }
-#line 8326 "<stdout>"
+#line 7588 "<stdout>"
 yy802:
        YYDEBUG(802, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -9963,7 +9968,7 @@ yy804:
 yy805:
        YYDEBUG(805, *YYCURSOR);
 
-#line 1008 "parse_date.re"
+#line 1013 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -9976,7 +9981,7 @@ yy805:
                TIMELIB_DEINIT;
                return TIMELIB_AMERICAN;
        }
-#line 8353 "<stdout>"
+#line 7615 "<stdout>"
 yy806:
        YYDEBUG(806, *YYCURSOR);
        yyaccept = 11;
@@ -10198,7 +10203,7 @@ yy837:
 yy838:
        YYDEBUG(838, *YYCURSOR);
 
-#line 1190 "parse_date.re"
+#line 1195 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_TIME();
@@ -10213,7 +10218,7 @@ yy838:
                TIMELIB_DEINIT;
                return TIMELIB_CLF;
        }
-#line 8524 "<stdout>"
+#line 7786 "<stdout>"
 yy839:
        YYDEBUG(839, *YYCURSOR);
        yyaccept = 12;
@@ -10525,7 +10530,7 @@ yy877:
 yy878:
        YYDEBUG(878, *YYCURSOR);
 
-#line 1178 "parse_date.re"
+#line 1183 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -10536,7 +10541,7 @@ yy878:
                TIMELIB_DEINIT;
                return TIMELIB_PG_TEXT;
        }
-#line 8766 "<stdout>"
+#line 8028 "<stdout>"
 yy879:
        YYDEBUG(879, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -10782,7 +10787,7 @@ yy897:
 yy898:
        YYDEBUG(898, *YYCURSOR);
 
-#line 1081 "parse_date.re"
+#line 1086 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -10793,7 +10798,7 @@ yy898:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NO_DAY;
        }
-#line 8979 "<stdout>"
+#line 8241 "<stdout>"
 yy899:
        YYDEBUG(899, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -10951,7 +10956,7 @@ yy918:
 yy919:
        YYDEBUG(919, *YYCURSOR);
 
-#line 1147 "parse_date.re"
+#line 1152 "parse_date.re"
 {
                int w, d;
 
@@ -10969,7 +10974,7 @@ yy919:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_WEEK;
        }
-#line 9113 "<stdout>"
+#line 8375 "<stdout>"
 yy920:
        YYDEBUG(920, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11002,7 +11007,7 @@ yy922:
 yy923:
        YYDEBUG(923, *YYCURSOR);
 
-#line 1135 "parse_date.re"
+#line 1140 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11013,7 +11018,7 @@ yy923:
                TIMELIB_DEINIT;
                return TIMELIB_PG_YEARDAY;
        }
-#line 9149 "<stdout>"
+#line 8411 "<stdout>"
 yy924:
        YYDEBUG(924, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11089,7 +11094,7 @@ yy929:
 yy930:
        YYDEBUG(930, *YYCURSOR);
 
-#line 1105 "parse_date.re"
+#line 1110 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11099,7 +11104,7 @@ yy930:
                TIMELIB_DEINIT;
                return TIMELIB_DATE_NOCOLON;
        }
-#line 9221 "<stdout>"
+#line 8483 "<stdout>"
 yy931:
        YYDEBUG(931, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11167,7 +11172,7 @@ yy940:
 yy941:
        YYDEBUG(941, *YYCURSOR);
 
-#line 1116 "parse_date.re"
+#line 1121 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_TIME();
@@ -11185,7 +11190,7 @@ yy941:
                TIMELIB_DEINIT;
                return TIMELIB_XMLRPC_SOAP;
        }
-#line 9285 "<stdout>"
+#line 8547 "<stdout>"
 yy942:
        YYDEBUG(942, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -11866,7 +11871,7 @@ yy1034:
 yy1035:
        YYDEBUG(1035, *YYCURSOR);
 
-#line 1022 "parse_date.re"
+#line 1027 "parse_date.re"
 {
                TIMELIB_INIT;
                TIMELIB_HAVE_DATE();
@@ -11876,7 +11881,7 @@ yy1035:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_DATE;
        }
-#line 9788 "<stdout>"
+#line 9050 "<stdout>"
 yy1036:
        YYDEBUG(1036, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -12659,7 +12664,7 @@ yy1115:
 yy1116:
        YYDEBUG(1116, *YYCURSOR);
 
-#line 947 "parse_date.re"
+#line 952 "parse_date.re"
 {
                DEBUG_OUTPUT("gnunocolon");
                TIMELIB_INIT;
@@ -12680,7 +12685,7 @@ yy1116:
                TIMELIB_DEINIT;
                return TIMELIB_GNU_NOCOLON;
        }
-#line 10426 "<stdout>"
+#line 9688 "<stdout>"
 yy1117:
        YYDEBUG(1117, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -12753,7 +12758,7 @@ yy1123:
 yy1124:
        YYDEBUG(1124, *YYCURSOR);
 
-#line 992 "parse_date.re"
+#line 997 "parse_date.re"
 {
                DEBUG_OUTPUT("iso8601nocolon");
                TIMELIB_INIT;
@@ -12768,7 +12773,7 @@ yy1124:
                TIMELIB_DEINIT;
                return TIMELIB_ISO_NOCOLON;
        }
-#line 10498 "<stdout>"
+#line 9760 "<stdout>"
 yy1125:
        YYDEBUG(1125, *YYCURSOR);
        yyaccept = 19;
@@ -12946,7 +12951,7 @@ yy1139:
 yy1140:
        YYDEBUG(1140, *YYCURSOR);
 
-#line 887 "parse_date.re"
+#line 892 "parse_date.re"
 {
                timelib_ull i;
 
@@ -12968,7 +12973,7 @@ yy1140:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 10664 "<stdout>"
+#line 9926 "<stdout>"
 yy1141:
        YYDEBUG(1141, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13016,7 +13021,7 @@ yy1148:
 yy1149:
        YYDEBUG(1149, *YYCURSOR);
 
-#line 875 "parse_date.re"
+#line 880 "parse_date.re"
 {
                DEBUG_OUTPUT("tomorrow");
                TIMELIB_INIT;
@@ -13027,7 +13032,7 @@ yy1149:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 10705 "<stdout>"
+#line 9967 "<stdout>"
 yy1150:
        YYDEBUG(1150, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13044,7 +13049,7 @@ yy1151:
 yy1152:
        YYDEBUG(1152, *YYCURSOR);
 
-#line 865 "parse_date.re"
+#line 870 "parse_date.re"
 {
                DEBUG_OUTPUT("today");
                TIMELIB_INIT;
@@ -13053,7 +13058,7 @@ yy1152:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 10725 "<stdout>"
+#line 9987 "<stdout>"
 yy1153:
        YYDEBUG(1153, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13076,7 +13081,7 @@ yy1154:
 yy1155:
        YYDEBUG(1155, *YYCURSOR);
 
-#line 856 "parse_date.re"
+#line 861 "parse_date.re"
 {
                DEBUG_OUTPUT("now");
                TIMELIB_INIT;
@@ -13084,7 +13089,7 @@ yy1155:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 10750 "<stdout>"
+#line 10012 "<stdout>"
 yy1156:
        YYDEBUG(1156, *YYCURSOR);
        yych = *++YYCURSOR;
@@ -13131,7 +13136,7 @@ yy1163:
 yy1164:
        YYDEBUG(1164, *YYCURSOR);
 
-#line 844 "parse_date.re"
+#line 849 "parse_date.re"
 {
                DEBUG_OUTPUT("yesterday");
                TIMELIB_INIT;
@@ -13142,10 +13147,10 @@ yy1164:
                TIMELIB_DEINIT;
                return TIMELIB_RELATIVE;
        }
-#line 10790 "<stdout>"
+#line 10052 "<stdout>"
+}
+#line 1326 "parse_date.re"
 }
-#line 1321 "parse_date.re"
-
 }
 
 #define YYMAXFILL 25