- Avoid unnecessary braces

diff --git a/re2c/actions.cc b/re2c/actions.cc
index c761298c42edaa8f1350edf930d1d1342c261392..6a8d675410e1bda20b08cd6e8bb137053af22eeb 100644 (file)
--- a/re2c/actions.cc
+++ b/re2c/actions.cc
@@ -1004,7 +1004,7 @@ CharSet::~CharSet()
        delete[] ptn;
 }
 
-void genCode(std::ostream& o, uint& ind, RegExp *re, const RegExpMap* specMap, const std::string& condName, bool isLastCond)
+void genCode(std::ostream& o, uint& ind, RegExp *re, const RegExpMap* specMap, const std::string& condName, bool isLastCond, bool &bPrologBrace)
 {
        CharSet cs;
        uint j;
@@ -1052,7 +1052,7 @@ void genCode(std::ostream& o, uint& ind, RegExp *re, const RegExpMap* specMap, c
        }
 
        DFA *dfa = new DFA(ins, re->size, 0, nRealChars, rep);
-       dfa->emit(o, ind, specMap, condName, isLastCond);
+       dfa->emit(o, ind, specMap, condName, isLastCond, bPrologBrace);
        delete dfa;
        delete [] ins;
        delete [] rep;

diff --git a/re2c/code.cc b/re2c/code.cc
index 4a05b45442f4c53bfd8beef3b38c5684d70ac82e..2fae957c44b07128b342fcb778f0b60151299105 100644 (file)
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -1475,7 +1475,7 @@ void DFA::findBaseState()
        delete [] span;
 }
 
-void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::string& condName, bool isLastCond)
+void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::string& condName, bool isLastCond, bool& bPrologBrace)
 {
        State *s;
        uint i;
@@ -1651,7 +1651,20 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
        if (bProlog)
        {
                o << "\n" << outputFileInfo;
-               o << indent(ind++) << "{\n";
+               if ((!fFlag && bUsedYYAccept)
+               ||  (!fFlag && bEmitYYCh)
+               ||  (bFlag && !cFlag && BitMap::first)
+               ||  (cFlag && !bWroteCondCheck && gFlag && !specMap->empty())
+               ||  (fFlag && !bWroteGetState && gFlag)
+               )
+               {
+                       bPrologBrace = true;
+                       o << indent(ind++) << "{\n";
+               }
+               else if (ind == 0)
+               {
+                       ind = 1;
+               }
        
                if (!fFlag)
                {
@@ -1691,19 +1704,16 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
                genCondGoto(o, ind, *specMap);
        }
 
-       if (cFlag)
+       if (cFlag && !condName.empty())
        {
-               if (!condName.empty())
-               {
-                       // TODO: Drop marker
-                       o << "/* *********************************** */\n";
-                       o << condPrefix << condName << ":\n";
-               }
-               if (bFlag && BitMap::first)
-               {
-                       o << indent(ind++) << "{\n";
-                       BitMap::gen(o, ind, lbChar, ubChar <= 256 ? ubChar : 256);
-               }
+               // TODO: Drop marker
+               o << "/* *********************************** */\n";
+               o << condPrefix << condName << ":\n";
+       }
+       if (cFlag && bFlag && BitMap::first)
+       {
+               o << indent(ind++) << "{\n";
+               BitMap::gen(o, ind, lbChar, ubChar <= 256 ? ubChar : 256);
        }
 
        // TODO: Shouldn't labels 0 and 1 be variable?
@@ -1726,7 +1736,7 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
                o << indent(--ind) << "}\n";
        }
        // Generate epilog
-       if (!cFlag || isLastCond)
+       if ((!cFlag || isLastCond) && bPrologBrace)
        {
                o << indent(--ind) << "}\n";
        }

diff --git a/re2c/dfa.h b/re2c/dfa.h
index 912b00821eb91c47800213ab73716aa27bd949ad..fb9a2e00948173fdd39b107fabb439128cbbee5f 100644 (file)
--- a/re2c/dfa.h
+++ b/re2c/dfa.h
@@ -266,7 +266,7 @@ public:
 
        void findSCCs();
        void findBaseState();
-       void emit(std::ostream&, uint&, const RegExpMap*, const std::string&, bool);
+       void emit(std::ostream&, uint&, const RegExpMap*, const std::string&, bool, bool&);
 
        friend std::ostream& operator<<(std::ostream&, const DFA&);
        friend std::ostream& operator<<(std::ostream&, const DFA*);

diff --git a/re2c/parser.y b/re2c/parser.y
index bc7cbd4ef554b0f9b5aed5e050c93055f3189f88..d48526b33004567b90404d9dff9dc6872cf91e51 100644 (file)
--- a/re2c/parser.y
+++ b/re2c/parser.y
@@ -385,6 +385,7 @@ void parse(Scanner& i, std::ostream& o, std::ostream* h)
        
        while(i.echo())
        {
+               bool bPrologBrace = false;
                yyparse();
                if (cFlag)
                {
@@ -423,7 +424,7 @@ void parse(Scanner& i, std::ostream& o, std::ostream* h)
                        for(it = specMap.begin(); it != specMap.end(); ++it)
                        {
                                assert(it->second.second);
-                               genCode(o, topIndent, it->second.second, &specMap, it->first, !--nCount);
+                               genCode(o, topIndent, it->second.second, &specMap, it->first, !--nCount, bPrologBrace);
                        }
                        if (h)
                        {
@@ -436,7 +437,7 @@ void parse(Scanner& i, std::ostream& o, std::ostream* h)
                }
                else if(spec)
                {
-                       genCode(o, topIndent, spec, NULL, "", 0);
+                       genCode(o, topIndent, spec, NULL, "", 0, bPrologBrace);
                }
                o << sourceFileInfo;
        }

diff --git a/re2c/re.h b/re2c/re.h
index 5852cf9248fa49d4cb9980ec072ec5d272674b66..d303bb69050c286543e0dbc0f1a2e2b5b0ff6d79 100644 (file)
--- a/re2c/re.h
+++ b/re2c/re.h
@@ -494,7 +494,7 @@ typedef std::map<std::string, NRegExp>  RegExpMap;
 typedef std::vector<std::string>        RegExpIndices;
 typedef std::list<RuleOp*>              RuleOpList;
 
-extern void genCode(std::ostream&, uint&, RegExp*, const RegExpMap*, const std::string&, bool);
+extern void genCode(std::ostream&, uint&, RegExp*, const RegExpMap*, const std::string&, bool, bool&);
 extern void genGetStateGoto(std::ostream&, uint&, uint);
 extern void genCondTable(std::ostream&, uint, const RegExpMap&);
 extern void genCondGoto(std::ostream&, uint, const RegExpMap&);

diff --git a/re2c/test/bug1472770.f.c b/re2c/test/bug1472770.f.c
index 28b3584a68067e943d79cc49fe9be3c196d000f9..4fafe0b6951cbc14d826bcfde5daa0a9e641b7d9 100755 (executable)
--- a/re2c/test/bug1472770.f.c
+++ b/re2c/test/bug1472770.f.c
@@ -26,7 +26,6 @@ int scan(char *p)
 start:
 
 #line 29 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -52,15 +51,14 @@ yy3:
                ++n;
                goto start;
        }
-#line 56 "<stdout>"
+#line 55 "<stdout>"
 yy5:
        ++YYCURSOR;
 #line 32 "bug1472770.f.re"
        {
                return n;
        }
-#line 63 "<stdout>"
-}
+#line 62 "<stdout>"
 #line 35 "bug1472770.f.re"
 
 }

diff --git a/re2c/test/condition_08.cbi.c b/re2c/test/condition_08.cbi.c
index 75e698b7bae99e559292e478928ccd2f426aa6a3..d2fc906db9cf8a751f647df2d19ff2965eb1aa13 100755 (executable)
--- a/re2c/test/condition_08.cbi.c
+++ b/re2c/test/condition_08.cbi.c
@@ -72,268 +72,266 @@ void scan(Scanner *s)
        {
                s->tok = s->cur;
 
-               {
-                       if (s->cond < 2) {
-                               if (s->cond < 1) {
-                                       goto yyc_Normal;
-                               } else {
-                                       goto yyc_Comment;
-                               }
+               if (s->cond < 2) {
+                       if (s->cond < 1) {
+                               goto yyc_Normal;
+                       } else {
+                               goto yyc_Comment;
+                       }
+               } else {
+                       if (s->cond < 3) {
+                               goto yyc_Skiptoeol;
                        } else {
-                               if (s->cond < 3) {
-                                       goto yyc_Skiptoeol;
-                               } else {
-                                       goto yyc_String;
-                               }
+                               goto yyc_String;
                        }
+               }
 /* *********************************** */
 yyc_Comment:
 
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
-                       s->yych = *s->cur;
-                       if(s->yych != '*') goto yy4;
-                       ++s->cur;
-                       if((s->yych = *s->cur) == '/') goto yy5;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
+               s->yych = *s->cur;
+               if(s->yych != '*') goto yy4;
+               ++s->cur;
+               if((s->yych = *s->cur) == '/') goto yy5;
 yy3:
-                       {
+               {
                                goto yyc_Comment;
                        }
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+               s->yych = *++s->cur;
+               goto yy3;
 yy5:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateNormal;
                                continue;
                        }
 /* *********************************** */
 yyc_Normal:
-                       if((s->lim - s->cur) < 4) if(fill(s, 4) >= 0) break;
-                       s->yych = *s->cur;
-                       if(s->yych <= '\'') {
-                               if(s->yych == '"') goto yy13;
-                               if(s->yych <= '&') goto yy15;
-                               goto yy12;
+               if((s->lim - s->cur) < 4) if(fill(s, 4) >= 0) break;
+               s->yych = *s->cur;
+               if(s->yych <= '\'') {
+                       if(s->yych == '"') goto yy13;
+                       if(s->yych <= '&') goto yy15;
+                       goto yy12;
+               } else {
+                       if(s->yych <= '/') {
+                               if(s->yych <= '.') goto yy15;
+                               goto yy11;
                        } else {
-                               if(s->yych <= '/') {
-                                       if(s->yych <= '.') goto yy15;
-                                       goto yy11;
-                               } else {
-                                       if(s->yych != '?') goto yy15;
-                               }
+                               if(s->yych != '?') goto yy15;
                        }
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy26;
+               }
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy26;
 yy10:
-                       {
+               {
                                fputc(*s->tok, stdout);
                                continue;
                        }
 yy11:
-                       s->yych = *++s->cur;
-                       if(s->yych == '*') goto yy24;
-                       if(s->yych == '/') goto yy22;
-                       goto yy10;
+               s->yych = *++s->cur;
+               if(s->yych == '*') goto yy24;
+               if(s->yych == '/') goto yy22;
+               goto yy10;
 yy12:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '"') goto yy16;
-                       if(s->yych == '\\') goto yy18;
-                       goto yy10;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '"') goto yy16;
+               if(s->yych == '\\') goto yy18;
+               goto yy10;
 yy13:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(*s->tok, stdout);
                                s->state = EStateString;
                                continue;
                        }
 yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
+               s->yych = *++s->cur;
+               goto yy10;
 yy16:
-                       s->yych = *++s->cur;
-                       if(s->yych == '\'') goto yy20;
+               s->yych = *++s->cur;
+               if(s->yych == '\'') goto yy20;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+               s->cur = s->tok;
+               goto yy10;
 yy18:
-                       s->yych = *++s->cur;
-                       if(s->yych != '"') goto yy17;
-                       s->yych = *++s->cur;
-                       if(s->yych != '\'') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '"') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '\'') goto yy17;
 yy20:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
 yy22:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateSkiptoeol;
                                goto yyc_Skiptoeol;
                        }
 yy24:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateComment;
                                goto yyc_Comment;
                        }
 yy26:
-                       s->yych = *++s->cur;
-                       switch(s->yych) {
-                       case '!':       goto yy41;
-                       case '\'':      goto yy39;
-                       case '(':       goto yy27;
-                       case ')':       goto yy29;
-                       case '-':       goto yy43;
-                       case '/':       goto yy37;
-                       case '<':       goto yy31;
-                       case '=':       goto yy35;
-                       case '>':       goto yy33;
-                       default:        goto yy17;
-                       }
+               s->yych = *++s->cur;
+               switch(s->yych) {
+               case '!':       goto yy41;
+               case '\'':      goto yy39;
+               case '(':       goto yy27;
+               case ')':       goto yy29;
+               case '-':       goto yy43;
+               case '/':       goto yy37;
+               case '<':       goto yy31;
+               case '=':       goto yy35;
+               case '>':       goto yy33;
+               default:        goto yy17;
+               }
 yy27:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('[', stdout);
                                continue;
                        }
 yy29:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(']', stdout);
                                continue;
                        }
 yy31:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('{', stdout);
                                continue;
                        }
 yy33:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('}', stdout);
                                continue;
                        }
 yy35:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('#', stdout);
                                continue;
                        }
 yy37:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('\\', stdout);
                                continue;
                        }
 yy39:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('^', stdout);
                                continue;
                        }
 yy41:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('|', stdout);
                                continue;
                        }
 yy43:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('~', stdout);
                                continue;
                        }
 /* *********************************** */
 yyc_Skiptoeol:
-                       if((s->lim - s->cur) < 5) if(fill(s, 5) >= 0) break;
-                       s->yych = *s->cur;
-                       if(s->yych <= '>') {
-                               if(s->yych == 0x0A) goto yy50;
-                               goto yy52;
-                       } else {
-                               if(s->yych <= '?') goto yy47;
-                               if(s->yych == '\\') goto yy49;
-                               goto yy52;
-                       }
+               if((s->lim - s->cur) < 5) if(fill(s, 5) >= 0) break;
+               s->yych = *s->cur;
+               if(s->yych <= '>') {
+                       if(s->yych == 0x0A) goto yy50;
+                       goto yy52;
+               } else {
+                       if(s->yych <= '?') goto yy47;
+                       if(s->yych == '\\') goto yy49;
+                       goto yy52;
+               }
 yy47:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy57;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy57;
 yy48:
-                       {
+               {
                                goto yyc_Skiptoeol;
                        }
 yy49:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == 0x0A) goto yy55;
-                       if(s->yych == 0x0D) goto yy53;
-                       goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == 0x0A) goto yy55;
+               if(s->yych == 0x0D) goto yy53;
+               goto yy48;
 yy50:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateNormal;
                                continue;
                        }
 yy52:
-                       s->yych = *++s->cur;
-                       goto yy48;
+               s->yych = *++s->cur;
+               goto yy48;
 yy53:
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy55;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy55;
 yy54:
-                       s->cur = s->tok;
-                       goto yy48;
+               s->cur = s->tok;
+               goto yy48;
 yy55:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 yy57:
-                       s->yych = *++s->cur;
-                       if(s->yych != '/') goto yy54;
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy60;
-                       if(s->yych != 0x0D) goto yy54;
-                       s->yych = *++s->cur;
-                       if(s->yych != 0x0A) goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych != '/') goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy60;
+               if(s->yych != 0x0D) goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych != 0x0A) goto yy54;
 yy60:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 /* *********************************** */
 yyc_String:
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
-                       s->yych = *s->cur;
-                       if(s->yych == '"') goto yy66;
-                       if(s->yych != '\\') goto yy68;
-                       ++s->cur;
-                       if((s->yych = *s->cur) != 0x0A) goto yy69;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
+               s->yych = *s->cur;
+               if(s->yych == '"') goto yy66;
+               if(s->yych != '\\') goto yy68;
+               ++s->cur;
+               if((s->yych = *s->cur) != 0x0A) goto yy69;
 yy65:
-                       {
+               {
                                fputc(*s->tok, stdout);
                                continue;
                        }
 yy66:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(*s->tok, stdout);
                                s->cond = EStateNormal;
                                continue;
                        }
 yy68:
-                       s->yych = *++s->cur;
-                       goto yy65;
+               s->yych = *++s->cur;
+               goto yy65;
 yy69:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl((const char*)s->tok, 2, stdout);
                                continue;
                        }
-               }
 
        }
 }

diff --git a/re2c/test/condition_08.cbif.c b/re2c/test/condition_08.cbif.c
index d460715f48314beeccc0a31b17aa3aa5f1fbd5cd..eae138f754e075d2380029777d5da5401244dbfc 100755 (executable)
--- a/re2c/test/condition_08.cbif.c
+++ b/re2c/test/condition_08.cbif.c
@@ -72,295 +72,293 @@ void scan(Scanner *s)
        {
                s->tok = s->cur;
 
-               {
 
-                       if (s->state < 1) {
-                               if (s->state < 0) {
-                                       goto yy0;
-                               } else {
-                                       goto yyFillLabel0;
-                               }
+               if (s->state < 1) {
+                       if (s->state < 0) {
+                               goto yy0;
                        } else {
-                               if (s->state < 2) {
-                                       goto yyFillLabel1;
+                               goto yyFillLabel0;
+                       }
+               } else {
+                       if (s->state < 2) {
+                               goto yyFillLabel1;
+                       } else {
+                               if (s->state < 3) {
+                                       goto yyFillLabel2;
                                } else {
-                                       if (s->state < 3) {
-                                               goto yyFillLabel2;
-                                       } else {
-                                               goto yyFillLabel3;
-                                       }
+                                       goto yyFillLabel3;
                                }
                        }
+               }
 yy0:
-                       if (s->cond < 2) {
-                               if (s->cond < 1) {
-                                       goto yyc_Normal;
-                               } else {
-                                       goto yyc_Comment;
-                               }
+               if (s->cond < 2) {
+                       if (s->cond < 1) {
+                               goto yyc_Normal;
                        } else {
-                               if (s->cond < 3) {
-                                       goto yyc_Skiptoeol;
-                               } else {
-                                       goto yyc_String;
-                               }
+                               goto yyc_Comment;
+                       }
+               } else {
+                       if (s->cond < 3) {
+                               goto yyc_Skiptoeol;
+                       } else {
+                               goto yyc_String;
                        }
+               }
 /* *********************************** */
 yyc_Comment:
 
-                       s->state = 0;
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
+               s->state = 0;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
 yyFillLabel0:
-                       s->yych = *s->cur;
-                       if(s->yych != '*') goto yy4;
-                       ++s->cur;
-                       if((s->yych = *s->cur) == '/') goto yy5;
+               s->yych = *s->cur;
+               if(s->yych != '*') goto yy4;
+               ++s->cur;
+               if((s->yych = *s->cur) == '/') goto yy5;
 yy3:
-                       {
+               {
                                goto yyc_Comment;
                        }
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+               s->yych = *++s->cur;
+               goto yy3;
 yy5:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateNormal;
                                continue;
                        }
 /* *********************************** */
 yyc_Normal:
-                       s->state = 1;
-                       if((s->lim - s->cur) < 4) if(fill(s, 4) >= 0) break;
+               s->state = 1;
+               if((s->lim - s->cur) < 4) if(fill(s, 4) >= 0) break;
 yyFillLabel1:
-                       s->yych = *s->cur;
-                       if(s->yych <= '\'') {
-                               if(s->yych == '"') goto yy13;
-                               if(s->yych <= '&') goto yy15;
-                               goto yy12;
+               s->yych = *s->cur;
+               if(s->yych <= '\'') {
+                       if(s->yych == '"') goto yy13;
+                       if(s->yych <= '&') goto yy15;
+                       goto yy12;
+               } else {
+                       if(s->yych <= '/') {
+                               if(s->yych <= '.') goto yy15;
+                               goto yy11;
                        } else {
-                               if(s->yych <= '/') {
-                                       if(s->yych <= '.') goto yy15;
-                                       goto yy11;
-                               } else {
-                                       if(s->yych != '?') goto yy15;
-                               }
+                               if(s->yych != '?') goto yy15;
                        }
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy26;
+               }
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy26;
 yy10:
-                       {
+               {
                                fputc(*s->tok, stdout);
                                continue;
                        }
 yy11:
-                       s->yych = *++s->cur;
-                       if(s->yych == '*') goto yy24;
-                       if(s->yych == '/') goto yy22;
-                       goto yy10;
+               s->yych = *++s->cur;
+               if(s->yych == '*') goto yy24;
+               if(s->yych == '/') goto yy22;
+               goto yy10;
 yy12:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '"') goto yy16;
-                       if(s->yych == '\\') goto yy18;
-                       goto yy10;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '"') goto yy16;
+               if(s->yych == '\\') goto yy18;
+               goto yy10;
 yy13:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(*s->tok, stdout);
                                s->state = EStateString;
                                continue;
                        }
 yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
+               s->yych = *++s->cur;
+               goto yy10;
 yy16:
-                       s->yych = *++s->cur;
-                       if(s->yych == '\'') goto yy20;
+               s->yych = *++s->cur;
+               if(s->yych == '\'') goto yy20;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+               s->cur = s->tok;
+               goto yy10;
 yy18:
-                       s->yych = *++s->cur;
-                       if(s->yych != '"') goto yy17;
-                       s->yych = *++s->cur;
-                       if(s->yych != '\'') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '"') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '\'') goto yy17;
 yy20:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
 yy22:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateSkiptoeol;
                                goto yyc_Skiptoeol;
                        }
 yy24:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateComment;
                                goto yyc_Comment;
                        }
 yy26:
-                       s->yych = *++s->cur;
-                       switch(s->yych) {
-                       case '!':       goto yy41;
-                       case '\'':      goto yy39;
-                       case '(':       goto yy27;
-                       case ')':       goto yy29;
-                       case '-':       goto yy43;
-                       case '/':       goto yy37;
-                       case '<':       goto yy31;
-                       case '=':       goto yy35;
-                       case '>':       goto yy33;
-                       default:        goto yy17;
-                       }
+               s->yych = *++s->cur;
+               switch(s->yych) {
+               case '!':       goto yy41;
+               case '\'':      goto yy39;
+               case '(':       goto yy27;
+               case ')':       goto yy29;
+               case '-':       goto yy43;
+               case '/':       goto yy37;
+               case '<':       goto yy31;
+               case '=':       goto yy35;
+               case '>':       goto yy33;
+               default:        goto yy17;
+               }
 yy27:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('[', stdout);
                                continue;
                        }
 yy29:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(']', stdout);
                                continue;
                        }
 yy31:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('{', stdout);
                                continue;
                        }
 yy33:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('}', stdout);
                                continue;
                        }
 yy35:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('#', stdout);
                                continue;
                        }
 yy37:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('\\', stdout);
                                continue;
                        }
 yy39:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('^', stdout);
                                continue;
                        }
 yy41:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('|', stdout);
                                continue;
                        }
 yy43:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('~', stdout);
                                continue;
                        }
 /* *********************************** */
 yyc_Skiptoeol:
-                       s->state = 2;
-                       if((s->lim - s->cur) < 5) if(fill(s, 5) >= 0) break;
+               s->state = 2;
+               if((s->lim - s->cur) < 5) if(fill(s, 5) >= 0) break;
 yyFillLabel2:
-                       s->yych = *s->cur;
-                       if(s->yych <= '>') {
-                               if(s->yych == 0x0A) goto yy50;
-                               goto yy52;
-                       } else {
-                               if(s->yych <= '?') goto yy47;
-                               if(s->yych == '\\') goto yy49;
-                               goto yy52;
-                       }
+               s->yych = *s->cur;
+               if(s->yych <= '>') {
+                       if(s->yych == 0x0A) goto yy50;
+                       goto yy52;
+               } else {
+                       if(s->yych <= '?') goto yy47;
+                       if(s->yych == '\\') goto yy49;
+                       goto yy52;
+               }
 yy47:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy57;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy57;
 yy48:
-                       {
+               {
                                goto yyc_Skiptoeol;
                        }
 yy49:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == 0x0A) goto yy55;
-                       if(s->yych == 0x0D) goto yy53;
-                       goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == 0x0A) goto yy55;
+               if(s->yych == 0x0D) goto yy53;
+               goto yy48;
 yy50:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                s->cond = EStateNormal;
                                continue;
                        }
 yy52:
-                       s->yych = *++s->cur;
-                       goto yy48;
+               s->yych = *++s->cur;
+               goto yy48;
 yy53:
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy55;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy55;
 yy54:
-                       s->cur = s->tok;
-                       goto yy48;
+               s->cur = s->tok;
+               goto yy48;
 yy55:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 yy57:
-                       s->yych = *++s->cur;
-                       if(s->yych != '/') goto yy54;
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy60;
-                       if(s->yych != 0x0D) goto yy54;
-                       s->yych = *++s->cur;
-                       if(s->yych != 0x0A) goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych != '/') goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy60;
+               if(s->yych != 0x0D) goto yy54;
+               s->yych = *++s->cur;
+               if(s->yych != 0x0A) goto yy54;
 yy60:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 /* *********************************** */
 yyc_String:
-                       s->state = 3;
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
+               s->state = 3;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
 yyFillLabel3:
-                       s->yych = *s->cur;
-                       if(s->yych == '"') goto yy66;
-                       if(s->yych != '\\') goto yy68;
-                       ++s->cur;
-                       if((s->yych = *s->cur) != 0x0A) goto yy69;
+               s->yych = *s->cur;
+               if(s->yych == '"') goto yy66;
+               if(s->yych != '\\') goto yy68;
+               ++s->cur;
+               if((s->yych = *s->cur) != 0x0A) goto yy69;
 yy65:
-                       {
+               {
                                fputc(*s->tok, stdout);
                                continue;
                        }
 yy66:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(*s->tok, stdout);
                                s->cond = EStateNormal;
                                continue;
                        }
 yy68:
-                       s->yych = *++s->cur;
-                       goto yy65;
+               s->yych = *++s->cur;
+               goto yy65;
 yy69:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl((const char*)s->tok, 2, stdout);
                                continue;
                        }
-               }
 
        }
 }

diff --git a/re2c/test/condition_09.cbif.c b/re2c/test/condition_09.cbif.c
index 92975e872b6f870c48a09d8db3ea038dabecdbf6..fdd2f1e5212da03197088876bdc7a9102c1c26bb 100755 (executable)
--- a/re2c/test/condition_09.cbif.c
+++ b/re2c/test/condition_09.cbif.c
@@ -99,294 +99,292 @@ void scan(Scanner *s)
        {
                s->tok = s->cur;
 
-               {
 
 yy0:
-                       if (s->cond < 2) {
-                               if (s->cond < 1) {
-                                       goto yyc_Normal;
-                               } else {
-                                       goto yyc_Comment;
-                               }
+               if (s->cond < 2) {
+                       if (s->cond < 1) {
+                               goto yyc_Normal;
+                       } else {
+                               goto yyc_Comment;
+                       }
+               } else {
+                       if (s->cond < 3) {
+                               goto yyc_Skiptoeol;
                        } else {
-                               if (s->cond < 3) {
-                                       goto yyc_Skiptoeol;
-                               } else {
-                                       goto yyc_String;
-                               }
+                               goto yyc_String;
                        }
+               }
 /* *********************************** */
 yyc_Comment:
 
-                       s->state = 0;
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) == ~0) break;
+               s->state = 0;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) == ~0) break;
 yyFillLabel0:
-                       s->yych = *s->cur;
-                       if(s->yych != '*') goto yy4;
-                       ++s->cur;
-                       if((s->yych = *s->cur) == '/') goto yy5;
+               s->yych = *s->cur;
+               if(s->yych != '*') goto yy4;
+               ++s->cur;
+               if((s->yych = *s->cur) == '/') goto yy5;
 yy3:
-                       {
+               {
                                goto yyc_Comment;
                        }
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+               s->yych = *++s->cur;
+               goto yy3;
 yy5:
-                       ++s->cur;
-                       s->cond = EStateNormal;
-                       {
+               ++s->cur;
+               s->cond = EStateNormal;
+               {
                                continue;
                        }
 /* *********************************** */
 yyc_Normal:
-                       s->state = 1;
-                       if((s->lim - s->cur) < 4) if(fill(s, 4) == ~0) break;
+               s->state = 1;
+               if((s->lim - s->cur) < 4) if(fill(s, 4) == ~0) break;
 yyFillLabel1:
-                       s->yych = *s->cur;
-                       if(s->yych <= '\'') {
-                               if(s->yych == '"') goto yy13;
-                               if(s->yych <= '&') goto yy15;
-                               goto yy12;
+               s->yych = *s->cur;
+               if(s->yych <= '\'') {
+                       if(s->yych == '"') goto yy13;
+                       if(s->yych <= '&') goto yy15;
+                       goto yy12;
+               } else {
+                       if(s->yych <= '/') {
+                               if(s->yych <= '.') goto yy15;
+                               goto yy11;
                        } else {
-                               if(s->yych <= '/') {
-                                       if(s->yych <= '.') goto yy15;
-                                       goto yy11;
-                               } else {
-                                       if(s->yych != '?') goto yy15;
-                               }
+                               if(s->yych != '?') goto yy15;
                        }
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy26;
+               }
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy26;
 yy10:
-                       {
+               {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
 yy11:
-                       s->yych = *++s->cur;
-                       if(s->yych == '*') goto yy24;
-                       if(s->yych == '/') goto yy22;
-                       goto yy10;
+               s->yych = *++s->cur;
+               if(s->yych == '*') goto yy24;
+               if(s->yych == '/') goto yy22;
+               goto yy10;
 yy12:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '"') goto yy16;
-                       if(s->yych == '\\') goto yy18;
-                       goto yy10;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '"') goto yy16;
+               if(s->yych == '\\') goto yy18;
+               goto yy10;
 yy13:
-                       ++s->cur;
-                       s->cond = EStateString;
-                       {
+               ++s->cur;
+               s->cond = EStateString;
+               {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
 yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
+               s->yych = *++s->cur;
+               goto yy10;
 yy16:
-                       s->yych = *++s->cur;
-                       if(s->yych == '\'') goto yy20;
+               s->yych = *++s->cur;
+               if(s->yych == '\'') goto yy20;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+               s->cur = s->tok;
+               goto yy10;
 yy18:
-                       s->yych = *++s->cur;
-                       if(s->yych != '"') goto yy17;
-                       s->yych = *++s->cur;
-                       if(s->yych != '\'') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '"') goto yy17;
+               s->yych = *++s->cur;
+               if(s->yych != '\'') goto yy17;
 yy20:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
 yy22:
-                       ++s->cur;
-                       s->cond = EStateSkiptoeol;
-                       {
+               ++s->cur;
+               s->cond = EStateSkiptoeol;
+               {
                                goto yyc_Skiptoeol;
                        }
 yy24:
-                       ++s->cur;
-                       s->cond = EStateComment;
-                       {
+               ++s->cur;
+               s->cond = EStateComment;
+               {
                                goto yyc_Comment;
                        }
 yy26:
-                       s->yych = *++s->cur;
-                       switch(s->yych) {
-                       case '!':       goto yy41;
-                       case '\'':      goto yy39;
-                       case '(':       goto yy27;
-                       case ')':       goto yy29;
-                       case '-':       goto yy43;
-                       case '/':       goto yy37;
-                       case '<':       goto yy31;
-                       case '=':       goto yy35;
-                       case '>':       goto yy33;
-                       default:        goto yy17;
-                       }
+               s->yych = *++s->cur;
+               switch(s->yych) {
+               case '!':       goto yy41;
+               case '\'':      goto yy39;
+               case '(':       goto yy27;
+               case ')':       goto yy29;
+               case '-':       goto yy43;
+               case '/':       goto yy37;
+               case '<':       goto yy31;
+               case '=':       goto yy35;
+               case '>':       goto yy33;
+               default:        goto yy17;
+               }
 yy27:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('[', stdout);
                                continue;
                        }
 yy29:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc(']', stdout);
                                continue;
                        }
 yy31:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('{', stdout);
                                continue;
                        }
 yy33:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('}', stdout);
                                continue;
                        }
 yy35:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('#', stdout);
                                continue;
                        }
 yy37:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('\\', stdout);
                                continue;
                        }
 yy39:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('^', stdout);
                                continue;
                        }
 yy41:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('|', stdout);
                                continue;
                        }
 yy43:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputc('~', stdout);
                                continue;
                        }
 /* *********************************** */
 yyc_Skiptoeol:
-                       s->state = 2;
-                       if((s->lim - s->cur) < 5) if(fill(s, 5) == ~0) break;
+               s->state = 2;
+               if((s->lim - s->cur) < 5) if(fill(s, 5) == ~0) break;
 yyFillLabel2:
-                       s->yych = *s->cur;
-                       if(s->yych <= 0x0D) {
-                               if(s->yych == 0x0A) goto yy51;
-                               if(s->yych <= 0x0C) goto yy53;
-                               goto yy50;
+               s->yych = *s->cur;
+               if(s->yych <= 0x0D) {
+                       if(s->yych == 0x0A) goto yy51;
+                       if(s->yych <= 0x0C) goto yy53;
+                       goto yy50;
+               } else {
+                       if(s->yych <= '?') {
+                               if(s->yych <= '>') goto yy53;
                        } else {
-                               if(s->yych <= '?') {
-                                       if(s->yych <= '>') goto yy53;
-                               } else {
-                                       if(s->yych == '\\') goto yy49;
-                                       goto yy53;
-                               }
+                               if(s->yych == '\\') goto yy49;
+                               goto yy53;
                        }
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == '?') goto yy60;
+               }
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == '?') goto yy60;
 yy48:
-                       {
+               {
                                goto yyc_Skiptoeol;
                        }
 yy49:
-                       s->yych = *(s->tok = ++s->cur);
-                       if(s->yych == 0x0A) goto yy58;
-                       if(s->yych == 0x0D) goto yy56;
-                       goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if(s->yych == 0x0A) goto yy58;
+               if(s->yych == 0x0D) goto yy56;
+               goto yy48;
 yy50:
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy54;
-                       goto yy48;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy54;
+               goto yy48;
 yy51:
-                       ++s->cur;
-                       s->cond = EStateNormal;
-                       {
+               ++s->cur;
+               s->cond = EStateNormal;
+               {
                                fputc('\n', stdout);
                                continue;
                        }
 yy53:
-                       s->yych = *++s->cur;
-                       goto yy48;
+               s->yych = *++s->cur;
+               goto yy48;
 yy54:
-                       ++s->cur;
-                       s->cond = EStateNormal;
-                       {
+               ++s->cur;
+               s->cond = EStateNormal;
+               {
                                fputc('\r', stdout);
                                fputc('\n', stdout);
                                continue;
                        }
 yy56:
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy58;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy58;
 yy57:
-                       s->cur = s->tok;
-                       goto yy48;
+               s->cur = s->tok;
+               goto yy48;
 yy58:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 yy60:
-                       s->yych = *++s->cur;
-                       if(s->yych != '/') goto yy57;
-                       s->yych = *++s->cur;
-                       if(s->yych == 0x0A) goto yy63;
-                       if(s->yych != 0x0D) goto yy57;
-                       s->yych = *++s->cur;
-                       if(s->yych != 0x0A) goto yy57;
+               s->yych = *++s->cur;
+               if(s->yych != '/') goto yy57;
+               s->yych = *++s->cur;
+               if(s->yych == 0x0A) goto yy63;
+               if(s->yych != 0x0D) goto yy57;
+               s->yych = *++s->cur;
+               if(s->yych != 0x0A) goto yy57;
 yy63:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                goto yyc_Skiptoeol;
                        }
 /* *********************************** */
 yyc_String:
-                       s->state = 3;
-                       if((s->lim - s->cur) < 2) if(fill(s, 2) == ~0) break;
+               s->state = 3;
+               if((s->lim - s->cur) < 2) if(fill(s, 2) == ~0) break;
 yyFillLabel3:
-                       s->yych = *s->cur;
-                       if(s->yych == '"') goto yy69;
-                       if(s->yych != '\\') goto yy71;
-                       ++s->cur;
-                       if((s->yych = *s->cur) != 0x0A) goto yy72;
+               s->yych = *s->cur;
+               if(s->yych == '"') goto yy69;
+               if(s->yych != '\\') goto yy71;
+               ++s->cur;
+               if((s->yych = *s->cur) != 0x0A) goto yy72;
 yy68:
-                       {
+               {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
 yy69:
-                       ++s->cur;
-                       s->cond = EStateNormal;
-                       {
+               ++s->cur;
+               s->cond = EStateNormal;
+               {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
 yy71:
-                       s->yych = *++s->cur;
-                       goto yy68;
+               s->yych = *++s->cur;
+               goto yy68;
 yy72:
-                       ++s->cur;
-                       {
+               ++s->cur;
+               {
                                fputl((const char*)s->cur-2, 2, stdout);
                                continue;
                        }
-               }
 
        }
 }

diff --git a/re2c/test/config4a.f.c b/re2c/test/config4a.f.c
index 90adc3d9a4fa53754185acf12fc83c1c55e7c9e4..bc02e21d7a92a6d00be81644330bd653487716cd 100755 (executable)
--- a/re2c/test/config4a.f.c
+++ b/re2c/test/config4a.f.c
@@ -12,7 +12,6 @@ char *scan(char *p)
        char *q;
 
 #line 15 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -44,12 +43,12 @@ yy2:
 yy3:
 #line 13 "config4a.f.re"
        { return YYCURSOR; }
-#line 48 "<stdout>"
+#line 47 "<stdout>"
 yy4:
        ++YYCURSOR;
 #line 14 "config4a.f.re"
        { return NULL; }
-#line 53 "<stdout>"
+#line 52 "<stdout>"
 yy6:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -70,7 +69,6 @@ yy7:
        case '9':       goto yy6;
        default:        goto yy3;
        }
-}
 #line 15 "config4a.f.re"
 
 }

diff --git a/re2c/test/config4b.f.c b/re2c/test/config4b.f.c
index a7d9011921b5fb37751e88f62a8d1b650e890236..1bad6c882edc6a98c1935d55e155599e38f84f6f 100755 (executable)
--- a/re2c/test/config4b.f.c
+++ b/re2c/test/config4b.f.c
@@ -12,7 +12,6 @@ char *scan(char *p)
        char *q;
 
 #line 15 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: abort();
@@ -45,12 +44,12 @@ yy2:
 yy3:
 #line 13 "config4b.f.re"
        { return YYCURSOR; }
-#line 49 "<stdout>"
+#line 48 "<stdout>"
 yy4:
        ++YYCURSOR;
 #line 14 "config4b.f.re"
        { return NULL; }
-#line 54 "<stdout>"
+#line 53 "<stdout>"
 yy6:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -71,7 +70,6 @@ yy7:
        case '9':       goto yy6;
        default:        goto yy3;
        }
-}
 #line 15 "config4b.f.re"
 
 }

diff --git a/re2c/test/config4c.f.c b/re2c/test/config4c.f.c
index 8ea96112ca19cd0a8ba45abb84e276bef509aa3f..c52844748c4520c4032195829a3d92216323e240 100755 (executable)
--- a/re2c/test/config4c.f.c
+++ b/re2c/test/config4c.f.c
@@ -12,7 +12,6 @@ char *scan(char *p)
        char *q;
 
 #line 15 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -45,12 +44,12 @@ yy2:
 yy3:
 #line 14 "config4c.f.re"
        { return YYCURSOR; }
-#line 49 "<stdout>"
+#line 48 "<stdout>"
 yy4:
        ++YYCURSOR;
 #line 15 "config4c.f.re"
        { return NULL; }
-#line 54 "<stdout>"
+#line 53 "<stdout>"
 yy6:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -71,7 +70,6 @@ yy7:
        case '9':       goto yy6;
        default:        goto yy3;
        }
-}
 #line 16 "config4c.f.re"
 
 }

diff --git a/re2c/test/config4d.f.c b/re2c/test/config4d.f.c
index fb6a97c6e6c07a695325b37a586592afaf2c7a2f..fbaea51dfe1ad66aca29e1b497f5a42a98e92537 100755 (executable)
--- a/re2c/test/config4d.f.c
+++ b/re2c/test/config4d.f.c
@@ -12,7 +12,6 @@ char *scan(char *p)
        char *q;
 
 #line 15 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -46,12 +45,12 @@ yy2:
 yy3:
 #line 15 "config4d.f.re"
        { return YYCURSOR; }
-#line 50 "<stdout>"
+#line 49 "<stdout>"
 yy4:
        ++YYCURSOR;
 #line 16 "config4d.f.re"
        { return NULL; }
-#line 55 "<stdout>"
+#line 54 "<stdout>"
 yy6:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -72,7 +71,6 @@ yy7:
        case '9':       goto yy6;
        default:        goto yy3;
        }
-}
 #line 17 "config4d.f.re"
 
 }

diff --git a/re2c/test/config4e.f.c b/re2c/test/config4e.f.c
index 6dcb02c6b24f23a4bee7dc00a59b24239118fc93..27f7e3312b0395e4e4dc3c5046cc4f76626e9f8f 100755 (executable)
--- a/re2c/test/config4e.f.c
+++ b/re2c/test/config4e.f.c
@@ -12,7 +12,6 @@ char *scan(char *p)
        char *q;
 
 #line 15 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -45,12 +44,12 @@ yy2:
 yy3:
 #line 15 "config4e.f.re"
        { return YYCURSOR; }
-#line 49 "<stdout>"
+#line 48 "<stdout>"
 yy4:
        ++YYCURSOR;
 #line 16 "config4e.f.re"
        { return NULL; }
-#line 54 "<stdout>"
+#line 53 "<stdout>"
 yy6:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -71,7 +70,6 @@ yy7:
        case '9':       goto yy6;
        default:        goto yy3;
        }
-}
 #line 17 "config4e.f.re"
 
 }

diff --git a/re2c/test/config4f.f.c b/re2c/test/config4f.f.c
index 02e14a514b79668c7a9011b555de08f4aad698fe..dbc308182a623d8aa2e2181cda9e8d78569b3385 100755 (executable)
--- a/re2c/test/config4f.f.c
+++ b/re2c/test/config4f.f.c
@@ -22,59 +22,57 @@ char *scan(char *p)
 
 
 #line 25 "<stdout>"
-       {
 
 yy0:
-               YYSETSTATE(0);
-               if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
+       YYSETSTATE(0);
+       if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 yyFillLabel0:
-               yych = *YYCURSOR;
-               switch(yych) {
-               case '0':
-               case '1':
-               case '2':
-               case '3':
-               case '4':
-               case '5':
-               case '6':
-               case '7':
-               case '8':
-               case '9':       goto yy2;
-               default:        goto yy4;
-               }
+       yych = *YYCURSOR;
+       switch(yych) {
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':       goto yy2;
+       default:        goto yy4;
+       }
 yy2:
-               ++YYCURSOR;
-               yych = *YYCURSOR;
-               goto yy7;
+       ++YYCURSOR;
+       yych = *YYCURSOR;
+       goto yy7;
 yy3:
 #line 21 "config4f.f.re"
-               { return YYCURSOR; }
-#line 53 "<stdout>"
+       { return YYCURSOR; }
+#line 52 "<stdout>"
 yy4:
-               ++YYCURSOR;
+       ++YYCURSOR;
 #line 22 "config4f.f.re"
-               { return NULL; }
-#line 58 "<stdout>"
+       { return NULL; }
+#line 57 "<stdout>"
 yy6:
-               ++YYCURSOR;
-               YYSETSTATE(1);
-               if(YYLIMIT == YYCURSOR) YYFILL(1);
+       ++YYCURSOR;
+       YYSETSTATE(1);
+       if(YYLIMIT == YYCURSOR) YYFILL(1);
 yyFillLabel1:
-               yych = *YYCURSOR;
+       yych = *YYCURSOR;
 yy7:
-               switch(yych) {
-               case '0':
-               case '1':
-               case '2':
-               case '3':
-               case '4':
-               case '5':
-               case '6':
-               case '7':
-               case '8':
-               case '9':       goto yy6;
-               default:        goto yy3;
-               }
+       switch(yych) {
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':       goto yy6;
+       default:        goto yy3;
        }
 #line 23 "config4f.f.re"
 

diff --git a/re2c/test/push.f.c b/re2c/test/push.f.c
index 3e11b154ec09a3be7c931e8dba1bb9f5e7ccea78..00983b945038ca066ae982e43063a3bd18d1558e 100755 (executable)
--- a/re2c/test/push.f.c
+++ b/re2c/test/push.f.c
@@ -230,7 +230,6 @@ public:
 
         
 #line 233 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -332,7 +331,7 @@ yy2:
 yy3:
 #line 246 "push.f.re"
        { SEND(kIdentifier);     }
-#line 336 "<stdout>"
+#line 335 "<stdout>"
 yy4:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -382,62 +381,62 @@ yy12:
 yy13:
 #line 247 "push.f.re"
        { SEND(kDecimalConstant);}
-#line 386 "<stdout>"
+#line 385 "<stdout>"
 yy14:
        ++YYCURSOR;
 #line 249 "push.f.re"
        { SEND(kEqual);          }
-#line 391 "<stdout>"
+#line 390 "<stdout>"
 yy16:
        ++YYCURSOR;
 #line 250 "push.f.re"
        { SEND(kLeftParen);      }
-#line 396 "<stdout>"
+#line 395 "<stdout>"
 yy18:
        ++YYCURSOR;
 #line 251 "push.f.re"
        { SEND(kRightParen);     }
-#line 401 "<stdout>"
+#line 400 "<stdout>"
 yy20:
        ++YYCURSOR;
 #line 252 "push.f.re"
        { SEND(kMinus);          }
-#line 406 "<stdout>"
+#line 405 "<stdout>"
 yy22:
        ++YYCURSOR;
 #line 253 "push.f.re"
        { SEND(kPlus);           }
-#line 411 "<stdout>"
+#line 410 "<stdout>"
 yy24:
        ++YYCURSOR;
 #line 254 "push.f.re"
        { SEND(kStar);           }
-#line 416 "<stdout>"
+#line 415 "<stdout>"
 yy26:
        ++YYCURSOR;
 #line 255 "push.f.re"
        { SEND(kSlash);          }
-#line 421 "<stdout>"
+#line 420 "<stdout>"
 yy28:
        ++YYCURSOR;
 #line 257 "push.f.re"
        { SKIP();                }
-#line 426 "<stdout>"
+#line 425 "<stdout>"
 yy30:
        ++YYCURSOR;
 #line 258 "push.f.re"
        { SKIP();                }
-#line 431 "<stdout>"
+#line 430 "<stdout>"
 yy32:
        ++YYCURSOR;
 #line 259 "push.f.re"
        { send(kEOF); return 1;  }
-#line 436 "<stdout>"
+#line 435 "<stdout>"
 yy34:
        ++YYCURSOR;
 #line 260 "push.f.re"
        { SEND(kUnknown);        }
-#line 441 "<stdout>"
+#line 440 "<stdout>"
 yy36:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -626,7 +625,7 @@ yy44:
 yy45:
 #line 245 "push.f.re"
        { SEND(kReturn);         }
-#line 630 "<stdout>"
+#line 629 "<stdout>"
 yy46:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -716,7 +715,7 @@ yy49:
 yy50:
 #line 244 "push.f.re"
        { SEND(kWhile);          }
-#line 720 "<stdout>"
+#line 719 "<stdout>"
 yy51:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -806,7 +805,7 @@ yy54:
 yy55:
 #line 243 "push.f.re"
        { SEND(kBreak);          }
-#line 810 "<stdout>"
+#line 809 "<stdout>"
 yy56:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -890,7 +889,7 @@ yy58:
 yy59:
 #line 242 "push.f.re"
        { SEND(kGoto);           }
-#line 894 "<stdout>"
+#line 893 "<stdout>"
 yy60:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -974,7 +973,7 @@ yy62:
 yy63:
 #line 241 "push.f.re"
        { SEND(kElse);           }
-#line 978 "<stdout>"
+#line 977 "<stdout>"
 yy64:
        yych = *++YYCURSOR;
        switch(yych) {
@@ -1052,7 +1051,7 @@ yy65:
 yy66:
 #line 240 "push.f.re"
        { SEND(kFor);            }
-#line 1056 "<stdout>"
+#line 1055 "<stdout>"
 yy67:
        ++YYCURSOR;
        switch((yych = *YYCURSOR)) {
@@ -1124,8 +1123,7 @@ yy67:
 yy68:
 #line 239 "push.f.re"
        { SEND(kIf);             }
-#line 1128 "<stdout>"
-}
+#line 1127 "<stdout>"
 #line 261 "push.f.re"
 
 

diff --git a/re2c/test/push.fs.c b/re2c/test/push.fs.c
index 1ab06daf561f83461b5e23c018078228f5a61c53..c7b0b68e74351ec0a45dba4bb04df842e4eb561b 100755 (executable)
--- a/re2c/test/push.fs.c
+++ b/re2c/test/push.fs.c
@@ -19,7 +19,6 @@ start:
 
     
 #line 22 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -114,7 +113,7 @@ yyFillLabel0:
 yy3:
 #line 35 "push.fs.re"
        { SEND(kIdentifier);     }
-#line 118 "<stdout>"
+#line 117 "<stdout>"
 yy4:
        yych = *++YYCURSOR;
        if(yych == 'o') goto yy64;
@@ -152,62 +151,62 @@ yy12:
 yy13:
 #line 36 "push.fs.re"
        { SEND(kDecimalConstant);}
-#line 156 "<stdout>"
+#line 155 "<stdout>"
 yy14:
        ++YYCURSOR;
 #line 38 "push.fs.re"
        { SEND(kEqual);          }
-#line 161 "<stdout>"
+#line 160 "<stdout>"
 yy16:
        ++YYCURSOR;
 #line 39 "push.fs.re"
        { SEND(kLeftParen);      }
-#line 166 "<stdout>"
+#line 165 "<stdout>"
 yy18:
        ++YYCURSOR;
 #line 40 "push.fs.re"
        { SEND(kRightParen);     }
-#line 171 "<stdout>"
+#line 170 "<stdout>"
 yy20:
        ++YYCURSOR;
 #line 41 "push.fs.re"
        { SEND(kMinus);          }
-#line 176 "<stdout>"
+#line 175 "<stdout>"
 yy22:
        ++YYCURSOR;
 #line 42 "push.fs.re"
        { SEND(kPlus);           }
-#line 181 "<stdout>"
+#line 180 "<stdout>"
 yy24:
        ++YYCURSOR;
 #line 43 "push.fs.re"
        { SEND(kStar);           }
-#line 186 "<stdout>"
+#line 185 "<stdout>"
 yy26:
        ++YYCURSOR;
 #line 44 "push.fs.re"
        { SEND(kSlash);          }
-#line 191 "<stdout>"
+#line 190 "<stdout>"
 yy28:
        ++YYCURSOR;
 #line 46 "push.fs.re"
        { SKIP();                }
-#line 196 "<stdout>"
+#line 195 "<stdout>"
 yy30:
        ++YYCURSOR;
 #line 47 "push.fs.re"
        { SKIP();                }
-#line 201 "<stdout>"
+#line 200 "<stdout>"
 yy32:
        ++YYCURSOR;
 #line 48 "push.fs.re"
        { send(kEOF); return 1;  }
-#line 206 "<stdout>"
+#line 205 "<stdout>"
 yy34:
        ++YYCURSOR;
 #line 49 "push.fs.re"
        { SEND(kUnknown);        }
-#line 211 "<stdout>"
+#line 210 "<stdout>"
 yy36:
        ++YYCURSOR;
        YYSETSTATE(1);
@@ -265,7 +264,7 @@ yy40:
 yy45:
 #line 34 "push.fs.re"
        { SEND(kReturn);         }
-#line 269 "<stdout>"
+#line 268 "<stdout>"
 yy46:
        yych = *++YYCURSOR;
        if(yych != 'i') goto yy39;
@@ -289,7 +288,7 @@ yy46:
 yy50:
 #line 33 "push.fs.re"
        { SEND(kWhile);          }
-#line 293 "<stdout>"
+#line 292 "<stdout>"
 yy51:
        yych = *++YYCURSOR;
        if(yych != 'e') goto yy39;
@@ -313,7 +312,7 @@ yy51:
 yy55:
 #line 32 "push.fs.re"
        { SEND(kBreak);          }
-#line 317 "<stdout>"
+#line 316 "<stdout>"
 yy56:
        yych = *++YYCURSOR;
        if(yych != 't') goto yy39;
@@ -335,7 +334,7 @@ yy56:
 yy59:
 #line 31 "push.fs.re"
        { SEND(kGoto);           }
-#line 339 "<stdout>"
+#line 338 "<stdout>"
 yy60:
        yych = *++YYCURSOR;
        if(yych != 's') goto yy39;
@@ -357,7 +356,7 @@ yy60:
 yy63:
 #line 30 "push.fs.re"
        { SEND(kElse);           }
-#line 361 "<stdout>"
+#line 360 "<stdout>"
 yy64:
        yych = *++YYCURSOR;
        if(yych != 'r') goto yy39;
@@ -377,7 +376,7 @@ yy64:
 yy66:
 #line 29 "push.fs.re"
        { SEND(kFor);            }
-#line 381 "<stdout>"
+#line 380 "<stdout>"
 yy67:
        ++YYCURSOR;
        if((yych = *YYCURSOR) <= 'Z') {
@@ -395,8 +394,7 @@ yy67:
 yy68:
 #line 28 "push.fs.re"
        { SEND(kIf);             }
-#line 399 "<stdout>"
-}
+#line 398 "<stdout>"
 #line 50 "push.fs.re"
 
 

diff --git a/re2c/test/scanner.fs.c b/re2c/test/scanner.fs.c
index 4c9d40a4b78567b9b72300492b521bb9b7d786e4..78dc928ada9645acd3953b6136004488f82fb143 100755 (executable)
--- a/re2c/test/scanner.fs.c
+++ b/re2c/test/scanner.fs.c
@@ -93,7 +93,6 @@ int Scanner::echo()
 echo:
 
 #line 96 "<stdout>"
-{
 
        switch(YYGETSTATE()) {
        default: goto yy0;
@@ -154,7 +153,7 @@ yy3:
        {
                                        goto echo;
                                }
-#line 158 "<stdout>"
+#line 157 "<stdout>"
 yy4:
        yych = *++YYCURSOR;
        if(yych == '/') goto yy10;
@@ -167,7 +166,7 @@ yy5:
                                        tok = pos = cursor; cline++;
                                        goto echo;
                                }
-#line 171 "<stdout>"
+#line 170 "<stdout>"
 yy7:
        ++YYCURSOR;
 #line 135 "scanner.fs.re"
@@ -177,7 +176,7 @@ yy7:
                                                RETURN(0);
                                        }
                                }
-#line 181 "<stdout>"
+#line 180 "<stdout>"
 yy9:
        yych = *++YYCURSOR;
        goto yy3;
@@ -193,7 +192,7 @@ yy10:
                                        tok = pos = cursor;
                                        goto echo;
                                }
-#line 197 "<stdout>"
+#line 196 "<stdout>"
 yy12:
        yych = *++YYCURSOR;
        if(yych == '!') goto yy14;
@@ -223,7 +222,7 @@ yy16:
                                        tok = cursor;
                                        RETURN(1);
                                }
-#line 227 "<stdout>"
+#line 226 "<stdout>"
 yy21:
        yych = *++YYCURSOR;
        if(yych != 'x') goto yy13;
@@ -245,8 +244,7 @@ yy21:
                                        ignore_eoc = true;
                                        goto echo;
                                }
-#line 249 "<stdout>"
-}
+#line 248 "<stdout>"
 #line 144 "scanner.fs.re"
 
 }
@@ -270,8 +268,7 @@ scan:
                goto value;
     }
 
-#line 274 "<stdout>"
-{
+#line 272 "<stdout>"
 
        YYSETSTATE(1);
        if((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
@@ -349,14 +346,14 @@ yy32:
        { depth = 1;
                                  goto code;
                                }
-#line 353 "<stdout>"
+#line 350 "<stdout>"
 yy33:
        ++YYCURSOR;
        if((yych = *YYCURSOR) == '*') goto yy92;
 yy34:
 #line 196 "scanner.fs.re"
        { RETURN(*tok); }
-#line 360 "<stdout>"
+#line 357 "<stdout>"
 yy35:
        ++YYCURSOR;
        if((yych = *YYCURSOR) == '/') goto yy90;
@@ -364,7 +361,7 @@ yy36:
 #line 198 "scanner.fs.re"
        { yylval.op = *tok;
                                  RETURN(CLOSE); }
-#line 368 "<stdout>"
+#line 365 "<stdout>"
 yy37:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -372,7 +369,7 @@ yy37:
 yy38:
 #line 183 "scanner.fs.re"
        { fatal("unterminated string constant (missing \")"); }
-#line 376 "<stdout>"
+#line 373 "<stdout>"
 yy39:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -380,7 +377,7 @@ yy39:
 yy40:
 #line 184 "scanner.fs.re"
        { fatal("unterminated string constant (missing ')"); }
-#line 384 "<stdout>"
+#line 381 "<stdout>"
 yy41:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -390,7 +387,7 @@ yy41:
 yy42:
 #line 194 "scanner.fs.re"
        { fatal("unterminated range (missing ])"); }
-#line 394 "<stdout>"
+#line 391 "<stdout>"
 yy43:
        yych = *++YYCURSOR;
        goto yy34;
@@ -406,7 +403,7 @@ yy46:
        { cur = cursor;
                                  yylval.symbol = Symbol::find(token());
                                  return ID; }
-#line 410 "<stdout>"
+#line 407 "<stdout>"
 yy47:
        yych = *++YYCURSOR;
        goto yy61;
@@ -417,7 +414,7 @@ yy48:
                                  yylval.regexp = mkDot();
                                  return RANGE;
                                }
-#line 421 "<stdout>"
+#line 418 "<stdout>"
 yy50:
        ++YYCURSOR;
        yych = *YYCURSOR;
@@ -425,7 +422,7 @@ yy50:
 yy51:
 #line 234 "scanner.fs.re"
        { goto scan; }
-#line 429 "<stdout>"
+#line 426 "<stdout>"
 yy52:
        ++YYCURSOR;
 yy53:
@@ -434,7 +431,7 @@ yy53:
                                  pos = cursor; cline++;
                                  goto scan;
                                }
-#line 438 "<stdout>"
+#line 435 "<stdout>"
 yy54:
        ++YYCURSOR;
        if((yych = *YYCURSOR) == 0x0A) goto yy57;
@@ -446,7 +443,7 @@ yy55:
                                  fatal(msg.str().c_str());
                                  goto scan;
                                }
-#line 450 "<stdout>"
+#line 447 "<stdout>"
 yy56:
        yych = *++YYCURSOR;
        goto yy55;
@@ -555,7 +552,7 @@ yy69:
                                  yylval.str = new Str(token());
                                  return CONFIG;
                                }
-#line 559 "<stdout>"
+#line 556 "<stdout>"
 yy70:
        ++YYCURSOR;
        YYSETSTATE(6);
@@ -599,7 +596,7 @@ yy75:
        { cur = cursor;
                                  yylval.regexp = ranToRE(token());
                                  return RANGE; }
-#line 603 "<stdout>"
+#line 600 "<stdout>"
 yy77:
        ++YYCURSOR;
        YYSETSTATE(9);
@@ -614,7 +611,7 @@ yy78:
        { cur = cursor;
                                  yylval.regexp = invToRE(token());
                                  return RANGE; }
-#line 618 "<stdout>"
+#line 615 "<stdout>"
 yy80:
        ++YYCURSOR;
        YYSETSTATE(10);
@@ -642,7 +639,7 @@ yy83:
        { cur = cursor;
                                  yylval.regexp = strToCaseInsensitiveRE(token());
                                  return STRING; }
-#line 646 "<stdout>"
+#line 643 "<stdout>"
 yy85:
        ++YYCURSOR;
        YYSETSTATE(12);
@@ -670,19 +667,19 @@ yy88:
        { cur = cursor;
                                  yylval.regexp = strToRE(token());
                                  return STRING; }
-#line 674 "<stdout>"
+#line 671 "<stdout>"
 yy90:
        ++YYCURSOR;
 #line 172 "scanner.fs.re"
        { tok = cursor;
                                  RETURN(0); }
-#line 680 "<stdout>"
+#line 677 "<stdout>"
 yy92:
        ++YYCURSOR;
 #line 169 "scanner.fs.re"
        { depth = 1;
                                  goto comment; }
-#line 686 "<stdout>"
+#line 683 "<stdout>"
 yy94:
        yych = *++YYCURSOR;
        if(yych == ',') goto yy108;
@@ -707,14 +704,14 @@ yy97:
 yy98:
 #line 216 "scanner.fs.re"
        { fatal("illegal closure form, use '{n}', '{n,}', '{n,m}' where n and m are numbers"); }
-#line 711 "<stdout>"
+#line 708 "<stdout>"
 yy99:
        ++YYCURSOR;
 #line 204 "scanner.fs.re"
        { yylval.extop.minsize = atoi((char *)tok+1);
                                  yylval.extop.maxsize = atoi((char *)tok+1);
                                  RETURN(CLOSESIZE); }
-#line 718 "<stdout>"
+#line 715 "<stdout>"
 yy101:
        yyaccept = 6;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -726,7 +723,7 @@ yy101:
        { yylval.extop.minsize = atoi((char *)tok+1);
                                  yylval.extop.maxsize = -1;
                                  RETURN(CLOSESIZE); }
-#line 730 "<stdout>"
+#line 727 "<stdout>"
 yy104:
        ++YYCURSOR;
        YYSETSTATE(15);
@@ -741,7 +738,7 @@ yyFillLabel15:
        { yylval.extop.minsize = atoi((char *)tok+1);
                                  yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1));
                                  RETURN(CLOSESIZE); }
-#line 745 "<stdout>"
+#line 742 "<stdout>"
 yy108:
        yyaccept = 6;
        yych = *(YYMARKER = ++YYCURSOR);
@@ -752,15 +749,13 @@ yy108:
 #line 201 "scanner.fs.re"
        { yylval.op = '*';
                                  RETURN(CLOSE); }
-#line 756 "<stdout>"
-}
+#line 753 "<stdout>"
 #line 247 "scanner.fs.re"
 
 
 code:
 
-#line 763 "<stdout>"
-{
+#line 759 "<stdout>"
 
        YYSETSTATE(16);
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -791,13 +786,13 @@ yyFillLabel16:
                                        return CODE;
                                  }
                                  goto code; }
-#line 795 "<stdout>"
+#line 790 "<stdout>"
 yy115:
        ++YYCURSOR;
 #line 257 "scanner.fs.re"
        { ++depth;
                                  goto code; }
-#line 801 "<stdout>"
+#line 796 "<stdout>"
 yy117:
        ++YYCURSOR;
 #line 259 "scanner.fs.re"
@@ -805,13 +800,13 @@ yy117:
                                  pos = cursor; cline++;
                                  goto code;
                                }
-#line 809 "<stdout>"
+#line 804 "<stdout>"
 yy119:
        ++YYCURSOR;
 yy120:
 #line 263 "scanner.fs.re"
        { goto code; }
-#line 815 "<stdout>"
+#line 810 "<stdout>"
 yy121:
        yych = *(YYMARKER = ++YYCURSOR);
        if(yych == 0x0A) goto yy120;
@@ -866,14 +861,12 @@ yyFillLabel20:
        yych = *YYCURSOR;
        if(yych == 0x0A) goto yy125;
        goto yy127;
-}
 #line 264 "scanner.fs.re"
 
 
 comment:
 
-#line 876 "<stdout>"
-{
+#line 870 "<stdout>"
 
        YYSETSTATE(21);
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -894,7 +887,7 @@ yy133:
 #line 279 "scanner.fs.re"
        { if(cursor == eof) RETURN(0);
                                  goto comment; }
-#line 898 "<stdout>"
+#line 891 "<stdout>"
 yy134:
        yych = *++YYCURSOR;
        if(yych == '*') goto yy138;
@@ -906,7 +899,7 @@ yy135:
                                  tok = pos = cursor; cline++;
                                  goto comment;
                                }
-#line 910 "<stdout>"
+#line 903 "<stdout>"
 yy137:
        yych = *++YYCURSOR;
        goto yy133;
@@ -916,7 +909,7 @@ yy138:
        { ++depth;
                                  fatal("ambiguous /* found");
                                  goto comment; }
-#line 920 "<stdout>"
+#line 913 "<stdout>"
 yy140:
        ++YYCURSOR;
 #line 268 "scanner.fs.re"
@@ -924,15 +917,13 @@ yy140:
                                        goto scan;
                                    else
                                        goto comment; }
-#line 928 "<stdout>"
-}
+#line 921 "<stdout>"
 #line 281 "scanner.fs.re"
 
 
 config:
 
-#line 935 "<stdout>"
-{
+#line 927 "<stdout>"
 
        YYSETSTATE(22);
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -952,7 +943,7 @@ yy144:
 yy145:
 #line 285 "scanner.fs.re"
        { goto config; }
-#line 956 "<stdout>"
+#line 947 "<stdout>"
 yy146:
        ++YYCURSOR;
        yych = *YYCURSOR;
@@ -963,12 +954,12 @@ yy147:
                                  cur = cursor;
                                  RETURN('='); 
                                }
-#line 967 "<stdout>"
+#line 958 "<stdout>"
 yy148:
        ++YYCURSOR;
 #line 290 "scanner.fs.re"
        { fatal("missing '='"); }
-#line 972 "<stdout>"
+#line 963 "<stdout>"
 yy150:
        ++YYCURSOR;
        YYSETSTATE(23);
@@ -989,14 +980,12 @@ yy153:
        if(yych == 0x09) goto yy152;
        if(yych == ' ') goto yy152;
        goto yy145;
-}
 #line 291 "scanner.fs.re"
 
 
 value:
 
-#line 999 "<stdout>"
-{
+#line 989 "<stdout>"
 
        YYSETSTATE(25);
        if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1036,7 +1025,7 @@ yy156:
                                  iscfg = 0;
                                  return VALUE;
                                }
-#line 1040 "<stdout>"
+#line 1029 "<stdout>"
 yy157:
        ++YYCURSOR;
        if((yych = *YYCURSOR) <= 0x0D) {
@@ -1057,7 +1046,7 @@ yy158:
                                  iscfg = 0;
                                  return NUMBER;
                                }
-#line 1061 "<stdout>"
+#line 1050 "<stdout>"
 yy159:
        yych = *++YYCURSOR;
        if(yych <= '0') goto yy163;
@@ -1250,7 +1239,6 @@ yyFillLabel35:
        yych = *YYCURSOR;
        if(yych == 0x0A) goto yy170;
        goto yy174;
-}
 #line 305 "scanner.fs.re"
 
 }