]> granicus.if.org Git - re2c/commitdiff
- WS
authorhelly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Sat, 14 Apr 2007 12:54:18 +0000 (12:54 +0000)
committerhelly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Sat, 14 Apr 2007 12:54:18 +0000 (12:54 +0000)
re2c/bootstrap/scanner.cc

index 1978b45948fb5c692e4dbffd6b2a191846acb490..2d62616c98b91be87cc9d9579e079abfac699944 100644 (file)
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.3.dev on Wed Mar 28 16:04:07 2007 */
+/* Generated by re2c 0.11.4.dev on Sat Apr 14 08:51:37 2007 */
 #line 1 "scanner.re"
 /* $Id$ */
 #include <stdlib.h>
@@ -36,7 +36,7 @@ Scanner::Scanner(std::istream& i, std::ostream& o)
        , bot(NULL), tok(NULL), ptr(NULL), cur(NULL), pos(NULL), lim(NULL)
        , top(NULL), eof(NULL), tchar(0), tline(0), cline(1), iscfg(0)
 {
-    ;
+       ;
 }
 
 char *Scanner::fill(char *cursor)
@@ -67,34 +67,35 @@ char *Scanner::fill(char *cursor)
                        bot = buf;
                }
                in.read(lim, BSIZE);
-               if ((cnt = in.gcount()) != BSIZE )
+               if((cnt = in.gcount()) != BSIZE)
                {
-                       eof = &lim[cnt]; *eof++ = '\0';
+                       eof = &lim[cnt];
+                       *eof++ = '\0';
                }
                lim += cnt;
        }
        return cursor;
 }
 
-#line 95 "scanner.re"
+#line 96 "scanner.re"
 
 
 int Scanner::echo()
 {
-    char *cursor = cur;
-    bool ignore_eoc = false;
-    int  ignore_cnt = 0;
+       char *cursor = cur;
+       bool ignore_eoc = false;
+       int  ignore_cnt = 0;
 
-    if (eof && cursor == eof) // Catch EOF
+       if (eof && cursor == eof) // Catch EOF
        {
-       return 0;
+               return 0;
        }
-
-    tok = cursor;
+       
+       tok = cursor;
 echo:
 {
 
-#line 98 "scanner.cc"
+#line 99 "scanner.cc"
        {
                YYCTYPE yych;
                unsigned int yyaccept = 0;
@@ -113,40 +114,47 @@ echo:
                yych = *(YYMARKER = ++YYCURSOR);
                if(yych == '*') goto yy16;
 yy3:
-#line 184 "scanner.re"
+#line 202 "scanner.re"
                {
                                        goto echo;
                                }
-#line 121 "scanner.cc"
+#line 122 "scanner.cc"
 yy4:
                yych = *++YYCURSOR;
                if(yych == '/') goto yy10;
                goto yy3;
 yy5:
                ++YYCURSOR;
-#line 167 "scanner.re"
+#line 178 "scanner.re"
                {
-                                       if (ignore_eoc) {
+                                       if (ignore_eoc)
+                                       {
                                                ignore_cnt++;
-                                       } else {
+                                       }
+                                       else
+                                       {
                                                out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok));
                                        }
-                                       tok = pos = cursor; cline++;
-                                       goto echo;
+                                       tok = pos = cursor;
+                                       cline++;
+                                       goto echo;
                                }
-#line 138 "scanner.cc"
+#line 143 "scanner.cc"
 yy7:
                ++YYCURSOR;
-#line 176 "scanner.re"
+#line 191 "scanner.re"
                {
-                                       if (!ignore_eoc) {
-                                               out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok) - 1); // -1 so we don't write out the \0
+                                       if (!ignore_eoc)
+                                       {
+                                               out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok) - 1);
+                                               // -1 so we don't write out the \0
                                        }
-                                       if(cursor == eof) {
+                                       if(cursor == eof)
+                                       {
                                                RETURN(0);
                                        }
                                }
-#line 150 "scanner.cc"
+#line 158 "scanner.cc"
 yy9:
                yych = *++YYCURSOR;
                goto yy3;
@@ -156,21 +164,25 @@ yy10:
                if(yych == 0x0A) goto yy14;
                if(yych == 0x0D) goto yy12;
 yy11:
-#line 154 "scanner.re"
+#line 161 "scanner.re"
                {
-                                       if (ignore_eoc) {
-                                               if (ignore_cnt) {
+                                       if (ignore_eoc)
+                                       {
+                                               if (ignore_cnt)
+                                               {
                                                        out << "\n" << sourceFileInfo;
                                                }
                                                ignore_eoc = false;
                                                ignore_cnt = 0;
-                                       } else {
+                                       }
+                                       else
+                                       {
                                                out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok));
                                        }
                                        tok = pos = cursor;
                                        goto echo;
                                }
-#line 174 "scanner.cc"
+#line 186 "scanner.cc"
 yy12:
                yych = *++YYCURSOR;
                if(yych == 0x0A) goto yy14;
@@ -183,22 +195,26 @@ yy13:
                }
 yy14:
                ++YYCURSOR;
-#line 140 "scanner.re"
+#line 143 "scanner.re"
                {
                                        cline++;
-                                       if (ignore_eoc) {
-                                               if (ignore_cnt) {
+                                       if (ignore_eoc)
+                                       {
+                                               if (ignore_cnt)
+                                               {
                                                        out << sourceFileInfo;
                                                }
                                                ignore_eoc = false;
                                                ignore_cnt = 0;
-                                       } else {
+                                       }
+                                       else
+                                       {
                                                out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok));
                                        }
                                        tok = pos = cursor;
                                        goto echo;
                                }
-#line 202 "scanner.cc"
+#line 218 "scanner.cc"
 yy16:
                yych = *++YYCURSOR;
                if(yych != '!') goto yy13;
@@ -230,16 +246,17 @@ yy21:
                yych = *++YYCURSOR;
                if(yych != 'c') goto yy13;
                ++YYCURSOR;
-#line 111 "scanner.re"
+#line 112 "scanner.re"
                {
-                                       if (bUsedYYMaxFill && bSinglePass) {
+                                       if (bUsedYYMaxFill && bSinglePass)
+                                       {
                                                fatal("found scanner block after YYMAXFILL declaration");
                                        }
                                        out.write((const char*)(tok), (const char*)(&cursor[-7]) - (const char*)(tok));
                                        tok = cursor;
                                        RETURN(1);
                                }
-#line 243 "scanner.cc"
+#line 260 "scanner.cc"
 yy26:
                yych = *++YYCURSOR;
                if(yych != 'x') goto yy13;
@@ -254,9 +271,10 @@ yy26:
                yych = *++YYCURSOR;
                if(yych != 'c') goto yy13;
                ++YYCURSOR;
-#line 119 "scanner.re"
+#line 121 "scanner.re"
                {
-                                       if (bUsedYYMaxFill) {
+                                       if (bUsedYYMaxFill)
+                                       {
                                                fatal("cannot generate YYMAXFILL twice");
                                        }
                                        out << "#define YYMAXFILL " << maxFill << std::endl;
@@ -265,7 +283,7 @@ yy26:
                                        bUsedYYMaxFill = true;
                                        goto echo;
                                }
-#line 269 "scanner.cc"
+#line 287 "scanner.cc"
 yy34:
                yych = *++YYCURSOR;
                if(yych != 't') goto yy13;
@@ -290,14 +308,14 @@ yy34:
                yych = *++YYCURSOR;
                if(yych != 'c') goto yy13;
                ++YYCURSOR;
-#line 129 "scanner.re"
+#line 132 "scanner.re"
                {
                                        tok = pos = cursor;
                                        genGetState(out, topIndent, 0);
                                        ignore_eoc = true;
                                        goto echo;
                                }
-#line 301 "scanner.cc"
+#line 319 "scanner.cc"
 yy47:
                yych = *++YYCURSOR;
                if(yych != 'n') goto yy13;
@@ -318,37 +336,37 @@ yy47:
                yych = *++YYCURSOR;
                if(yych != 'c') goto yy13;
                ++YYCURSOR;
-#line 135 "scanner.re"
+#line 138 "scanner.re"
                {
                                        tok = pos = cursor;
                                        ignore_eoc = true;
                                        goto echo;
                                }
-#line 328 "scanner.cc"
+#line 346 "scanner.cc"
        }
 }
-#line 187 "scanner.re"
+#line 205 "scanner.re"
 
 }
 
 
 int Scanner::scan()
 {
-    char *cursor = cur;
-    uint depth;
+       char *cursor = cur;
+       uint depth;
 
 scan:
-    tchar = cursor - pos;
-    tline = cline;
-    tok = cursor;
+       tchar = cursor - pos;
+       tline = cline;
+       tok = cursor;
        if (iscfg == 1)
        {
                goto config;
        }
        else if (iscfg == 2)
        {
-               goto value;
-    }
+               goto value;
+       }
 {
        static const unsigned char yybm[] = {
                112, 112, 112, 112, 112, 112, 112, 112, 
@@ -385,7 +403,7 @@ scan:
                112, 112, 112, 112, 112, 112, 112, 112, 
        };
 
-#line 389 "scanner.cc"
+#line 407 "scanner.cc"
        {
                YYCTYPE yych;
                unsigned int yyaccept = 0;
@@ -468,42 +486,51 @@ yy60:
                        if(yych <= '9') goto yy124;
                }
 yy61:
-#line 209 "scanner.re"
-               { depth = 1;
-                                 goto code;
+#line 227 "scanner.re"
+               {
+                                       depth = 1;
+                                       goto code;
                                }
-#line 476 "scanner.cc"
+#line 495 "scanner.cc"
 yy62:
                ++YYCURSOR;
                if((yych = *YYCURSOR) == '*') goto yy121;
 yy63:
-#line 239 "scanner.re"
-               { RETURN(*tok); }
-#line 483 "scanner.cc"
+#line 277 "scanner.re"
+               {
+                                       RETURN(*tok);
+                               }
+#line 504 "scanner.cc"
 yy64:
                ++YYCURSOR;
                if((yych = *YYCURSOR) == '/') goto yy119;
 yy65:
-#line 241 "scanner.re"
-               { yylval.op = *tok;
-                                 RETURN(CLOSE); }
-#line 491 "scanner.cc"
+#line 281 "scanner.re"
+               {
+                                       yylval.op = *tok;
+                                       RETURN(CLOSE);
+                               }
+#line 514 "scanner.cc"
 yy66:
                yyaccept = 1;
                yych = *(YYMARKER = ++YYCURSOR);
                if(yych != 0x0A) goto yy115;
 yy67:
-#line 226 "scanner.re"
-               { fatal("unterminated string constant (missing \")"); }
-#line 499 "scanner.cc"
+#line 254 "scanner.re"
+               {
+                                       fatal("unterminated string constant (missing \")");
+                               }
+#line 524 "scanner.cc"
 yy68:
                yyaccept = 2;
                yych = *(YYMARKER = ++YYCURSOR);
                if(yych != 0x0A) goto yy110;
 yy69:
-#line 227 "scanner.re"
-               { fatal("unterminated string constant (missing ')"); }
-#line 507 "scanner.cc"
+#line 257 "scanner.re"
+               {
+                                       fatal("unterminated string constant (missing ')");
+                               }
+#line 534 "scanner.cc"
 yy70:
                yyaccept = 3;
                yych = *(YYMARKER = ++YYCURSOR);
@@ -511,9 +538,11 @@ yy70:
                if(yych == '^') goto yy101;
                goto yy100;
 yy71:
-#line 237 "scanner.re"
-               { fatal("unterminated range (missing ])"); }
-#line 517 "scanner.cc"
+#line 273 "scanner.re"
+               {
+                                       fatal("unterminated range (missing ])");
+                               }
+#line 546 "scanner.cc"
 yy72:
                yych = *++YYCURSOR;
                goto yy63;
@@ -525,51 +554,59 @@ yy74:
                if((yych = *YYCURSOR) == 'e') goto yy91;
                goto yy90;
 yy75:
-#line 268 "scanner.re"
-               { cur = cursor;
-                                 yylval.symbol = Symbol::find(token());
-                                 return ID; }
-#line 533 "scanner.cc"
+#line 321 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.symbol = Symbol::find(token());
+                                       return ID;
+                               }
+#line 564 "scanner.cc"
 yy76:
                yych = *++YYCURSOR;
                goto yy90;
 yy77:
                ++YYCURSOR;
-#line 272 "scanner.re"
-               { cur = cursor;
-                                 yylval.regexp = mkDot();
-                                 return RANGE;
+#line 327 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.regexp = mkDot();
+                                       return RANGE;
                                }
-#line 544 "scanner.cc"
+#line 576 "scanner.cc"
 yy79:
                ++YYCURSOR;
                yych = *YYCURSOR;
                goto yy88;
 yy80:
-#line 277 "scanner.re"
-               { goto scan; }
-#line 552 "scanner.cc"
+#line 333 "scanner.re"
+               {
+                                       goto scan;
+                               }
+#line 586 "scanner.cc"
 yy81:
                ++YYCURSOR;
 yy82:
-#line 279 "scanner.re"
-               { if(cursor == eof) RETURN(0);
-                                 pos = cursor; cline++;
-                                 goto scan;
-                               }
-#line 561 "scanner.cc"
+#line 337 "scanner.re"
+               {
+                                       if(cursor == eof) RETURN(0);
+                                       pos = cursor;
+                                       cline++;
+                                       goto scan;
+                               }
+#line 597 "scanner.cc"
 yy83:
                ++YYCURSOR;
                if((yych = *YYCURSOR) == 0x0A) goto yy86;
 yy84:
-#line 284 "scanner.re"
-               { std::ostringstream msg;
-                                 msg << "unexpected character: ";
-                                 prtChOrHex(msg, *tok);
-                                 fatal(msg.str().c_str());
-                                 goto scan;
+#line 344 "scanner.re"
+               {
+                                       std::ostringstream msg;
+                                       msg << "unexpected character: ";
+                                       prtChOrHex(msg, *tok);
+                                       fatal(msg.str().c_str());
+                                       goto scan;
                                }
-#line 573 "scanner.cc"
+#line 610 "scanner.cc"
 yy85:
                yych = *++YYCURSOR;
                goto yy84;
@@ -661,14 +698,15 @@ yy96:
                        }
                }
 yy98:
-#line 261 "scanner.re"
-               { cur = cursor;
-                                 tok+= 5; /* skip "re2c:" */
-                                 iscfg = 1;
-                                 yylval.str = new Str(token());
-                                 return CONFIG;
+#line 313 "scanner.re"
+               {
+                                       cur = cursor;
+                                       tok+= 5; /* skip "re2c:" */
+                                       iscfg = 1;
+                                       yylval.str = new Str(token());
+                                       return CONFIG;
                                }
-#line 672 "scanner.cc"
+#line 710 "scanner.cc"
 yy99:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -700,11 +738,13 @@ yy103:
                goto yy99;
 yy104:
                ++YYCURSOR;
-#line 233 "scanner.re"
-               { cur = cursor;
-                                 yylval.regexp = ranToRE(token());
-                                 return RANGE; }
-#line 708 "scanner.cc"
+#line 267 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.regexp = ranToRE(token());
+                                       return RANGE;
+                               }
+#line 748 "scanner.cc"
 yy106:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -713,11 +753,13 @@ yy106:
                goto yy101;
 yy107:
                ++YYCURSOR;
-#line 229 "scanner.re"
-               { cur = cursor;
-                                 yylval.regexp = invToRE(token());
-                                 return RANGE; }
-#line 721 "scanner.cc"
+#line 261 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.regexp = invToRE(token());
+                                       return RANGE;
+                               }
+#line 763 "scanner.cc"
 yy109:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -735,11 +777,13 @@ yy110:
                goto yy109;
 yy112:
                ++YYCURSOR;
-#line 222 "scanner.re"
-               { cur = cursor;
-                                 yylval.regexp = strToCaseInsensitiveRE(token());
-                                 return STRING; }
-#line 743 "scanner.cc"
+#line 248 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.regexp = strToCaseInsensitiveRE(token());
+                                       return STRING;
+                               }
+#line 787 "scanner.cc"
 yy114:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -757,23 +801,29 @@ yy115:
                goto yy114;
 yy117:
                ++YYCURSOR;
-#line 218 "scanner.re"
-               { cur = cursor;
-                                 yylval.regexp = strToRE(token());
-                                 return STRING; }
-#line 765 "scanner.cc"
+#line 242 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.regexp = strToRE(token());
+                                       return STRING;
+                               }
+#line 811 "scanner.cc"
 yy119:
                ++YYCURSOR;
-#line 215 "scanner.re"
-               { tok = cursor;
-                                 RETURN(0); }
-#line 771 "scanner.cc"
+#line 237 "scanner.re"
+               {
+                                       tok = cursor;
+                                       RETURN(0);
+                               }
+#line 819 "scanner.cc"
 yy121:
                ++YYCURSOR;
-#line 212 "scanner.re"
-               { depth = 1;
-                                 goto comment; }
-#line 777 "scanner.cc"
+#line 232 "scanner.re"
+               {
+                                       depth = 1;
+                                       goto comment;
+                               }
+#line 827 "scanner.cc"
 yy123:
                yych = *++YYCURSOR;
                if(yych == ',') goto yy137;
@@ -792,16 +842,20 @@ yy125:
 yy126:
                ++YYCURSOR;
 yy127:
-#line 259 "scanner.re"
-               { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); }
-#line 798 "scanner.cc"
+#line 309 "scanner.re"
+               {
+                                       fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers");
+                               }
+#line 850 "scanner.cc"
 yy128:
                ++YYCURSOR;
-#line 247 "scanner.re"
-               { yylval.extop.minsize = atoi((char *)tok+1);
-                                 yylval.extop.maxsize = atoi((char *)tok+1);
-                                 RETURN(CLOSESIZE); }
-#line 805 "scanner.cc"
+#line 291 "scanner.re"
+               {
+                                       yylval.extop.minsize = atoi((char *)tok+1);
+                                       yylval.extop.maxsize = atoi((char *)tok+1);
+                                       RETURN(CLOSESIZE);
+                               }
+#line 859 "scanner.cc"
 yy130:
                yyaccept = 6;
                yych = *(YYMARKER = ++YYCURSOR);
@@ -809,11 +863,13 @@ yy130:
                if(yych <= '9') goto yy133;
                if(yych != '}') goto yy127;
                ++YYCURSOR;
-#line 255 "scanner.re"
-               { yylval.extop.minsize = atoi((char *)tok+1);
-                                 yylval.extop.maxsize = -1;
-                                 RETURN(CLOSESIZE); }
-#line 817 "scanner.cc"
+#line 303 "scanner.re"
+               {
+                                       yylval.extop.minsize = atoi((char *)tok+1);
+                                       yylval.extop.maxsize = -1;
+                                       RETURN(CLOSESIZE);
+                               }
+#line 873 "scanner.cc"
 yy133:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -822,11 +878,13 @@ yy133:
                if(yych <= '9') goto yy133;
                if(yych != '}') goto yy95;
                ++YYCURSOR;
-#line 251 "scanner.re"
-               { yylval.extop.minsize = atoi((char *)tok+1);
-                                 yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1));
-                                 RETURN(CLOSESIZE); }
-#line 830 "scanner.cc"
+#line 297 "scanner.re"
+               {
+                                       yylval.extop.minsize = atoi((char *)tok+1);
+                                       yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1));
+                                       RETURN(CLOSESIZE);
+                               }
+#line 888 "scanner.cc"
 yy137:
                yyaccept = 6;
                yych = *(YYMARKER = ++YYCURSOR);
@@ -834,13 +892,15 @@ yy137:
                if(yych <= '9') goto yy133;
                if(yych != '}') goto yy127;
                ++YYCURSOR;
-#line 244 "scanner.re"
-               { yylval.op = '*';
-                                 RETURN(CLOSE); }
-#line 841 "scanner.cc"
+#line 286 "scanner.re"
+               {
+                                       yylval.op = '*';
+                                       RETURN(CLOSE);
+                               }
+#line 901 "scanner.cc"
        }
 }
-#line 290 "scanner.re"
+#line 351 "scanner.re"
 
 
 code:
@@ -880,7 +940,7 @@ code:
                192, 192, 192, 192, 192, 192, 192, 192, 
        };
 
-#line 884 "scanner.cc"
+#line 944 "scanner.cc"
        {
                YYCTYPE yych;
                if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -904,44 +964,61 @@ code:
                        }
                }
                ++YYCURSOR;
-#line 294 "scanner.re"
-               { if(--depth == 0){
-                                       cur = cursor;
-                                       yylval.token = new Token(token(), tline);
-                                       return CODE;
-                                 }
-                                 goto code; }
-#line 915 "scanner.cc"
+#line 355 "scanner.re"
+               {
+                                       if(--depth == 0)
+                                       {
+                                               cur = cursor;
+                                               yylval.token = new Token(token(), tline);
+                                               return CODE;
+                                       }
+                                       goto code;
+                               }
+#line 978 "scanner.cc"
 yy144:
                ++YYCURSOR;
-#line 300 "scanner.re"
-               { ++depth;
-                                 goto code; }
-#line 921 "scanner.cc"
+#line 364 "scanner.re"
+               {
+                                       ++depth;
+                                       goto code;
+                               }
+#line 986 "scanner.cc"
 yy146:
                ++YYCURSOR;
-#line 302 "scanner.re"
-               { if(cursor == eof) fatal("missing '}'");
-                                 pos = cursor; cline++;
-                                 goto code;
+#line 368 "scanner.re"
+               {
+                                       if(cursor == eof)
+                                       {
+                                               fatal("missing '}'");
+                                       }
+                                       pos = cursor;
+                                       cline++;
+                                       goto code;
                                }
-#line 929 "scanner.cc"
+#line 999 "scanner.cc"
 yy148:
                ++YYCURSOR;
-#line 306 "scanner.re"
-               { if(cursor == eof) {
-                                       if (depth) fatal("missing '}'");
-                                       RETURN(0);
-                                 }
-                                 goto code;
+#line 377 "scanner.re"
+               {
+                                       if(cursor == eof)
+                                       {
+                                               if (depth)
+                                               {
+                                                       fatal("missing '}'");
+                                               }
+                                               RETURN(0);
+                                       }
+                                       goto code;
                                }
-#line 939 "scanner.cc"
+#line 1014 "scanner.cc"
 yy150:
                ++YYCURSOR;
 yy151:
-#line 312 "scanner.re"
-               { goto code; }
-#line 945 "scanner.cc"
+#line 388 "scanner.re"
+               {
+                                       goto code;
+                               }
+#line 1022 "scanner.cc"
 yy152:
                yych = *(YYMARKER = ++YYCURSOR);
                if(yych == 0x0A) goto yy151;
@@ -987,13 +1064,13 @@ yy159:
                goto yy158;
        }
 }
-#line 313 "scanner.re"
+#line 391 "scanner.re"
 
 
 comment:
 {
 
-#line 997 "scanner.cc"
+#line 1074 "scanner.cc"
        {
                YYCTYPE yych;
                if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1010,43 +1087,61 @@ yy163:
                ++YYCURSOR;
                if((yych = *YYCURSOR) == '/') goto yy171;
 yy164:
-#line 328 "scanner.re"
-               { if(cursor == eof) RETURN(0);
-                                 goto comment; }
-#line 1017 "scanner.cc"
+#line 419 "scanner.re"
+               {
+                                       if(cursor == eof)
+                                       {
+                                               RETURN(0);
+                                       }
+                                       goto comment;
+                               }
+#line 1099 "scanner.cc"
 yy165:
                yych = *++YYCURSOR;
                if(yych == '*') goto yy169;
                goto yy164;
 yy166:
                ++YYCURSOR;
-#line 324 "scanner.re"
-               { if(cursor == eof) RETURN(0);
-                                 tok = pos = cursor; cline++;
-                                 goto comment;
+#line 410 "scanner.re"
+               {
+                                       if(cursor == eof)
+                                       {
+                                               RETURN(0);
+                                       }
+                                       tok = pos = cursor;
+                                       cline++;
+                                       goto comment;
                                }
-#line 1029 "scanner.cc"
+#line 1116 "scanner.cc"
 yy168:
                yych = *++YYCURSOR;
                goto yy164;
 yy169:
                ++YYCURSOR;
-#line 321 "scanner.re"
-               { ++depth;
-                                 fatal("ambiguous /* found");
-                                 goto comment; }
-#line 1039 "scanner.cc"
+#line 405 "scanner.re"
+               {
+                                       ++depth;
+                                       fatal("ambiguous /* found");
+                                       goto comment;
+                               }
+#line 1128 "scanner.cc"
 yy171:
                ++YYCURSOR;
-#line 317 "scanner.re"
-               { if(--depth == 0)
-                                       goto scan;
-                                   else
-                                       goto comment; }
-#line 1047 "scanner.cc"
+#line 395 "scanner.re"
+               {
+                                       if(--depth == 0)
+                                       {
+                                               goto scan;
+                                       }
+                                       else
+                                       {
+                                               goto comment;
+                                       }
+                               }
+#line 1142 "scanner.cc"
        }
 }
-#line 330 "scanner.re"
+#line 426 "scanner.re"
 
 
 config:
@@ -1086,7 +1181,7 @@ config:
                  0,   0,   0,   0,   0,   0,   0,   0, 
        };
 
-#line 1090 "scanner.cc"
+#line 1185 "scanner.cc"
        {
                YYCTYPE yych;
                if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1103,25 +1198,30 @@ yy175:
                yych = *YYCURSOR;
                goto yy184;
 yy176:
-#line 334 "scanner.re"
-               { goto config; }
-#line 1109 "scanner.cc"
+#line 430 "scanner.re"
+               {
+                                       goto config;
+                               }
+#line 1206 "scanner.cc"
 yy177:
                ++YYCURSOR;
                yych = *YYCURSOR;
                goto yy182;
 yy178:
-#line 335 "scanner.re"
-               { iscfg = 2;
-                                 cur = cursor;
-                                 RETURN('='); 
+#line 433 "scanner.re"
+               {
+                                       iscfg = 2;
+                                       cur = cursor;
+                                       RETURN('=');
                                }
-#line 1120 "scanner.cc"
+#line 1218 "scanner.cc"
 yy179:
                ++YYCURSOR;
-#line 339 "scanner.re"
-               { fatal("missing '='"); }
-#line 1125 "scanner.cc"
+#line 438 "scanner.re"
+               {
+                                       fatal("missing '='");
+                               }
+#line 1225 "scanner.cc"
 yy181:
                ++YYCURSOR;
                if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1141,7 +1241,7 @@ yy184:
                goto yy176;
        }
 }
-#line 340 "scanner.re"
+#line 441 "scanner.re"
 
 
 value:
@@ -1181,7 +1281,7 @@ value:
                248, 248, 248, 248, 248, 248, 248, 248, 
        };
 
-#line 1185 "scanner.cc"
+#line 1285 "scanner.cc"
        {
                YYCTYPE yych;
                if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1214,26 +1314,28 @@ value:
                        }
                }
 yy187:
-#line 349 "scanner.re"
-               { cur = cursor;
-                                 yylval.str = new Str(token());
-                                 iscfg = 0;
-                                 return VALUE;
+#line 451 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.str = new Str(token());
+                                       iscfg = 0;
+                                       return VALUE;
                                }
-#line 1224 "scanner.cc"
+#line 1325 "scanner.cc"
 yy188:
                ++YYCURSOR;
                if(yybm[0+(yych = *YYCURSOR)] & 8) {
                        goto yy193;
                }
 yy189:
-#line 344 "scanner.re"
-               { cur = cursor;
-                                 yylval.number = atoi(token().to_string().c_str());
-                                 iscfg = 0;
-                                 return NUMBER;
+#line 445 "scanner.re"
+               {
+                                       cur = cursor;
+                                       yylval.number = atoi(token().to_string().c_str());
+                                       iscfg = 0;
+                                       return NUMBER;
                                }
-#line 1237 "scanner.cc"
+#line 1339 "scanner.cc"
 yy190:
                yych = *++YYCURSOR;
                if(yych <= '0') goto yy194;
@@ -1377,7 +1479,7 @@ yy208:
                goto yy205;
        }
 }
-#line 354 "scanner.re"
+#line 457 "scanner.re"
 
 }
 
@@ -1387,7 +1489,7 @@ void Scanner::fatal(uint ofs, const char *msg) const
        std::cerr << "re2c: error: "
                << "line " << tline << ", column " << (tchar + ofs + 1) << ": "
                << msg << std::endl;
-       exit(1);
+       exit(1);
 }
 
 Scanner::~Scanner()