From: helly Date: Sat, 31 Dec 2005 00:26:47 +0000 (+0000) Subject: - Regenerated X-Git-Tag: 0.13.6~534 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1aa0fe8ab0a21d0634d557738b0088e79bcda1;p=re2c - Regenerated --- diff --git a/bootstrap/scanner.cc b/bootstrap/scanner.cc index df6a4a00..782eab3e 100644 --- a/bootstrap/scanner.cc +++ b/bootstrap/scanner.cc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.10.0.dev on Sat Dec 31 00:11:13 2005 */ +/* Generated by re2c 0.10.0.dev on Sat Dec 31 00:57:11 2005 */ #line 1 "scanner.re" /* $Id$ */ #include @@ -112,7 +112,7 @@ yy2: goto yy3; yy3: #line 135 "scanner.re" -{ + { goto echo; } #line 119 "scanner.cc" @@ -125,7 +125,7 @@ yy5: goto yy6; yy6: #line 124 "scanner.re" -{ + { out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok)); tok = pos = cursor; cline++; oline++; goto echo; @@ -136,7 +136,7 @@ yy7: goto yy8; yy8: #line 129 "scanner.re" -{ + { out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok) - 1); // -1 so we don't write out the \0 if(cursor == eof) { RETURN(0); @@ -151,7 +151,7 @@ yy10: goto yy11; yy11: #line 115 "scanner.re" -{ + { if (ignore_eoc) { ignore_eoc = false; } else { @@ -196,7 +196,7 @@ yy19: goto yy20; yy20: #line 104 "scanner.re" -{ + { out.write((const char*)(tok), (const char*)(&cursor[-7]) - (const char*)(tok)); tok = cursor; RETURN(1); @@ -231,7 +231,7 @@ yy27: goto yy28; yy28: #line 109 "scanner.re" -{ + { out << "#define YYMAXFILL " << maxFill << std::endl; tok = pos = cursor; ignore_eoc = true; @@ -342,7 +342,7 @@ yy31: } yy32: #line 160 "scanner.re" -{ depth = 1; + { depth = 1; goto code; } #line 349 "scanner.cc" @@ -352,7 +352,7 @@ yy33: goto yy34; yy34: #line 190 "scanner.re" -{ RETURN(*tok); } + { RETURN(*tok); } #line 357 "scanner.cc" yy35: ++YYCURSOR; @@ -360,7 +360,7 @@ yy35: goto yy36; yy36: #line 192 "scanner.re" -{ yylval.op = *tok; + { yylval.op = *tok; RETURN(CLOSE); } #line 366 "scanner.cc" yy37: @@ -370,7 +370,7 @@ yy37: goto yy38; yy38: #line 177 "scanner.re" -{ fatal("unterminated string constant (missing \")"); } + { fatal("unterminated string constant (missing \")"); } #line 375 "scanner.cc" yy39: yyaccept = 2; @@ -379,7 +379,7 @@ yy39: goto yy40; yy40: #line 178 "scanner.re" -{ fatal("unterminated string constant (missing ')"); } + { fatal("unterminated string constant (missing ')"); } #line 384 "scanner.cc" yy41: yyaccept = 3; @@ -389,7 +389,7 @@ yy41: goto yy71; yy42: #line 188 "scanner.re" -{ fatal("unterminated range (missing ])"); } + { fatal("unterminated range (missing ])"); } #line 394 "scanner.cc" yy43: yych = *++YYCURSOR; @@ -403,7 +403,7 @@ yy45: goto yy62; yy46: #line 212 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.symbol = Symbol::find(token()); return ID; } #line 410 "scanner.cc" @@ -416,7 +416,7 @@ yy48: goto yy49; yy49: #line 223 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.regexp = mkDot(); return RANGE; } @@ -427,14 +427,14 @@ yy50: goto yy59; yy51: #line 228 "scanner.re" -{ goto scan; } + { goto scan; } #line 432 "scanner.cc" yy52: ++YYCURSOR; goto yy53; yy53: #line 230 "scanner.re" -{ if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); pos = cursor; cline++; goto scan; } @@ -445,7 +445,7 @@ yy54: goto yy55; yy55: #line 235 "scanner.re" -{ std::cerr << "line " << tline << ", column " << (tchar + 1) + { std::cerr << "line " << tline << ", column " << (tchar + 1) << ": unexpected character: "; if (isprint(*tok)) { @@ -537,7 +537,7 @@ yy68: } yy69: #line 216 "scanner.re" -{ cur = cursor; + { cur = cursor; tok+= 5; /* skip "re2c:" */ iscfg = 1; yylval.str = new Str(token()); @@ -583,7 +583,7 @@ yy75: goto yy76; yy76: #line 184 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.regexp = ranToRE(token()); return RANGE; } #line 590 "scanner.cc" @@ -598,7 +598,7 @@ yy78: goto yy79; yy79: #line 180 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.regexp = invToRE(token()); return RANGE; } #line 605 "scanner.cc" @@ -627,7 +627,7 @@ yy83: goto yy84; yy84: #line 173 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.regexp = strToCaseInsensitiveRE(token()); return STRING; } #line 634 "scanner.cc" @@ -656,7 +656,7 @@ yy88: goto yy89; yy89: #line 169 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.regexp = strToRE(token()); return STRING; } #line 663 "scanner.cc" @@ -665,7 +665,7 @@ yy90: goto yy91; yy91: #line 166 "scanner.re" -{ tok = cursor; + { tok = cursor; RETURN(0); } #line 671 "scanner.cc" yy92: @@ -673,7 +673,7 @@ yy92: goto yy93; yy93: #line 163 "scanner.re" -{ depth = 1; + { depth = 1; goto comment; } #line 679 "scanner.cc" yy94: @@ -699,14 +699,14 @@ yy97: goto yy98; yy98: #line 210 "scanner.re" -{ fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } + { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); } #line 704 "scanner.cc" yy99: ++YYCURSOR; goto yy100; yy100: #line 198 "scanner.re" -{ yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = atoi((char *)tok+1); RETURN(CLOSESIZE); } #line 713 "scanner.cc" @@ -722,7 +722,7 @@ yy102: goto yy103; yy103: #line 206 "scanner.re" -{ yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = -1; RETURN(CLOSESIZE); } #line 729 "scanner.cc" @@ -741,7 +741,7 @@ yy106: goto yy107; yy107: #line 202 "scanner.re" -{ yylval.extop.minsize = atoi((char *)tok+1); + { yylval.extop.minsize = atoi((char *)tok+1); yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1)); RETURN(CLOSESIZE); } #line 748 "scanner.cc" @@ -757,7 +757,7 @@ yy109: goto yy110; yy110: #line 195 "scanner.re" -{ yylval.op = '*'; + { yylval.op = '*'; RETURN(CLOSE); } #line 763 "scanner.cc" } @@ -798,7 +798,7 @@ yy113: goto yy114; yy114: #line 251 "scanner.re" -{ if(--depth == 0){ + { if(--depth == 0){ cur = cursor; yylval.token = new Token(token(), tline); return CODE; @@ -810,7 +810,7 @@ yy115: goto yy116; yy116: #line 257 "scanner.re" -{ ++depth; + { ++depth; goto code; } #line 816 "scanner.cc" yy117: @@ -818,7 +818,7 @@ yy117: goto yy118; yy118: #line 259 "scanner.re" -{ if(cursor == eof) fatal("missing '}'"); + { if(cursor == eof) fatal("missing '}'"); pos = cursor; cline++; goto code; } @@ -828,7 +828,7 @@ yy119: goto yy120; yy120: #line 263 "scanner.re" -{ goto code; } + { goto code; } #line 833 "scanner.cc" yy121: yyaccept = 0; @@ -913,7 +913,7 @@ yy132: goto yy133; yy133: #line 279 "scanner.re" -{ goto comment; } + { goto comment; } #line 918 "scanner.cc" yy134: yych = *++YYCURSOR; @@ -924,7 +924,7 @@ yy135: goto yy136; yy136: #line 275 "scanner.re" -{ if(cursor == eof) RETURN(0); + { if(cursor == eof) RETURN(0); tok = pos = cursor; cline++; goto comment; } @@ -937,7 +937,7 @@ yy138: goto yy139; yy139: #line 272 "scanner.re" -{ ++depth; + { ++depth; fatal("ambiguous /* found"); goto comment; } #line 944 "scanner.cc" @@ -946,7 +946,7 @@ yy140: goto yy141; yy141: #line 268 "scanner.re" -{ if(--depth == 0) + { if(--depth == 0) goto scan; else goto comment; } @@ -979,7 +979,7 @@ yy144: goto yy153; yy145: #line 284 "scanner.re" -{ goto config; } + { goto config; } #line 984 "scanner.cc" yy146: ++YYCURSOR; @@ -987,7 +987,7 @@ yy146: goto yy151; yy147: #line 285 "scanner.re" -{ iscfg = 2; + { iscfg = 2; cur = cursor; RETURN('='); } @@ -997,7 +997,7 @@ yy148: goto yy149; yy149: #line 289 "scanner.re" -{ fatal("missing '='"); } + { fatal("missing '='"); } #line 1002 "scanner.cc" yy150: ++YYCURSOR; @@ -1064,7 +1064,7 @@ yy154: } yy156: #line 299 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.str = new Str(token()); iscfg = 0; return VALUE; @@ -1088,7 +1088,7 @@ yy157: } yy158: #line 294 "scanner.re" -{ cur = cursor; + { cur = cursor; yylval.number = atoi(token().to_string().c_str()); iscfg = 0; return NUMBER;