Repeat after me: test compile before commit.

Side note: there's a bug in cleanup.pl; it mistakenly deleted the yyaccept
when it shouldn't have.

svn path=/trunk/yasm/; revision=1036

diff --git a/tools/re2c/bootstrap/scanner.c b/tools/re2c/bootstrap/scanner.c
index 5c9413d11a9c9ccf38a4820b2d7e7a036507087a..7279742751349d2cd683a8a625d277404b62a100 100644 (file)
--- a/tools/re2c/bootstrap/scanner.c
+++ b/tools/re2c/bootstrap/scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.1-C on Thu Aug 14 20:33:10 2003
+/* Generated by re2c 0.9.1-C on Thu Aug 14 20:37:33 2003
  */
 #line 1 "scanner.re"
 #include <config.h>
@@ -81,7 +81,7 @@ Scanner_echo(Scanner *s, FILE *out)
     s->tok = cursor;
 echo:
 
-#line 85 "re2c-out.c"
+#line 85 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -98,7 +98,7 @@ yy0:
 yy3:
 #line 96 "scanner.re"
 { goto echo; }
-#line 102 "re2c-out.c"
+#line 102 "scanner.c"
 yy4:   yych = *++YYCURSOR;
 
 #line 92 "scanner.re"
@@ -106,7 +106,7 @@ yy4:        yych = *++YYCURSOR;
                                  fwrite(s->tok, 1, cursor - s->tok, out);
                                  s->tok = s->pos = cursor; s->cline++; oline++;
                                  goto echo; }
-#line 110 "re2c-out.c"
+#line 110 "scanner.c"
 yy6:   yych = *++YYCURSOR;
        goto yy3;
 yy7:   yych = *++YYCURSOR;
@@ -129,7 +129,7 @@ yy9:        yych = *++YYCURSOR;
 { fwrite(s->tok, 1, &cursor[-7] - s->tok, out);
                                  s->tok = cursor;
                                  RETURN(1); }
-#line 133 "re2c-out.c"
+#line 133 "scanner.c"
 }
 #line 97 "scanner.re"
 
@@ -147,7 +147,7 @@ scan:
     s->tline = s->cline;
     s->tok = cursor;
 
-#line 151 "re2c-out.c"
+#line 151 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -207,34 +207,34 @@ yy17:     yych = *++YYCURSOR;
 { depth = 1;
                                  goto code;
                                }
-#line 211 "re2c-out.c"
+#line 211 "scanner.c"
 yy19:  yych = *++YYCURSOR;
        if(yych == '*') goto yy54;
 yy20:
 #line 131 "scanner.re"
 { RETURN(*s->tok); }
-#line 217 "re2c-out.c"
+#line 217 "scanner.c"
 yy21:  yych = *++YYCURSOR;
        if(yych == '/') goto yy52;
 yy22:
 #line 133 "scanner.re"
 { yylval.op = *s->tok;
                                  RETURN(CLOSE); }
-#line 224 "re2c-out.c"
+#line 224 "scanner.c"
 yy23:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy48;
 yy24:
 #line 124 "scanner.re"
 { Scanner_fatal(s, "bad string"); }
-#line 231 "re2c-out.c"
+#line 231 "scanner.c"
 yy25:  yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy42;
 yy26:
 #line 129 "scanner.re"
 { Scanner_fatal(s, "bad character constant"); }
-#line 238 "re2c-out.c"
+#line 238 "scanner.c"
 yy27:  yych = *++YYCURSOR;
        goto yy20;
 yy28:  yych = *++YYCURSOR;
@@ -248,13 +248,13 @@ yy30:
                                  substr = Scanner_token(s);
                                  yylval.symbol = Symbol_find(&substr);
                                  return ID; }
-#line 252 "re2c-out.c"
+#line 252 "scanner.c"
 yy31:  yych = *++YYCURSOR;
        goto yy38;
 yy32:
 #line 142 "scanner.re"
 { goto scan; }
-#line 258 "re2c-out.c"
+#line 258 "scanner.c"
 yy33:  yych = *++YYCURSOR;
 
 #line 144 "scanner.re"
@@ -262,14 +262,14 @@ yy33:     yych = *++YYCURSOR;
                                  s->pos = cursor; s->cline++;
                                  goto scan;
                                }
-#line 266 "re2c-out.c"
+#line 266 "scanner.c"
 yy35:  yych = *++YYCURSOR;
 
 #line 149 "scanner.re"
 { fprintf(stderr, "unexpected character: '%c'\n", *s->tok);
                                  goto scan;
                                }
-#line 273 "re2c-out.c"
+#line 273 "scanner.c"
 yy37:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -315,7 +315,7 @@ yy45:       yych = *++YYCURSOR;
 { s->cur = cursor;
                                  yylval.regexp = ranToRE(Scanner_token(s));
                                  return RANGE; }
-#line 319 "re2c-out.c"
+#line 319 "scanner.c"
 yy47:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -337,29 +337,29 @@ yy50:     yych = *++YYCURSOR;
 { s->cur = cursor;
                                  yylval.regexp = strToRE(Scanner_token(s));
                                  return STRING; }
-#line 341 "re2c-out.c"
+#line 341 "scanner.c"
 yy52:  yych = *++YYCURSOR;
 
 #line 118 "scanner.re"
 { s->tok = cursor;
                                  RETURN(0); }
-#line 347 "re2c-out.c"
+#line 347 "scanner.c"
 yy54:  yych = *++YYCURSOR;
 
 #line 115 "scanner.re"
 { depth = 1;
                                  goto comment; }
-#line 353 "re2c-out.c"
+#line 353 "scanner.c"
 }
 #line 152 "scanner.re"
 
 
 code:
 
-#line 360 "re2c-out.c"
+#line 360 "scanner.c"
 {
        YYCTYPE yych;
-
+       unsigned int yyaccept;
        goto yy56;
        ++YYCURSOR;
 yy56:
@@ -391,13 +391,13 @@ yy56:
                                        return CODE;
                                  }
                                  goto code; }
-#line 395 "re2c-out.c"
+#line 395 "scanner.c"
 yy60:  yych = *++YYCURSOR;
 
 #line 162 "scanner.re"
 { ++depth;
                                  goto code; }
-#line 401 "re2c-out.c"
+#line 401 "scanner.c"
 yy62:  yych = *++YYCURSOR;
 
 #line 164 "scanner.re"
@@ -405,12 +405,12 @@ yy62:     yych = *++YYCURSOR;
                                  s->pos = cursor; s->cline++;
                                  goto code;
                                }
-#line 409 "re2c-out.c"
+#line 409 "scanner.c"
 yy64:  yych = *++YYCURSOR;
 yy65:
 #line 168 "scanner.re"
 { goto code; }
-#line 414 "re2c-out.c"
+#line 414 "scanner.c"
 yy66:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == '\n')        goto yy65;
@@ -459,7 +459,7 @@ yy73:       if(yych <= '!'){
 
 comment:
 
-#line 463 "re2c-out.c"
+#line 463 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -481,7 +481,7 @@ yy77:       yych = *++YYCURSOR;
 yy78:
 #line 183 "scanner.re"
 { goto comment; }
-#line 485 "re2c-out.c"
+#line 485 "scanner.c"
 yy79:  yych = *++YYCURSOR;
        if(yych == '*') goto yy83;
        goto yy78;
@@ -492,7 +492,7 @@ yy80:       yych = *++YYCURSOR;
                                  s->tok = s->pos = cursor; s->cline++;
                                  goto comment;
                                }
-#line 496 "re2c-out.c"
+#line 496 "scanner.c"
 yy82:  yych = *++YYCURSOR;
        goto yy78;
 yy83:  yych = *++YYCURSOR;
@@ -500,7 +500,7 @@ yy83:       yych = *++YYCURSOR;
 #line 177 "scanner.re"
 { ++depth;
                                  goto comment; }
-#line 504 "re2c-out.c"
+#line 504 "scanner.c"
 yy85:  yych = *++YYCURSOR;
 
 #line 173 "scanner.re"
@@ -508,7 +508,7 @@ yy85:       yych = *++YYCURSOR;
                                        goto scan;
                                    else
                                        goto comment; }
-#line 512 "re2c-out.c"
+#line 512 "scanner.c"
 }
 #line 184 "scanner.re"
 

diff --git a/tools/re2c/scanner.c b/tools/re2c/scanner.c
index 5c9413d11a9c9ccf38a4820b2d7e7a036507087a..7279742751349d2cd683a8a625d277404b62a100 100644 (file)
--- a/tools/re2c/scanner.c
+++ b/tools/re2c/scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.1-C on Thu Aug 14 20:33:10 2003
+/* Generated by re2c 0.9.1-C on Thu Aug 14 20:37:33 2003
  */
 #line 1 "scanner.re"
 #include <config.h>
@@ -81,7 +81,7 @@ Scanner_echo(Scanner *s, FILE *out)
     s->tok = cursor;
 echo:
 
-#line 85 "re2c-out.c"
+#line 85 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -98,7 +98,7 @@ yy0:
 yy3:
 #line 96 "scanner.re"
 { goto echo; }
-#line 102 "re2c-out.c"
+#line 102 "scanner.c"
 yy4:   yych = *++YYCURSOR;
 
 #line 92 "scanner.re"
@@ -106,7 +106,7 @@ yy4:        yych = *++YYCURSOR;
                                  fwrite(s->tok, 1, cursor - s->tok, out);
                                  s->tok = s->pos = cursor; s->cline++; oline++;
                                  goto echo; }
-#line 110 "re2c-out.c"
+#line 110 "scanner.c"
 yy6:   yych = *++YYCURSOR;
        goto yy3;
 yy7:   yych = *++YYCURSOR;
@@ -129,7 +129,7 @@ yy9:        yych = *++YYCURSOR;
 { fwrite(s->tok, 1, &cursor[-7] - s->tok, out);
                                  s->tok = cursor;
                                  RETURN(1); }
-#line 133 "re2c-out.c"
+#line 133 "scanner.c"
 }
 #line 97 "scanner.re"
 
@@ -147,7 +147,7 @@ scan:
     s->tline = s->cline;
     s->tok = cursor;
 
-#line 151 "re2c-out.c"
+#line 151 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -207,34 +207,34 @@ yy17:     yych = *++YYCURSOR;
 { depth = 1;
                                  goto code;
                                }
-#line 211 "re2c-out.c"
+#line 211 "scanner.c"
 yy19:  yych = *++YYCURSOR;
        if(yych == '*') goto yy54;
 yy20:
 #line 131 "scanner.re"
 { RETURN(*s->tok); }
-#line 217 "re2c-out.c"
+#line 217 "scanner.c"
 yy21:  yych = *++YYCURSOR;
        if(yych == '/') goto yy52;
 yy22:
 #line 133 "scanner.re"
 { yylval.op = *s->tok;
                                  RETURN(CLOSE); }
-#line 224 "re2c-out.c"
+#line 224 "scanner.c"
 yy23:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy48;
 yy24:
 #line 124 "scanner.re"
 { Scanner_fatal(s, "bad string"); }
-#line 231 "re2c-out.c"
+#line 231 "scanner.c"
 yy25:  yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych != '\n')        goto yy42;
 yy26:
 #line 129 "scanner.re"
 { Scanner_fatal(s, "bad character constant"); }
-#line 238 "re2c-out.c"
+#line 238 "scanner.c"
 yy27:  yych = *++YYCURSOR;
        goto yy20;
 yy28:  yych = *++YYCURSOR;
@@ -248,13 +248,13 @@ yy30:
                                  substr = Scanner_token(s);
                                  yylval.symbol = Symbol_find(&substr);
                                  return ID; }
-#line 252 "re2c-out.c"
+#line 252 "scanner.c"
 yy31:  yych = *++YYCURSOR;
        goto yy38;
 yy32:
 #line 142 "scanner.re"
 { goto scan; }
-#line 258 "re2c-out.c"
+#line 258 "scanner.c"
 yy33:  yych = *++YYCURSOR;
 
 #line 144 "scanner.re"
@@ -262,14 +262,14 @@ yy33:     yych = *++YYCURSOR;
                                  s->pos = cursor; s->cline++;
                                  goto scan;
                                }
-#line 266 "re2c-out.c"
+#line 266 "scanner.c"
 yy35:  yych = *++YYCURSOR;
 
 #line 149 "scanner.re"
 { fprintf(stderr, "unexpected character: '%c'\n", *s->tok);
                                  goto scan;
                                }
-#line 273 "re2c-out.c"
+#line 273 "scanner.c"
 yy37:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -315,7 +315,7 @@ yy45:       yych = *++YYCURSOR;
 { s->cur = cursor;
                                  yylval.regexp = ranToRE(Scanner_token(s));
                                  return RANGE; }
-#line 319 "re2c-out.c"
+#line 319 "scanner.c"
 yy47:  ++YYCURSOR;
        if(YYLIMIT == YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -337,29 +337,29 @@ yy50:     yych = *++YYCURSOR;
 { s->cur = cursor;
                                  yylval.regexp = strToRE(Scanner_token(s));
                                  return STRING; }
-#line 341 "re2c-out.c"
+#line 341 "scanner.c"
 yy52:  yych = *++YYCURSOR;
 
 #line 118 "scanner.re"
 { s->tok = cursor;
                                  RETURN(0); }
-#line 347 "re2c-out.c"
+#line 347 "scanner.c"
 yy54:  yych = *++YYCURSOR;
 
 #line 115 "scanner.re"
 { depth = 1;
                                  goto comment; }
-#line 353 "re2c-out.c"
+#line 353 "scanner.c"
 }
 #line 152 "scanner.re"
 
 
 code:
 
-#line 360 "re2c-out.c"
+#line 360 "scanner.c"
 {
        YYCTYPE yych;
-
+       unsigned int yyaccept;
        goto yy56;
        ++YYCURSOR;
 yy56:
@@ -391,13 +391,13 @@ yy56:
                                        return CODE;
                                  }
                                  goto code; }
-#line 395 "re2c-out.c"
+#line 395 "scanner.c"
 yy60:  yych = *++YYCURSOR;
 
 #line 162 "scanner.re"
 { ++depth;
                                  goto code; }
-#line 401 "re2c-out.c"
+#line 401 "scanner.c"
 yy62:  yych = *++YYCURSOR;
 
 #line 164 "scanner.re"
@@ -405,12 +405,12 @@ yy62:     yych = *++YYCURSOR;
                                  s->pos = cursor; s->cline++;
                                  goto code;
                                }
-#line 409 "re2c-out.c"
+#line 409 "scanner.c"
 yy64:  yych = *++YYCURSOR;
 yy65:
 #line 168 "scanner.re"
 { goto code; }
-#line 414 "re2c-out.c"
+#line 414 "scanner.c"
 yy66:  yyaccept = 0;
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == '\n')        goto yy65;
@@ -459,7 +459,7 @@ yy73:       if(yych <= '!'){
 
 comment:
 
-#line 463 "re2c-out.c"
+#line 463 "scanner.c"
 {
        YYCTYPE yych;
        unsigned int yyaccept;
@@ -481,7 +481,7 @@ yy77:       yych = *++YYCURSOR;
 yy78:
 #line 183 "scanner.re"
 { goto comment; }
-#line 485 "re2c-out.c"
+#line 485 "scanner.c"
 yy79:  yych = *++YYCURSOR;
        if(yych == '*') goto yy83;
        goto yy78;
@@ -492,7 +492,7 @@ yy80:       yych = *++YYCURSOR;
                                  s->tok = s->pos = cursor; s->cline++;
                                  goto comment;
                                }
-#line 496 "re2c-out.c"
+#line 496 "scanner.c"
 yy82:  yych = *++YYCURSOR;
        goto yy78;
 yy83:  yych = *++YYCURSOR;
@@ -500,7 +500,7 @@ yy83:       yych = *++YYCURSOR;
 #line 177 "scanner.re"
 { ++depth;
                                  goto comment; }
-#line 504 "re2c-out.c"
+#line 504 "scanner.c"
 yy85:  yych = *++YYCURSOR;
 
 #line 173 "scanner.re"
@@ -508,7 +508,7 @@ yy85:       yych = *++YYCURSOR;
                                        goto scan;
                                    else
                                        goto comment; }
-#line 512 "re2c-out.c"
+#line 512 "scanner.c"
 }
 #line 184 "scanner.re"