- Fixed #2478216 Wrong start_label in -c mode

diff --git a/re2c/CHANGELOG b/re2c/CHANGELOG
index 7b7c41993d913bdea96273423177211bc613e451..f586c29dab43b4d18a98ec34f0b2b694ffc9c186 100644 (file)
--- a/re2c/CHANGELOG
+++ b/re2c/CHANGELOG
@@ -1,6 +1,7 @@
-Version 0.13.6 (2008-??-??)
+Version 0.13.6 (2009-??-??)
 ---------------------------
 - Fixed inplace configuration in -e mode.
+- Fixed #2478216 Wrong start_label in -c mode.
 - Fixed #2186718 Unescaped backslash in file name of #line directive.
 - Fixed #2102138 Duplicate case labels on EBCDIC.
 - Fixed #2088583 Compile problemon AIX.

diff --git a/re2c/code.cc b/re2c/code.cc
index e7fa10f2e548d89d7c669255a19451d555078f90..170912041c4d4d50bfaa7eab3b5aeeacd7a32f21 100644 (file)
--- a/re2c/code.cc
+++ b/re2c/code.cc
@@ -518,7 +518,7 @@ void Initial::emit(std::ostream &o, uint ind, bool &readCh, const std::string&)
                o << startLabelName << ":\n";
        }
 
-       if (vUsedLabels.count(1))
+       if (vUsedLabels.count(label+1))
        {
                if (state->link)
                {
@@ -530,7 +530,7 @@ void Initial::emit(std::ostream &o, uint ind, bool &readCh, const std::string&)
                }
        }
 
-       if (!cFlag && vUsedLabels.count(label))
+       if (vUsedLabels.count(label))
        {
                o << labelPrefix << label << ":\n";
        }
@@ -1783,6 +1783,18 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
                bUsedYYAccept = false;
        }
        
+       // In -c mode, the prolog needs its own label separate from start_label.
+       // prolog_label is before the condition branch (GenCondGoto). It is
+       // equivalent to startLabelName.
+       // start_label corresponds to current condition.
+       // NOTE: prolog_label must be yy0 because of the !getstate:re2c handling
+       // in scanner.re
+       uint prolog_label = next_label;
+       if (bProlog && cFlag)
+       {
+               next_label++;
+       }
+
        uint start_label = next_label;
 
        (void) new Initial(head, next_label++, bSaveOnHead);
@@ -1791,7 +1803,7 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
        {
                if (startLabelName.empty())
                {
-                       vUsedLabels.insert(start_label);
+                       vUsedLabels.insert(prolog_label);
                }
        }
 
@@ -1867,12 +1879,12 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
        if (bProlog)
        {
                genCondTable(o, ind, *specMap);
-               genGetStateGoto(o, ind, start_label);
-               if (cFlag)
+               genGetStateGoto(o, ind, prolog_label);
+               if (cFlag && !DFlag)
                {
-                       if (vUsedLabels.count(start_label))
+                       if (vUsedLabels.count(prolog_label))
                        {
-                               o << labelPrefix << start_label << ":\n";
+                               o << labelPrefix << prolog_label << ":\n";
                        }
                        if (!startLabelName.empty())
                        {
@@ -1904,11 +1916,11 @@ void DFA::emit(std::ostream &o, uint& ind, const RegExpMap* specMap, const std::
                BitMap::gen(o, ind, lbChar, ubChar <= 256 ? ubChar : 256);
        }
 
-       // TODO: Shouldn't labels 0 and 1 be variable?
-       if (vUsedLabels.count(1))
+       // The start_label is not always the first to be emitted, so we may have to jump. c.f. Initial::emit()
+       if (vUsedLabels.count(start_label+1))
        {
-               vUsedLabels.insert(0);
-               o << indent(ind) << "goto " << labelPrefix << "0;\n";
+               vUsedLabels.insert(start_label);
+               o << indent(ind) << "goto " << labelPrefix << start_label << ";\n";
        }
 
        // Generate code

diff --git a/re2c/htdocs/index.html b/re2c/htdocs/index.html
index db4955b357ab6feef9fe5dd07daaca49935411db..5eacc31f97f978f81d5f3398b331ea10fe4cf075 100755 (executable)
--- a/re2c/htdocs/index.html
+++ b/re2c/htdocs/index.html
@@ -84,6 +84,7 @@ fixes which were incorporated. <a href=
 <h2>2008-??-??: 0.13.6</h2>
 <ul>
 <li>Fixed inplace configuration in -e mode.</li>
+<li>Fixed #2478216 Wrong start_label in -c mode.</li>
 <li>Fixed #2102138 Duplicate case labels on EBCDIC.</li>
 <li>Fixed #2186718 Unescaped backslash in file name of #line directive.</li>
 <li>Fixed #2088583 Compile problemon AIX.</li>

diff --git a/re2c/test/bug2462777.ci.c b/re2c/test/bug2462777.ci.c
new file mode 100644 (file)
index 0000000..f9b9ec4
--- /dev/null
+++ b/re2c/test/bug2462777.ci.c
@@ -0,0 +1,23 @@
+/* Generated by re2c */
+
+{
+       YYCTYPE yych;
+       switch (YYGETCONDITION()) {
+       case yycX: goto yyc_X;
+       }
+/* *********************************** */
+yyc_X:
+       goto yy1;
+yy2:
+       ++YYCURSOR;
+yy1:
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':       goto yy2;
+       default:        goto yy4;
+       }
+yy4:
+       {x;}
+}
+

diff --git a/re2c/test/bug2462777.ci.re b/re2c/test/bug2462777.ci.re
new file mode 100755 (executable)
index 0000000..32151a7
--- /dev/null
+++ b/re2c/test/bug2462777.ci.re
@@ -0,0 +1,3 @@
+/*!re2c
+<X> [a]* {x;}
+*/

diff --git a/re2c/test/bug2462777.i.c b/re2c/test/bug2462777.i.c
new file mode 100644 (file)
index 0000000..ca8b171
--- /dev/null
+++ b/re2c/test/bug2462777.i.c
@@ -0,0 +1,18 @@
+/* Generated by re2c */
+
+{
+       YYCTYPE yych;
+       goto yy0;
+yy1:
+       ++YYCURSOR;
+yy0:
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':       goto yy1;
+       default:        goto yy3;
+       }
+yy3:
+       {x;}
+}
+

diff --git a/re2c/test/bug2462777.i.re b/re2c/test/bug2462777.i.re
new file mode 100755 (executable)
index 0000000..8aafcb4
--- /dev/null
+++ b/re2c/test/bug2462777.i.re
@@ -0,0 +1,3 @@
+/*!re2c
+[a]* {x;}
+*/

diff --git a/re2c/test/condition_01.c.c b/re2c/test/condition_01.c.c
index c347ad82260f727247c810bebc9936ca622e3aab..bbd2eb254ecafc4c8554fb391f42d6b708169e85 100755 (executable)
--- a/re2c/test/condition_01.c.c
+++ b/re2c/test/condition_01.c.c
@@ -10,45 +10,44 @@
        }
 /* *********************************** */
 yyc_a:
-
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':       goto yy4;
+       default:        goto yy3;
        }
-yy2:
 yy3:
+yy4:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy4;
-       default:        goto yy2;
+       case 'b':       goto yy5;
+       default:        goto yy3;
        }
-yy4:
+yy5:
        ++YYCURSOR;
 #line 3 "condition_01.c.re"
        { }
-#line 32 "<stdout>"
+#line 31 "<stdout>"
 /* *********************************** */
 yyc_b:
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy9;
-       default:        goto yy8;
+       case 'a':       goto yy10;
+       default:        goto yy9;
        }
-yy8:
 yy9:
+yy10:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy10;
-       default:        goto yy8;
+       case 'b':       goto yy11;
+       default:        goto yy9;
        }
-yy10:
+yy11:
        ++YYCURSOR;
 #line 3 "condition_01.c.re"
        { }
-#line 52 "<stdout>"
+#line 51 "<stdout>"
 }
 #line 5 "condition_01.c.re"
 

diff --git a/re2c/test/condition_01a.c.c b/re2c/test/condition_01a.c.c
index 8c7bd8b0a6206bf44d2fdad9dc90014846700059..7321e8876d6e4ea4d59ffd91ef52fe03ddecaa31 100755 (executable)
--- a/re2c/test/condition_01a.c.c
+++ b/re2c/test/condition_01a.c.c
@@ -10,45 +10,44 @@
        }
 /**** State a ***/
 yyc_a:
-
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':       goto yy4;
+       default:        goto yy3;
        }
-yy2:
 yy3:
+yy4:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy4;
-       default:        goto yy2;
+       case 'b':       goto yy5;
+       default:        goto yy3;
        }
-yy4:
+yy5:
        ++YYCURSOR;
 #line 3 "condition_01a.c.re"
        { }
-#line 32 "<stdout>"
+#line 31 "<stdout>"
 /**** State b ***/
 yyc_b:
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy9;
-       default:        goto yy8;
+       case 'a':       goto yy10;
+       default:        goto yy9;
        }
-yy8:
 yy9:
+yy10:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy10;
-       default:        goto yy8;
+       case 'b':       goto yy11;
+       default:        goto yy9;
        }
-yy10:
+yy11:
        ++YYCURSOR;
 #line 3 "condition_01a.c.re"
        { }
-#line 52 "<stdout>"
+#line 51 "<stdout>"
 }
 #line 5 "condition_01a.c.re"
 

diff --git a/re2c/test/condition_01b.c.c b/re2c/test/condition_01b.c.c
index 71b6b3d5d7759cb61306bac062dcb197d006bc97..95b4f0279fe6161d4394711d1e4a95f7e71f5179 100755 (executable)
--- a/re2c/test/condition_01b.c.c
+++ b/re2c/test/condition_01b.c.c
@@ -9,44 +9,43 @@
        case yycb: goto yyc_b;
        }
 yyc_a:
-
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':       goto yy4;
+       default:        goto yy3;
        }
-yy2:
 yy3:
+yy4:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy4;
-       default:        goto yy2;
+       case 'b':       goto yy5;
+       default:        goto yy3;
        }
-yy4:
+yy5:
        ++YYCURSOR;
 #line 3 "condition_01b.c.re"
        { }
-#line 31 "<stdout>"
+#line 30 "<stdout>"
 yyc_b:
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy9;
-       default:        goto yy8;
+       case 'a':       goto yy10;
+       default:        goto yy9;
        }
-yy8:
 yy9:
+yy10:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy10;
-       default:        goto yy8;
+       case 'b':       goto yy11;
+       default:        goto yy9;
        }
-yy10:
+yy11:
        ++YYCURSOR;
 #line 3 "condition_01b.c.re"
        { }
-#line 50 "<stdout>"
+#line 49 "<stdout>"
 }
 #line 5 "condition_01b.c.re"
 

diff --git a/re2c/test/condition_02.c.c b/re2c/test/condition_02.c.c
index 409ea1267962b97f53d82a794d5c20a2fd4a380a..7bb0dcedfbcfd3e1442217bb8cf1527b62531440 100755 (executable)
--- a/re2c/test/condition_02.c.c
+++ b/re2c/test/condition_02.c.c
@@ -11,44 +11,43 @@
        }
 /* *********************************** */
 yyc_0:
-
 #line 3 "condition_02.c.re"
        { return NULL; }
-#line 18 "<stdout>"
+#line 17 "<stdout>"
 /* *********************************** */
 yyc_r1:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy6;
-       case 'b':       goto yy8;
-       default:        goto yy5;
+       case 'a':       goto yy7;
+       case 'b':       goto yy9;
+       default:        goto yy6;
        }
-yy5:
 yy6:
+yy7:
        ++YYCURSOR;
 #line 4 "condition_02.c.re"
        { return "a"; }
-#line 33 "<stdout>"
-yy8:
+#line 32 "<stdout>"
+yy9:
        ++YYCURSOR;
 #line 5 "condition_02.c.re"
        { return "b"; }
-#line 38 "<stdout>"
+#line 37 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'b':       goto yy13;
-       default:        goto yy12;
+       case 'b':       goto yy14;
+       default:        goto yy13;
        }
-yy12:
 yy13:
+yy14:
        ++YYCURSOR;
 #line 5 "condition_02.c.re"
        { return "b"; }
-#line 52 "<stdout>"
+#line 51 "<stdout>"
 }
 #line 7 "condition_02.c.re"
 

diff --git a/re2c/test/condition_02.cg.c b/re2c/test/condition_02.cg.c
index c3c472c2fb44b4897fb33162e9374332095bedab..82431d05d98035e875fc7229203af6d5348d9f75 100755 (executable)
--- a/re2c/test/condition_02.cg.c
+++ b/re2c/test/condition_02.cg.c
@@ -12,38 +12,37 @@
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_0:
-
 #line 3 "condition_02.cg.re"
        { return NULL; }
-#line 19 "<stdout>"
+#line 18 "<stdout>"
 /* *********************************** */
 yyc_r1:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       if (yych <= '`') goto yy5;
-       if (yych <= 'a') goto yy6;
-       if (yych <= 'b') goto yy8;
-yy5:
+       if (yych <= '`') goto yy6;
+       if (yych <= 'a') goto yy7;
+       if (yych <= 'b') goto yy9;
 yy6:
+yy7:
        ++YYCURSOR;
 #line 4 "condition_02.cg.re"
        { return "a"; }
-#line 32 "<stdout>"
-yy8:
+#line 31 "<stdout>"
+yy9:
        ++YYCURSOR;
 #line 5 "condition_02.cg.re"
        { return "b"; }
-#line 37 "<stdout>"
+#line 36 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       if (yych == 'b') goto yy13;
-yy13:
+       if (yych == 'b') goto yy14;
+yy14:
        ++YYCURSOR;
 #line 5 "condition_02.cg.re"
        { return "b"; }
-#line 47 "<stdout>"
+#line 46 "<stdout>"
 }
 #line 7 "condition_02.cg.re"
 

diff --git a/re2c/test/condition_03.cg.c b/re2c/test/condition_03.cg.c
index 02942e3df583b59f31627a71598c0597b0b9092f..ca59966cfe11113fe5aac0e1e6583d1611dccd3d 100755 (executable)
--- a/re2c/test/condition_03.cg.c
+++ b/re2c/test/condition_03.cg.c
@@ -12,71 +12,70 @@
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_0:
-
 #line 3 "condition_03.cg.re"
        { return NULL; }
-#line 19 "<stdout>"
+#line 18 "<stdout>"
 /* *********************************** */
 yyc_r1:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy5;
-               if (yych <= '1') goto yy8;
-               goto yy6;
+               if (yych <= '0') goto yy6;
+               if (yych <= '1') goto yy9;
+               goto yy7;
        } else {
-               if (yych <= '`') goto yy5;
-               if (yych <= 'a') goto yy10;
-               if (yych <= 'b') goto yy12;
+               if (yych <= '`') goto yy6;
+               if (yych <= 'a') goto yy11;
+               if (yych <= 'b') goto yy13;
        }
-yy5:
 yy6:
+yy7:
        ++YYCURSOR;
 #line 5 "condition_03.cg.re"
        { return "2"; }
-#line 38 "<stdout>"
-yy8:
+#line 37 "<stdout>"
+yy9:
        ++YYCURSOR;
 #line 4 "condition_03.cg.re"
        { return "1"; }
-#line 43 "<stdout>"
-yy10:
+#line 42 "<stdout>"
+yy11:
        ++YYCURSOR;
 #line 6 "condition_03.cg.re"
        { return "a"; }
-#line 48 "<stdout>"
-yy12:
+#line 47 "<stdout>"
+yy13:
        ++YYCURSOR;
 #line 7 "condition_03.cg.re"
        { return "b"; }
-#line 53 "<stdout>"
+#line 52 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy16;
-               if (yych <= '1') goto yy19;
-               goto yy17;
+               if (yych <= '0') goto yy17;
+               if (yych <= '1') goto yy20;
+               goto yy18;
        } else {
-               if (yych == 'b') goto yy21;
+               if (yych == 'b') goto yy22;
        }
-yy16:
 yy17:
+yy18:
        ++YYCURSOR;
 #line 5 "condition_03.cg.re"
        { return "2"; }
-#line 70 "<stdout>"
-yy19:
+#line 69 "<stdout>"
+yy20:
        ++YYCURSOR;
 #line 4 "condition_03.cg.re"
        { return "1"; }
-#line 75 "<stdout>"
-yy21:
+#line 74 "<stdout>"
+yy22:
        ++YYCURSOR;
 #line 7 "condition_03.cg.re"
        { return "b"; }
-#line 80 "<stdout>"
+#line 79 "<stdout>"
 }
 #line 9 "condition_03.cg.re"
 

diff --git a/re2c/test/condition_04.cg.c b/re2c/test/condition_04.cg.c
index ba188a5a6e5620b3da5a7379d3ede1c6ccff5a18..f0281aa4d99f58117aeaf5709eaba20b37c8c6dd 100755 (executable)
--- a/re2c/test/condition_04.cg.c
+++ b/re2c/test/condition_04.cg.c
@@ -11,66 +11,65 @@
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
 #line 4 "condition_04.cg.re"
        { return "2"; }
-#line 32 "<stdout>"
-yy5:
+#line 31 "<stdout>"
+yy6:
        ++YYCURSOR;
 #line 3 "condition_04.cg.re"
        { return "1"; }
-#line 37 "<stdout>"
-yy7:
+#line 36 "<stdout>"
+yy8:
        ++YYCURSOR;
 #line 5 "condition_04.cg.re"
        { return "a"; }
-#line 42 "<stdout>"
-yy9:
+#line 41 "<stdout>"
+yy10:
        ++YYCURSOR;
 #line 6 "condition_04.cg.re"
        { return "b"; }
-#line 47 "<stdout>"
+#line 46 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++YYCURSOR;
 #line 4 "condition_04.cg.re"
        { return "2"; }
-#line 64 "<stdout>"
-yy16:
+#line 63 "<stdout>"
+yy17:
        ++YYCURSOR;
 #line 3 "condition_04.cg.re"
        { return "1"; }
-#line 69 "<stdout>"
-yy18:
+#line 68 "<stdout>"
+yy19:
        ++YYCURSOR;
 #line 6 "condition_04.cg.re"
        { return "b"; }
-#line 74 "<stdout>"
+#line 73 "<stdout>"
 }
 #line 8 "condition_04.cg.re"
 

diff --git a/re2c/test/condition_05.cg.c b/re2c/test/condition_05.cg.c
index e2e5335b596a1b181fb9a0bf030d9dc9afec6dca..00ff442c38b4759cf5d1e499f35f2fdfac82aa05 100755 (executable)
--- a/re2c/test/condition_05.cg.c
+++ b/re2c/test/condition_05.cg.c
@@ -65,52 +65,51 @@ char scan(Scanner *s)
                        goto *yyctable[cond];
 /* *********************************** */
 yyc_comment:
-
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '*') goto yy4;
+                       if (yych != '*') goto yy5;
                        ++s->cur;
-                       if ((yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((yych = *s->cur) == '/') goto yy6;
+yy4:
 #line 83 "condition_05.cg.re"
                        {
                                goto yyc_comment;
                        }
-#line 80 "<stdout>"
-yy4:
-                       yych = *++s->cur;
-                       goto yy3;
+#line 79 "<stdout>"
 yy5:
+                       yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
 #line 79 "condition_05.cg.re"
                        {
                                continue;
                        }
-#line 90 "<stdout>"
+#line 89 "<stdout>"
 /* *********************************** */
 yyc_normal:
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '/') goto yy11;
+                       if (yych != '/') goto yy12;
                        ++s->cur;
-                       if ((yych = *s->cur) == '*') goto yy12;
-yy10:
+                       if ((yych = *s->cur) == '*') goto yy13;
+yy11:
 #line 74 "condition_05.cg.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 104 "<stdout>"
-yy11:
-                       yych = *++s->cur;
-                       goto yy10;
+#line 103 "<stdout>"
 yy12:
+                       yych = *++s->cur;
+                       goto yy11;
+yy13:
                        ++s->cur;
 #line 70 "condition_05.cg.re"
                        {
                                goto yyc_comment;
                        }
-#line 114 "<stdout>"
+#line 113 "<stdout>"
                }
 #line 87 "condition_05.cg.re"
 

diff --git a/re2c/test/condition_05.cgitcondition_05.cgit.h.c b/re2c/test/condition_05.cgitcondition_05.cgit.h.c
index f5c53f674559241d878bfb22c3d81640eddc8f0c..290ec32a87902676e9e83418fc5e56990e52908a 100755 (executable)
--- a/re2c/test/condition_05.cgitcondition_05.cgit.h.c
+++ b/re2c/test/condition_05.cgitcondition_05.cgit.h.c
@@ -63,20 +63,19 @@ char scan(Scanner *s)
                        goto *yyctable[cond];
 /* *********************************** */
 yyc_comment:
-
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '*') goto yy4;
+                       if (yych != '*') goto yy5;
                        ++s->cur;
-                       if ((yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((yych = *s->cur) == '/') goto yy6;
+yy4:
                        {
                                goto yyc_comment;
                        }
-yy4:
-                       yych = *++s->cur;
-                       goto yy3;
 yy5:
+                       yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
                        {
                                continue;
@@ -85,18 +84,18 @@ yy5:
 yyc_normal:
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '/') goto yy11;
+                       if (yych != '/') goto yy12;
                        ++s->cur;
-                       if ((yych = *s->cur) == '*') goto yy12;
-yy10:
+                       if ((yych = *s->cur) == '*') goto yy13;
+yy11:
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-yy11:
-                       yych = *++s->cur;
-                       goto yy10;
 yy12:
+                       yych = *++s->cur;
+                       goto yy11;
+yy13:
                        ++s->cur;
                        {
                                goto yyc_comment;

diff --git a/re2c/test/condition_05.cgtcondition_05.cgt.h.c b/re2c/test/condition_05.cgtcondition_05.cgt.h.c
index fe50ac2fee705fc777e90a018005607f53cf77a9..9e08070b7f75e607a6b000b8bb47cca26feeb7e3 100755 (executable)
--- a/re2c/test/condition_05.cgtcondition_05.cgt.h.c
+++ b/re2c/test/condition_05.cgtcondition_05.cgt.h.c
@@ -65,52 +65,51 @@ char scan(Scanner *s)
                        goto *yyctable[cond];
 /* *********************************** */
 yyc_comment:
-
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '*') goto yy4;
+                       if (yych != '*') goto yy5;
                        ++s->cur;
-                       if ((yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((yych = *s->cur) == '/') goto yy6;
+yy4:
 #line 83 "condition_05.cgtcondition_05.cgt.h.re"
                        {
                                goto yyc_comment;
                        }
-#line 80 "<stdout>"
-yy4:
-                       yych = *++s->cur;
-                       goto yy3;
+#line 79 "<stdout>"
 yy5:
+                       yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
 #line 79 "condition_05.cgtcondition_05.cgt.h.re"
                        {
                                continue;
                        }
-#line 90 "<stdout>"
+#line 89 "<stdout>"
 /* *********************************** */
 yyc_normal:
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '/') goto yy11;
+                       if (yych != '/') goto yy12;
                        ++s->cur;
-                       if ((yych = *s->cur) == '*') goto yy12;
-yy10:
+                       if ((yych = *s->cur) == '*') goto yy13;
+yy11:
 #line 74 "condition_05.cgtcondition_05.cgt.h.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 104 "<stdout>"
-yy11:
-                       yych = *++s->cur;
-                       goto yy10;
+#line 103 "<stdout>"
 yy12:
+                       yych = *++s->cur;
+                       goto yy11;
+yy13:
                        ++s->cur;
 #line 70 "condition_05.cgtcondition_05.cgt.h.re"
                        {
                                goto yyc_comment;
                        }
-#line 114 "<stdout>"
+#line 113 "<stdout>"
                }
 #line 87 "condition_05.cgtcondition_05.cgt.h.re"
 

diff --git a/re2c/test/condition_05.cs.c b/re2c/test/condition_05.cs.c
index 7144ee6b415ff9a30cc6336d9df262fd2f12b5a6..0eb81c481c6cf2c103b430c5244279eaabb06bda 100755 (executable)
--- a/re2c/test/condition_05.cs.c
+++ b/re2c/test/condition_05.cs.c
@@ -65,52 +65,51 @@ char scan(Scanner *s)
                        }
 /* *********************************** */
 yyc_comment:
-
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '*') goto yy4;
+                       if (yych != '*') goto yy5;
                        ++s->cur;
-                       if ((yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((yych = *s->cur) == '/') goto yy6;
+yy4:
 #line 83 "condition_05.cs.re"
                        {
                                goto yyc_comment;
                        }
-#line 80 "<stdout>"
-yy4:
-                       yych = *++s->cur;
-                       goto yy3;
+#line 79 "<stdout>"
 yy5:
+                       yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
 #line 79 "condition_05.cs.re"
                        {
                                continue;
                        }
-#line 90 "<stdout>"
+#line 89 "<stdout>"
 /* *********************************** */
 yyc_normal:
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '/') goto yy11;
+                       if (yych != '/') goto yy12;
                        ++s->cur;
-                       if ((yych = *s->cur) == '*') goto yy12;
-yy10:
+                       if ((yych = *s->cur) == '*') goto yy13;
+yy11:
 #line 74 "condition_05.cs.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 104 "<stdout>"
-yy11:
-                       yych = *++s->cur;
-                       goto yy10;
+#line 103 "<stdout>"
 yy12:
+                       yych = *++s->cur;
+                       goto yy11;
+yy13:
                        ++s->cur;
 #line 70 "condition_05.cs.re"
                        {
                                goto yyc_comment;
                        }
-#line 114 "<stdout>"
+#line 113 "<stdout>"
                }
 #line 87 "condition_05.cs.re"
 

diff --git a/re2c/test/condition_06.cs.c b/re2c/test/condition_06.cs.c
index d26c9557b040d0872bd7dc784009048870933760..7258ca027fe68175e208cbfa91bc17cd65b5b364 100755 (executable)
--- a/re2c/test/condition_06.cs.c
+++ b/re2c/test/condition_06.cs.c
@@ -92,54 +92,53 @@ void scan(Scanner *s)
                        }
 /* *********************************** */
 yyc_Comment:
-
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych != '*') goto yy4;
+                       if (yych != '*') goto yy5;
                        ++s->cur;
-                       if ((yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((yych = *s->cur) == '/') goto yy6;
+yy4:
 #line 149 "condition_06.cs.re"
                        {
                                goto yyc_Comment;
                        }
-#line 107 "<stdout>"
-yy4:
-                       yych = *++s->cur;
-                       goto yy3;
+#line 106 "<stdout>"
 yy5:
+                       yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
 #line 145 "condition_06.cs.re"
                        {
                                continue;
                        }
-#line 117 "<stdout>"
+#line 116 "<stdout>"
 /* *********************************** */
 yyc_Normal:
                        if ((s->lim - s->cur) < 3) { if(fill(s, 3) >= 0) break; }
                        yych = *s->cur;
                        if (yych <= '.') {
-                               if (yych == '"') goto yy12;
-                               goto yy14;
+                               if (yych == '"') goto yy13;
+                               goto yy15;
                        } else {
-                               if (yych <= '/') goto yy11;
-                               if (yych != '?') goto yy14;
+                               if (yych <= '/') goto yy12;
+                               if (yych != '?') goto yy15;
                        }
                        yych = *(s->tok = ++s->cur);
-                       if (yych == '?') goto yy19;
-yy10:
+                       if (yych == '?') goto yy20;
+yy11:
 #line 140 "condition_06.cs.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 137 "<stdout>"
-yy11:
-                       yych = *++s->cur;
-                       if (yych == '*') goto yy17;
-                       if (yych == '/') goto yy15;
-                       goto yy10;
+#line 136 "<stdout>"
 yy12:
+                       yych = *++s->cur;
+                       if (yych == '*') goto yy18;
+                       if (yych == '/') goto yy16;
+                       goto yy11;
+yy13:
                        ++s->cur;
 #line 134 "condition_06.cs.re"
                        {
@@ -147,211 +146,211 @@ yy12:
                                state = EStateString;
                                continue;
                        }
-#line 151 "<stdout>"
-yy14:
-                       yych = *++s->cur;
-                       goto yy10;
+#line 150 "<stdout>"
 yy15:
+                       yych = *++s->cur;
+                       goto yy11;
+yy16:
                        ++s->cur;
 #line 130 "condition_06.cs.re"
                        {
                                goto yyc_Skiptoeol;
                        }
-#line 161 "<stdout>"
-yy17:
+#line 160 "<stdout>"
+yy18:
                        ++s->cur;
 #line 126 "condition_06.cs.re"
                        {
                                goto yyc_Comment;
                        }
-#line 168 "<stdout>"
-yy19:
+#line 167 "<stdout>"
+yy20:
                        yych = *++s->cur;
                        switch (yych) {
-                       case '!':       goto yy35;
-                       case '\'':      goto yy33;
-                       case '(':       goto yy21;
-                       case ')':       goto yy23;
-                       case '-':       goto yy37;
-                       case '/':       goto yy31;
-                       case '<':       goto yy25;
-                       case '=':       goto yy29;
-                       case '>':       goto yy27;
-                       default:        goto yy20;
+                       case '!':       goto yy36;
+                       case '\'':      goto yy34;
+                       case '(':       goto yy22;
+                       case ')':       goto yy24;
+                       case '-':       goto yy38;
+                       case '/':       goto yy32;
+                       case '<':       goto yy26;
+                       case '=':       goto yy30;
+                       case '>':       goto yy28;
+                       default:        goto yy21;
                        }
-yy20:
-                       s->cur = s->tok;
-                       goto yy10;
 yy21:
+                       s->cur = s->tok;
+                       goto yy11;
+yy22:
                        ++s->cur;
 #line 81 "condition_06.cs.re"
                        {
                                fputc('[', stdout);
                                continue;
                        }
-#line 193 "<stdout>"
-yy23:
+#line 192 "<stdout>"
+yy24:
                        ++s->cur;
 #line 86 "condition_06.cs.re"
                        {
                                fputc(']', stdout);
                                continue;
                        }
-#line 201 "<stdout>"
-yy25:
+#line 200 "<stdout>"
+yy26:
                        ++s->cur;
 #line 91 "condition_06.cs.re"
                        {
                                fputc('{', stdout);
                                continue;
                        }
-#line 209 "<stdout>"
-yy27:
+#line 208 "<stdout>"
+yy28:
                        ++s->cur;
 #line 96 "condition_06.cs.re"
                        {
                                fputc('}', stdout);
                                continue;
                        }
-#line 217 "<stdout>"
-yy29:
+#line 216 "<stdout>"
+yy30:
                        ++s->cur;
 #line 101 "condition_06.cs.re"
                        {
                                fputc('#', stdout);
                                continue;
                        }
-#line 225 "<stdout>"
-yy31:
+#line 224 "<stdout>"
+yy32:
                        ++s->cur;
 #line 106 "condition_06.cs.re"
                        {
                                fputc('\\', stdout);
                                continue;
                        }
-#line 233 "<stdout>"
-yy33:
+#line 232 "<stdout>"
+yy34:
                        ++s->cur;
 #line 111 "condition_06.cs.re"
                        {
                                fputc('^', stdout);
                                continue;
                        }
-#line 241 "<stdout>"
-yy35:
+#line 240 "<stdout>"
+yy36:
                        ++s->cur;
 #line 116 "condition_06.cs.re"
                        {
                                fputc('|', stdout);
                                continue;
                        }
-#line 249 "<stdout>"
-yy37:
+#line 248 "<stdout>"
+yy38:
                        ++s->cur;
 #line 121 "condition_06.cs.re"
                        {
                                fputc('~', stdout);
                                continue;
                        }
-#line 257 "<stdout>"
+#line 256 "<stdout>"
 /* *********************************** */
 yyc_Skiptoeol:
                        if ((s->lim - s->cur) < 5) { if(fill(s, 5) >= 0) break; }
                        yych = *s->cur;
                        if (yych <= '>') {
-                               if (yych == '\n') goto yy44;
-                               goto yy46;
+                               if (yych == '\n') goto yy45;
+                               goto yy47;
                        } else {
-                               if (yych <= '?') goto yy41;
-                               if (yych == '\\') goto yy43;
-                               goto yy46;
+                               if (yych <= '?') goto yy42;
+                               if (yych == '\\') goto yy44;
+                               goto yy47;
                        }
-yy41:
-                       yych = *(s->tok = ++s->cur);
-                       if (yych == '?') goto yy51;
 yy42:
+                       yych = *(s->tok = ++s->cur);
+                       if (yych == '?') goto yy52;
+yy43:
 #line 165 "condition_06.cs.re"
                        {
                                goto yyc_Skiptoeol;
                        }
-#line 278 "<stdout>"
-yy43:
-                       yych = *(s->tok = ++s->cur);
-                       if (yych == '\n') goto yy49;
-                       if (yych == '\r') goto yy47;
-                       goto yy42;
+#line 277 "<stdout>"
 yy44:
+                       yych = *(s->tok = ++s->cur);
+                       if (yych == '\n') goto yy50;
+                       if (yych == '\r') goto yy48;
+                       goto yy43;
+yy45:
                        ++s->cur;
 #line 161 "condition_06.cs.re"
                        {
                                continue;
                        }
-#line 290 "<stdout>"
-yy46:
-                       yych = *++s->cur;
-                       goto yy42;
+#line 289 "<stdout>"
 yy47:
                        yych = *++s->cur;
-                       if (yych == '\n') goto yy49;
+                       goto yy43;
 yy48:
-                       s->cur = s->tok;
-                       goto yy42;
+                       yych = *++s->cur;
+                       if (yych == '\n') goto yy50;
 yy49:
+                       s->cur = s->tok;
+                       goto yy43;
+yy50:
                        ++s->cur;
 #line 157 "condition_06.cs.re"
                        {
                                goto yyc_Skiptoeol;
                        }
-#line 306 "<stdout>"
-yy51:
+#line 305 "<stdout>"
+yy52:
                        yych = *++s->cur;
-                       if (yych != '/') goto yy48;
+                       if (yych != '/') goto yy49;
                        yych = *++s->cur;
-                       if (yych == '\n') goto yy54;
-                       if (yych != '\r') goto yy48;
+                       if (yych == '\n') goto yy55;
+                       if (yych != '\r') goto yy49;
                        yych = *++s->cur;
-                       if (yych != '\n') goto yy48;
-yy54:
+                       if (yych != '\n') goto yy49;
+yy55:
                        ++s->cur;
 #line 153 "condition_06.cs.re"
                        {
                                goto yyc_Skiptoeol;
                        }
-#line 321 "<stdout>"
+#line 320 "<stdout>"
 /* *********************************** */
 yyc_String:
                        if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                        yych = *s->cur;
-                       if (yych == '"') goto yy60;
-                       if (yych != '\\') goto yy62;
+                       if (yych == '"') goto yy61;
+                       if (yych != '\\') goto yy63;
                        ++s->cur;
-                       if ((yych = *s->cur) != '\n') goto yy63;
-yy59:
+                       if ((yych = *s->cur) != '\n') goto yy64;
+yy60:
 #line 179 "condition_06.cs.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 336 "<stdout>"
-yy60:
+#line 335 "<stdout>"
+yy61:
                        ++s->cur;
 #line 174 "condition_06.cs.re"
                        {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-#line 344 "<stdout>"
-yy62:
-                       yych = *++s->cur;
-                       goto yy59;
+#line 343 "<stdout>"
 yy63:
+                       yych = *++s->cur;
+                       goto yy60;
+yy64:
                        ++s->cur;
 #line 169 "condition_06.cs.re"
                        {
                                fputl((const char*)s->tok, 2, stdout);
                                continue;
                        }
-#line 355 "<stdout>"
+#line 354 "<stdout>"
                }
 #line 183 "condition_06.cs.re"
 

diff --git a/re2c/test/condition_07.cbi.c b/re2c/test/condition_07.cbi.c
index 30fe7e22c0d475451051c7893d42757f70636919..72ffc2ece6ffca950c917f3943f26f7289ba6f8a 100755 (executable)
--- a/re2c/test/condition_07.cbi.c
+++ b/re2c/test/condition_07.cbi.c
@@ -113,39 +113,38 @@ yyc_R1:
                                          0,   0,   0,   0,   0,   0,   0,   0, 
                                          0,   0,   0,   0,   0,   0,   0,   0, 
                                };
-
                                if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                                yych = *s->cur;
                                if (yych <= '@') {
-                                       if (yych <= '/') goto yy4;
-                                       if (yych >= ':') goto yy4;
+                                       if (yych <= '/') goto yy5;
+                                       if (yych >= ':') goto yy5;
                                } else {
-                                       if (yych <= 'Z') goto yy2;
-                                       if (yych <= '`') goto yy4;
-                                       if (yych >= '{') goto yy4;
+                                       if (yych <= 'Z') goto yy3;
+                                       if (yych <= '`') goto yy5;
+                                       if (yych >= '{') goto yy5;
                                }
-yy2:
+yy3:
                                ++s->cur;
                                yych = *s->cur;
-                               goto yy7;
-yy3:
+                               goto yy8;
+yy4:
                                {
                                        continue;
                                }
-yy4:
+yy5:
                                ++s->cur;
                                {
                                        continue;
                                }
-yy6:
+yy7:
                                ++s->cur;
                                if (s->lim <= s->cur) { if(fill(s, 1) >= 0) break; }
                                yych = *s->cur;
-yy7:
+yy8:
                                if (yybm[0+yych] & 128) {
-                                       goto yy6;
+                                       goto yy7;
                                }
-                               goto yy3;
+                               goto yy4;
                        }
 /* *********************************** */
 yyc_R2:
@@ -187,35 +186,35 @@ yyc_R2:
                                if ((s->lim - s->cur) < 2) { if(fill(s, 2) >= 0) break; }
                                yych = *s->cur;
                                if (yych <= '@') {
-                                       if (yych <= '/') goto yy12;
-                                       if (yych >= ':') goto yy12;
+                                       if (yych <= '/') goto yy13;
+                                       if (yych >= ':') goto yy13;
                                } else {
-                                       if (yych <= 'Z') goto yy10;
-                                       if (yych <= '`') goto yy12;
-                                       if (yych >= '{') goto yy12;
+                                       if (yych <= 'Z') goto yy11;
+                                       if (yych <= '`') goto yy13;
+                                       if (yych >= '{') goto yy13;
                                }
-yy10:
+yy11:
                                ++s->cur;
                                yych = *s->cur;
-                               goto yy15;
-yy11:
+                               goto yy16;
+yy12:
                                {
                                        continue;
                                }
-yy12:
+yy13:
                                ++s->cur;
                                {
                                        continue;
                                }
-yy14:
+yy15:
                                ++s->cur;
                                if (s->lim <= s->cur) { if(fill(s, 1) >= 0) break; }
                                yych = *s->cur;
-yy15:
+yy16:
                                if (yybm[0+yych] & 128) {
-                                       goto yy14;
+                                       goto yy15;
                                }
-                               goto yy11;
+                               goto yy12;
                        }
                }
 

diff --git a/re2c/test/condition_08.cbi.c b/re2c/test/condition_08.cbi.c
index aba3e230cd1b2b00b2a1b89381e39f78dcc28f5f..00ddced6bef2117eb61f3b227bd094e612dcbbb7 100755 (executable)
--- a/re2c/test/condition_08.cbi.c
+++ b/re2c/test/condition_08.cbi.c
@@ -87,20 +87,19 @@ void scan(Scanner *s)
                }
 /* *********************************** */
 yyc_Comment:
-
                if ((s->lim - s->cur) < 2) if(fill(s, 2) >= 0) break;
                s->yych = *s->cur;
-               if (s->yych != '*') goto yy4;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
+               if ((s->yych = *s->cur) == '/') goto yy6;
+yy4:
                {
                                goto yyc_Comment;
                        }
-yy4:
-               s->yych = *++s->cur;
-               goto yy3;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                {
                                s->cond = EStateNormal;
@@ -111,136 +110,136 @@ 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->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                {
                                fputc(*s->tok, stdout);
                                s->state = EStateString;
                                continue;
                        }
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
-yy22:
+yy23:
                ++s->cur;
                {
                                s->cond = EStateSkiptoeol;
                                goto yyc_Skiptoeol;
                        }
-yy24:
+yy25:
                ++s->cur;
                {
                                s->cond = EStateComment;
                                goto yyc_Comment;
                        }
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                {
                                fputc('[', stdout);
                                continue;
                        }
-yy29:
+yy30:
                ++s->cur;
                {
                                fputc(']', stdout);
                                continue;
                        }
-yy31:
+yy32:
                ++s->cur;
                {
                                fputc('{', stdout);
                                continue;
                        }
-yy33:
+yy34:
                ++s->cur;
                {
                                fputc('}', stdout);
                                continue;
                        }
-yy35:
+yy36:
                ++s->cur;
                {
                                fputc('#', stdout);
                                continue;
                        }
-yy37:
+yy38:
                ++s->cur;
                {
                                fputc('\\', stdout);
                                continue;
                        }
-yy39:
+yy40:
                ++s->cur;
                {
                                fputc('^', stdout);
                                continue;
                        }
-yy41:
+yy42:
                ++s->cur;
                {
                                fputc('|', stdout);
                                continue;
                        }
-yy43:
+yy44:
                ++s->cur;
                {
                                fputc('~', stdout);
@@ -251,54 +250,54 @@ yyc_Skiptoeol:
                if ((s->lim - s->cur) < 5) if(fill(s, 5) >= 0) break;
                s->yych = *s->cur;
                if (s->yych <= '>') {
-                       if (s->yych == '\n') goto yy50;
-                       goto yy52;
+                       if (s->yych == '\n') goto yy51;
+                       goto yy53;
                } else {
-                       if (s->yych <= '?') goto yy47;
-                       if (s->yych == '\\') goto yy49;
-                       goto yy52;
+                       if (s->yych <= '?') goto yy48;
+                       if (s->yych == '\\') goto yy50;
+                       goto yy53;
                }
-yy47:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy57;
 yy48:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '?') goto yy58;
+yy49:
                {
                                goto yyc_Skiptoeol;
                        }
-yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy55;
-               if (s->yych == '\r') goto yy53;
-               goto yy48;
 yy50:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy56;
+               if (s->yych == '\r') goto yy54;
+               goto yy49;
+yy51:
                ++s->cur;
                {
                                s->cond = EStateNormal;
                                continue;
                        }
-yy52:
-               s->yych = *++s->cur;
-               goto yy48;
 yy53:
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy55;
+               goto yy49;
 yy54:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy56;
 yy55:
+               s->cur = s->tok;
+               goto yy49;
+yy56:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
                        }
-yy57:
+yy58:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy54;
+               if (s->yych != '/') goto yy55;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy60;
-               if (s->yych != '\r') goto yy54;
+               if (s->yych == '\n') goto yy61;
+               if (s->yych != '\r') goto yy55;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy54;
-yy60:
+               if (s->yych != '\n') goto yy55;
+yy61:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
@@ -307,26 +306,26 @@ yy60:
 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;
+               if (s->yych == '"') goto yy67;
+               if (s->yych != '\\') goto yy69;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy69;
-yy65:
+               if ((s->yych = *s->cur) != '\n') goto yy70;
+yy66:
                {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-yy66:
+yy67:
                ++s->cur;
                {
                                fputc(*s->tok, stdout);
                                s->cond = EStateNormal;
                                continue;
                        }
-yy68:
-               s->yych = *++s->cur;
-               goto yy65;
 yy69:
+               s->yych = *++s->cur;
+               goto yy66;
+yy70:
                ++s->cur;
                {
                                fputl((const char*)s->tok, 2, stdout);

diff --git a/re2c/test/condition_08.cbif.c b/re2c/test/condition_08.cbif.c
index e27982ce5378224079edb4f6d4dad40a5c208dd2..c658768b829b1cc406ee5465e279a686a099a329 100755 (executable)
--- a/re2c/test/condition_08.cbif.c
+++ b/re2c/test/condition_08.cbif.c
@@ -106,22 +106,21 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                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;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
+               if ((s->yych = *s->cur) == '/') goto yy6;
+yy4:
                {
                                goto yyc_Comment;
                        }
-yy4:
-               s->yych = *++s->cur;
-               goto yy3;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                {
                                s->cond = EStateNormal;
@@ -134,136 +133,136 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                if (s->yych <= '\'') {
-                       if (s->yych == '"') goto yy13;
-                       if (s->yych <= '&') goto yy15;
-                       goto yy12;
+                       if (s->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                {
                                fputc(*s->tok, stdout);
                                s->state = EStateString;
                                continue;
                        }
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
-yy22:
+yy23:
                ++s->cur;
                {
                                s->cond = EStateSkiptoeol;
                                goto yyc_Skiptoeol;
                        }
-yy24:
+yy25:
                ++s->cur;
                {
                                s->cond = EStateComment;
                                goto yyc_Comment;
                        }
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                {
                                fputc('[', stdout);
                                continue;
                        }
-yy29:
+yy30:
                ++s->cur;
                {
                                fputc(']', stdout);
                                continue;
                        }
-yy31:
+yy32:
                ++s->cur;
                {
                                fputc('{', stdout);
                                continue;
                        }
-yy33:
+yy34:
                ++s->cur;
                {
                                fputc('}', stdout);
                                continue;
                        }
-yy35:
+yy36:
                ++s->cur;
                {
                                fputc('#', stdout);
                                continue;
                        }
-yy37:
+yy38:
                ++s->cur;
                {
                                fputc('\\', stdout);
                                continue;
                        }
-yy39:
+yy40:
                ++s->cur;
                {
                                fputc('^', stdout);
                                continue;
                        }
-yy41:
+yy42:
                ++s->cur;
                {
                                fputc('|', stdout);
                                continue;
                        }
-yy43:
+yy44:
                ++s->cur;
                {
                                fputc('~', stdout);
@@ -276,54 +275,54 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                if (s->yych <= '>') {
-                       if (s->yych == '\n') goto yy50;
-                       goto yy52;
+                       if (s->yych == '\n') goto yy51;
+                       goto yy53;
                } else {
-                       if (s->yych <= '?') goto yy47;
-                       if (s->yych == '\\') goto yy49;
-                       goto yy52;
+                       if (s->yych <= '?') goto yy48;
+                       if (s->yych == '\\') goto yy50;
+                       goto yy53;
                }
-yy47:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy57;
 yy48:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '?') goto yy58;
+yy49:
                {
                                goto yyc_Skiptoeol;
                        }
-yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy55;
-               if (s->yych == '\r') goto yy53;
-               goto yy48;
 yy50:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy56;
+               if (s->yych == '\r') goto yy54;
+               goto yy49;
+yy51:
                ++s->cur;
                {
                                s->cond = EStateNormal;
                                continue;
                        }
-yy52:
-               s->yych = *++s->cur;
-               goto yy48;
 yy53:
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy55;
+               goto yy49;
 yy54:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy56;
 yy55:
+               s->cur = s->tok;
+               goto yy49;
+yy56:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
                        }
-yy57:
+yy58:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy54;
+               if (s->yych != '/') goto yy55;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy60;
-               if (s->yych != '\r') goto yy54;
+               if (s->yych == '\n') goto yy61;
+               if (s->yych != '\r') goto yy55;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy54;
-yy60:
+               if (s->yych != '\n') goto yy55;
+yy61:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
@@ -334,26 +333,26 @@ yyc_String:
                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;
+               if (s->yych == '"') goto yy67;
+               if (s->yych != '\\') goto yy69;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy69;
-yy65:
+               if ((s->yych = *s->cur) != '\n') goto yy70;
+yy66:
                {
                                fputc(*s->tok, stdout);
                                continue;
                        }
-yy66:
+yy67:
                ++s->cur;
                {
                                fputc(*s->tok, stdout);
                                s->cond = EStateNormal;
                                continue;
                        }
-yy68:
-               s->yych = *++s->cur;
-               goto yy65;
 yy69:
+               s->yych = *++s->cur;
+               goto yy66;
+yy70:
                ++s->cur;
                {
                                fputl((const char*)s->tok, 2, stdout);

diff --git a/re2c/test/condition_09.cbif.c b/re2c/test/condition_09.cbif.c
index ff10437b1410ba3359dd3661ddb3b89f267b4e98..eb5ada8026dc3dc4340d88c0d2525c2e06952f1b 100755 (executable)
--- a/re2c/test/condition_09.cbif.c
+++ b/re2c/test/condition_09.cbif.c
@@ -116,22 +116,21 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                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;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
+               if ((s->yych = *s->cur) == '/') goto yy6;
+yy4:
                {
                                goto yyc_Comment;
                        }
-yy4:
-               s->yych = *++s->cur;
-               goto yy3;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                s->cond = EStateNormal;
                {
@@ -144,136 +143,136 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                if (s->yych <= '\'') {
-                       if (s->yych == '"') goto yy13;
-                       if (s->yych <= '&') goto yy15;
-                       goto yy12;
+                       if (s->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                s->cond = EStateString;
                {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
-yy22:
+yy23:
                ++s->cur;
                s->cond = EStateSkiptoeol;
                {
                                goto yyc_Skiptoeol;
                        }
-yy24:
+yy25:
                ++s->cur;
                s->cond = EStateComment;
                {
                                goto yyc_Comment;
                        }
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                {
                                fputc('[', stdout);
                                continue;
                        }
-yy29:
+yy30:
                ++s->cur;
                {
                                fputc(']', stdout);
                                continue;
                        }
-yy31:
+yy32:
                ++s->cur;
                {
                                fputc('{', stdout);
                                continue;
                        }
-yy33:
+yy34:
                ++s->cur;
                {
                                fputc('}', stdout);
                                continue;
                        }
-yy35:
+yy36:
                ++s->cur;
                {
                                fputc('#', stdout);
                                continue;
                        }
-yy37:
+yy38:
                ++s->cur;
                {
                                fputc('\\', stdout);
                                continue;
                        }
-yy39:
+yy40:
                ++s->cur;
                {
                                fputc('^', stdout);
                                continue;
                        }
-yy41:
+yy42:
                ++s->cur;
                {
                                fputc('|', stdout);
                                continue;
                        }
-yy43:
+yy44:
                ++s->cur;
                {
                                fputc('~', stdout);
@@ -286,43 +285,43 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                if (s->yych <= '\r') {
-                       if (s->yych == '\n') goto yy51;
-                       if (s->yych <= '\f') goto yy53;
-                       goto yy50;
+                       if (s->yych == '\n') goto yy52;
+                       if (s->yych <= '\f') goto yy54;
+                       goto yy51;
                } else {
                        if (s->yych <= '?') {
-                               if (s->yych <= '>') goto yy53;
+                               if (s->yych <= '>') goto yy54;
                        } else {
-                               if (s->yych == '\\') goto yy49;
-                               goto yy53;
+                               if (s->yych == '\\') goto yy50;
+                               goto yy54;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy60;
-yy48:
+               if (s->yych == '?') goto yy61;
+yy49:
                {
                                goto yyc_Skiptoeol;
                        }
-yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy58;
-               if (s->yych == '\r') goto yy56;
-               goto yy48;
 yy50:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy54;
-               goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy59;
+               if (s->yych == '\r') goto yy57;
+               goto yy49;
 yy51:
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy55;
+               goto yy49;
+yy52:
                ++s->cur;
                s->cond = EStateNormal;
                {
                                fputc('\n', stdout);
                                continue;
                        }
-yy53:
-               s->yych = *++s->cur;
-               goto yy48;
 yy54:
+               s->yych = *++s->cur;
+               goto yy49;
+yy55:
                ++s->cur;
                s->cond = EStateNormal;
                {
@@ -330,26 +329,26 @@ yy54:
                                fputc('\n', stdout);
                                continue;
                        }
-yy56:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy58;
 yy57:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
 yy58:
+               s->cur = s->tok;
+               goto yy49;
+yy59:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
                        }
-yy60:
+yy61:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy57;
+               if (s->yych != '/') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy63;
-               if (s->yych != '\r') goto yy57;
+               if (s->yych == '\n') goto yy64;
+               if (s->yych != '\r') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy57;
-yy63:
+               if (s->yych != '\n') goto yy58;
+yy64:
                ++s->cur;
                {
                                goto yyc_Skiptoeol;
@@ -360,26 +359,26 @@ yyc_String:
                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;
+               if (s->yych == '"') goto yy70;
+               if (s->yych != '\\') goto yy72;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+               if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy69:
+yy70:
                ++s->cur;
                s->cond = EStateNormal;
                {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy71:
-               s->yych = *++s->cur;
-               goto yy68;
 yy72:
+               s->yych = *++s->cur;
+               goto yy69;
+yy73:
                ++s->cur;
                {
                                fputl((const char*)s->cur-2, 2, stdout);

diff --git a/re2c/test/condition_09.cgif.c b/re2c/test/condition_09.cgif.c
index 9f997417a046cc00897f0283b4399d633e6716e1..c601babd452962a75e85c3d2b7027ba5f260b32d 100755 (executable)
--- a/re2c/test/condition_09.cgif.c
+++ b/re2c/test/condition_09.cgif.c
@@ -105,22 +105,21 @@ yy0:
                        goto *yyctable[s->cond];
 /* *********************************** */
 yyc_Comment:
-
                        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;
+                       if (s->yych != '*') goto yy5;
                        ++s->cur;
-                       if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
+                       if ((s->yych = *s->cur) == '/') goto yy6;
+yy4:
                        {
                                goto yyc_Comment;
                        }
-yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
 yy5:
+                       s->yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
                        s->cond = EStateNormal;
                        {
@@ -134,186 +133,186 @@ yyFillLabel1:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy13, &&yy15, &&yy15, &&yy15, &&yy15, &&yy12,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy11,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy9,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy14, &&yy16, &&yy16, &&yy16, &&yy16, &&yy13,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy12,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy10,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16
                                };
                                goto *yytarget[s->yych];
                        }
-yy9:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy26;
 yy10:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '?') goto yy27;
+yy11:
                        {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy11:
-                       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->cur;
+                       if (s->yych == '*') goto yy25;
+                       if (s->yych == '/') goto yy23;
+                       goto yy11;
 yy13:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '"') goto yy17;
+                       if (s->yych == '\\') goto yy19;
+                       goto yy11;
+yy14:
                        ++s->cur;
                        s->cond = EStateString;
                        {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
 yy16:
                        s->yych = *++s->cur;
-                       if (s->yych == '\'') goto yy20;
+                       goto yy11;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\'') goto yy21;
 yy18:
+                       s->cur = s->tok;
+                       goto yy11;
+yy19:
                        s->yych = *++s->cur;
-                       if (s->yych != '"') goto yy17;
+                       if (s->yych != '"') goto yy18;
                        s->yych = *++s->cur;
-                       if (s->yych != '\'') goto yy17;
-yy20:
+                       if (s->yych != '\'') goto yy18;
+yy21:
                        ++s->cur;
                        {
                                fputl("'\"'", 3, stdout);
                                continue;
                        }
-yy22:
+yy23:
                        ++s->cur;
                        s->cond = EStateSkiptoeol;
                        {
                                goto yyc_Skiptoeol;
                        }
-yy24:
+yy25:
                        ++s->cur;
                        s->cond = EStateComment;
                        {
                                goto yyc_Comment;
                        }
-yy26:
+yy27:
                        s->yych = *++s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy41, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy39,
-                                       &&yy27, &&yy29, &&yy17, &&yy17, &&yy17, &&yy43, &&yy17, &&yy37,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy31, &&yy35, &&yy33, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy42, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy40,
+                                       &&yy28, &&yy30, &&yy18, &&yy18, &&yy18, &&yy44, &&yy18, &&yy38,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy32, &&yy36, &&yy34, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18
                                };
                                goto *yytarget[s->yych];
                        }
-yy27:
+yy28:
                        ++s->cur;
                        {
                                fputc('[', stdout);
                                continue;
                        }
-yy29:
+yy30:
                        ++s->cur;
                        {
                                fputc(']', stdout);
                                continue;
                        }
-yy31:
+yy32:
                        ++s->cur;
                        {
                                fputc('{', stdout);
                                continue;
                        }
-yy33:
+yy34:
                        ++s->cur;
                        {
                                fputc('}', stdout);
                                continue;
                        }
-yy35:
+yy36:
                        ++s->cur;
                        {
                                fputc('#', stdout);
                                continue;
                        }
-yy37:
+yy38:
                        ++s->cur;
                        {
                                fputc('\\', stdout);
                                continue;
                        }
-yy39:
+yy40:
                        ++s->cur;
                        {
                                fputc('^', stdout);
                                continue;
                        }
-yy41:
+yy42:
                        ++s->cur;
                        {
                                fputc('|', stdout);
                                continue;
                        }
-yy43:
+yy44:
                        ++s->cur;
                        {
                                fputc('~', stdout);
@@ -327,68 +326,68 @@ yyFillLabel2:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy51, &&yy53, &&yy53, &&yy50, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy47,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy49, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy52, &&yy54, &&yy54, &&yy51, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy48,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy50, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54
                                };
                                goto *yytarget[s->yych];
                        }
-yy47:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy60;
 yy48:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '?') goto yy61;
+yy49:
                        {
                                goto yyc_Skiptoeol;
                        }
-yy49:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '\n') goto yy58;
-                       if (s->yych == '\r') goto yy56;
-                       goto yy48;
 yy50:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy54;
-                       goto yy48;
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '\n') goto yy59;
+                       if (s->yych == '\r') goto yy57;
+                       goto yy49;
 yy51:
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy55;
+                       goto yy49;
+yy52:
                        ++s->cur;
                        s->cond = EStateNormal;
                        {
                                fputc('\n', stdout);
                                continue;
                        }
-yy53:
-                       s->yych = *++s->cur;
-                       goto yy48;
 yy54:
+                       s->yych = *++s->cur;
+                       goto yy49;
+yy55:
                        ++s->cur;
                        s->cond = EStateNormal;
                        {
@@ -396,26 +395,26 @@ yy54:
                                fputc('\n', stdout);
                                continue;
                        }
-yy56:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy58;
 yy57:
-                       s->cur = s->tok;
-                       goto yy48;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy59;
 yy58:
+                       s->cur = s->tok;
+                       goto yy49;
+yy59:
                        ++s->cur;
                        {
                                goto yyc_Skiptoeol;
                        }
-yy60:
+yy61:
                        s->yych = *++s->cur;
-                       if (s->yych != '/') goto yy57;
+                       if (s->yych != '/') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy63;
-                       if (s->yych != '\r') goto yy57;
+                       if (s->yych == '\n') goto yy64;
+                       if (s->yych != '\r') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych != '\n') goto yy57;
-yy63:
+                       if (s->yych != '\n') goto yy58;
+yy64:
                        ++s->cur;
                        {
                                goto yyc_Skiptoeol;
@@ -426,26 +425,26 @@ yyc_String:
                        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;
+                       if (s->yych == '"') goto yy70;
+                       if (s->yych != '\\') goto yy72;
                        ++s->cur;
-                       if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+                       if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                        {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy69:
+yy70:
                        ++s->cur;
                        s->cond = EStateNormal;
                        {
                                fputc(s->cur[-1], stdout);
                                continue;
                        }
-yy71:
-                       s->yych = *++s->cur;
-                       goto yy68;
 yy72:
+                       s->yych = *++s->cur;
+                       goto yy69;
+yy73:
                        ++s->cur;
                        {
                                fputl((const char*)s->cur-2, 2, stdout);

diff --git a/re2c/test/condition_10.cgif.c b/re2c/test/condition_10.cgif.c
index 4998e8aeeca5f5eb7a4b97d592a106bd0ec215af..8f8c3ac70ad536be2286c71ed51ebbad53e12255 100755 (executable)
--- a/re2c/test/condition_10.cgif.c
+++ b/re2c/test/condition_10.cgif.c
@@ -105,20 +105,19 @@ yy0:
                        goto *yyctable[s->cond];
 /* *********************************** */
 yyc_Comment:
-
                        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;
+                       if (s->yych != '*') goto yy5;
                        ++s->cur;
-                       if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-                       goto yyc_Comment;
+                       if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+                       goto yyc_Comment;
 yy5:
+                       s->yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
                        s->cond = EStateNormal;
                        continue;
@@ -130,160 +129,160 @@ yyFillLabel1:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy13, &&yy15, &&yy15, &&yy15, &&yy15, &&yy12,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy11,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy9,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy14, &&yy16, &&yy16, &&yy16, &&yy16, &&yy13,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy12,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy10,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16
                                };
                                goto *yytarget[s->yych];
                        }
-yy9:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy26;
 yy10:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '?') goto yy27;
+yy11:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy11:
-                       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->cur;
+                       if (s->yych == '*') goto yy25;
+                       if (s->yych == '/') goto yy23;
+                       goto yy11;
 yy13:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '"') goto yy17;
+                       if (s->yych == '\\') goto yy19;
+                       goto yy11;
+yy14:
                        ++s->cur;
                        s->cond = EStateString;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
 yy16:
                        s->yych = *++s->cur;
-                       if (s->yych == '\'') goto yy20;
+                       goto yy11;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\'') goto yy21;
 yy18:
+                       s->cur = s->tok;
+                       goto yy11;
+yy19:
                        s->yych = *++s->cur;
-                       if (s->yych != '"') goto yy17;
+                       if (s->yych != '"') goto yy18;
                        s->yych = *++s->cur;
-                       if (s->yych != '\'') goto yy17;
-yy20:
+                       if (s->yych != '\'') goto yy18;
+yy21:
                        ++s->cur;
                        fputl("'\"'", 3, stdout);
                        continue;
-yy22:
+yy23:
                        ++s->cur;
                        s->cond = EStateSkiptoeol;
                        goto yyc_Skiptoeol;
-yy24:
+yy25:
                        ++s->cur;
                        s->cond = EStateComment;
                        goto yyc_Comment;
-yy26:
+yy27:
                        s->yych = *++s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy41, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy39,
-                                       &&yy27, &&yy29, &&yy17, &&yy17, &&yy17, &&yy43, &&yy17, &&yy37,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy31, &&yy35, &&yy33, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy42, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy40,
+                                       &&yy28, &&yy30, &&yy18, &&yy18, &&yy18, &&yy44, &&yy18, &&yy38,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy32, &&yy36, &&yy34, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18
                                };
                                goto *yytarget[s->yych];
                        }
-yy27:
+yy28:
                        ++s->cur;
                        fputc('[', stdout);
                        continue;
-yy29:
+yy30:
                        ++s->cur;
                        fputc(']', stdout);
                        continue;
-yy31:
+yy32:
                        ++s->cur;
                        fputc('{', stdout);
                        continue;
-yy33:
+yy34:
                        ++s->cur;
                        fputc('}', stdout);
                        continue;
-yy35:
+yy36:
                        ++s->cur;
                        fputc('#', stdout);
                        continue;
-yy37:
+yy38:
                        ++s->cur;
                        fputc('\\', stdout);
                        continue;
-yy39:
+yy40:
                        ++s->cur;
                        fputc('^', stdout);
                        continue;
-yy41:
+yy42:
                        ++s->cur;
                        fputc('|', stdout);
                        continue;
-yy43:
+yy44:
                        ++s->cur;
                        fputc('~', stdout);
                        continue;
@@ -295,87 +294,87 @@ yyFillLabel2:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy51, &&yy53, &&yy53, &&yy50, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy47,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy49, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy52, &&yy54, &&yy54, &&yy51, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy48,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy50, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54
                                };
                                goto *yytarget[s->yych];
                        }
-yy47:
-                       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 == '\n') goto yy58;
-                       if (s->yych == '\r') goto yy56;
-                       goto yy48;
+                       if (s->yych == '?') goto yy61;
+yy49:
+                       goto yyc_Skiptoeol;
 yy50:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy54;
-                       goto yy48;
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '\n') goto yy59;
+                       if (s->yych == '\r') goto yy57;
+                       goto yy49;
 yy51:
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy55;
+                       goto yy49;
+yy52:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\n', stdout);
                        continue;
-yy53:
-                       s->yych = *++s->cur;
-                       goto yy48;
 yy54:
+                       s->yych = *++s->cur;
+                       goto yy49;
+yy55:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\r', stdout);
                        fputc('\n', stdout);
                        continue;
-yy56:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy58;
 yy57:
-                       s->cur = s->tok;
-                       goto yy48;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy59;
 yy58:
+                       s->cur = s->tok;
+                       goto yy49;
+yy59:
                        ++s->cur;
                        goto yyc_Skiptoeol;
-yy60:
+yy61:
                        s->yych = *++s->cur;
-                       if (s->yych != '/') goto yy57;
+                       if (s->yych != '/') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy63;
-                       if (s->yych != '\r') goto yy57;
+                       if (s->yych == '\n') goto yy64;
+                       if (s->yych != '\r') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych != '\n') goto yy57;
-yy63:
+                       if (s->yych != '\n') goto yy58;
+yy64:
                        ++s->cur;
                        goto yyc_Skiptoeol;
 /* *********************************** */
@@ -384,22 +383,22 @@ yyc_String:
                        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;
+                       if (s->yych == '"') goto yy70;
+                       if (s->yych != '\\') goto yy72;
                        ++s->cur;
-                       if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+                       if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy69:
+yy70:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy71:
-                       s->yych = *++s->cur;
-                       goto yy68;
 yy72:
+                       s->yych = *++s->cur;
+                       goto yy69;
+yy73:
                        ++s->cur;
                        fputl((const char*)s->cur-2, 2, stdout);
                        continue;

diff --git a/re2c/test/condition_11.cg.c b/re2c/test/condition_11.cg.c
index afc2eeab63f36ea30b1147eaf2075d7fbdeb472f..c36db1794e6a28c8241a1ac0f25edb372ac8dcde 100755 (executable)
--- a/re2c/test/condition_11.cg.c
+++ b/re2c/test/condition_11.cg.c
@@ -12,76 +12,75 @@
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_0:
-
        YYSETCONDITION(yycr1);
 #line 3 "condition_11.cg.re"
        { return NULL; }
-#line 20 "<stdout>"
+#line 19 "<stdout>"
 /* *********************************** */
 yyc_r1:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy5;
-               if (yych <= '1') goto yy8;
-               goto yy6;
+               if (yych <= '0') goto yy6;
+               if (yych <= '1') goto yy9;
+               goto yy7;
        } else {
-               if (yych <= '`') goto yy5;
-               if (yych <= 'a') goto yy10;
-               if (yych <= 'b') goto yy12;
+               if (yych <= '`') goto yy6;
+               if (yych <= 'a') goto yy11;
+               if (yych <= 'b') goto yy13;
        }
-yy5:
 yy6:
+yy7:
        ++YYCURSOR;
 #line 5 "condition_11.cg.re"
        { return "2"; }
-#line 39 "<stdout>"
-yy8:
+#line 38 "<stdout>"
+yy9:
        ++YYCURSOR;
 #line 4 "condition_11.cg.re"
        { return "1"; }
-#line 44 "<stdout>"
-yy10:
+#line 43 "<stdout>"
+yy11:
        ++YYCURSOR;
        YYSETCONDITION(yycr2);
 #line 6 "condition_11.cg.re"
        { return "a"; }
-#line 50 "<stdout>"
-yy12:
+#line 49 "<stdout>"
+yy13:
        ++YYCURSOR;
        YYSETCONDITION(yycr2);
 #line 7 "condition_11.cg.re"
        { return "b"; }
-#line 56 "<stdout>"
+#line 55 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy16;
-               if (yych <= '1') goto yy19;
-               goto yy17;
+               if (yych <= '0') goto yy17;
+               if (yych <= '1') goto yy20;
+               goto yy18;
        } else {
-               if (yych == 'b') goto yy21;
+               if (yych == 'b') goto yy22;
        }
-yy16:
 yy17:
+yy18:
        ++YYCURSOR;
        YYSETCONDITION(yycr1);
 #line 5 "condition_11.cg.re"
        { return "2"; }
-#line 74 "<stdout>"
-yy19:
+#line 73 "<stdout>"
+yy20:
        ++YYCURSOR;
        YYSETCONDITION(yycr1);
 #line 4 "condition_11.cg.re"
        { return "1"; }
-#line 80 "<stdout>"
-yy21:
+#line 79 "<stdout>"
+yy22:
        ++YYCURSOR;
 #line 7 "condition_11.cg.re"
        { return "b"; }
-#line 85 "<stdout>"
+#line 84 "<stdout>"
 }
 #line 9 "condition_11.cg.re"
 

diff --git a/re2c/test/condition_12.cgif.c b/re2c/test/condition_12.cgif.c
index c1c10f065f399bcf747161af178c44a912e9bc62..d306ad42647970c5bf66f645424739e40702e8f8 100755 (executable)
--- a/re2c/test/condition_12.cgif.c
+++ b/re2c/test/condition_12.cgif.c
@@ -105,20 +105,19 @@ yy0:
                        goto *yyctable[s->cond];
 /* *********************************** */
 yyc_Comment:
-
                        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;
+                       if (s->yych != '*') goto yy5;
                        ++s->cur;
-                       if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-                       goto yyc_Comment;
+                       if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+                       goto yyc_Comment;
 yy5:
+                       s->yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
                        s->cond = EStateNormal;
                        goto yyc_Normal;
@@ -130,160 +129,160 @@ yyFillLabel1:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy13, &&yy15, &&yy15, &&yy15, &&yy15, &&yy12,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy11,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy9,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy14, &&yy16, &&yy16, &&yy16, &&yy16, &&yy13,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy12,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy10,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16
                                };
                                goto *yytarget[s->yych];
                        }
-yy9:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy26;
 yy10:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '?') goto yy27;
+yy11:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy11:
-                       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->cur;
+                       if (s->yych == '*') goto yy25;
+                       if (s->yych == '/') goto yy23;
+                       goto yy11;
 yy13:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '"') goto yy17;
+                       if (s->yych == '\\') goto yy19;
+                       goto yy11;
+yy14:
                        ++s->cur;
                        s->cond = EStateString;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
 yy16:
                        s->yych = *++s->cur;
-                       if (s->yych == '\'') goto yy20;
+                       goto yy11;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\'') goto yy21;
 yy18:
+                       s->cur = s->tok;
+                       goto yy11;
+yy19:
                        s->yych = *++s->cur;
-                       if (s->yych != '"') goto yy17;
+                       if (s->yych != '"') goto yy18;
                        s->yych = *++s->cur;
-                       if (s->yych != '\'') goto yy17;
-yy20:
+                       if (s->yych != '\'') goto yy18;
+yy21:
                        ++s->cur;
                        fputl("'\"'", 3, stdout);
                        continue;
-yy22:
+yy23:
                        ++s->cur;
                        s->cond = EStateSkiptoeol;
                        goto yyc_Skiptoeol;
-yy24:
+yy25:
                        ++s->cur;
                        s->cond = EStateComment;
                        goto yyc_Comment;
-yy26:
+yy27:
                        s->yych = *++s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy41, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy39,
-                                       &&yy27, &&yy29, &&yy17, &&yy17, &&yy17, &&yy43, &&yy17, &&yy37,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy31, &&yy35, &&yy33, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy42, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy40,
+                                       &&yy28, &&yy30, &&yy18, &&yy18, &&yy18, &&yy44, &&yy18, &&yy38,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy32, &&yy36, &&yy34, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18
                                };
                                goto *yytarget[s->yych];
                        }
-yy27:
+yy28:
                        ++s->cur;
                        fputc('[', stdout);
                        continue;
-yy29:
+yy30:
                        ++s->cur;
                        fputc(']', stdout);
                        continue;
-yy31:
+yy32:
                        ++s->cur;
                        fputc('{', stdout);
                        continue;
-yy33:
+yy34:
                        ++s->cur;
                        fputc('}', stdout);
                        continue;
-yy35:
+yy36:
                        ++s->cur;
                        fputc('#', stdout);
                        continue;
-yy37:
+yy38:
                        ++s->cur;
                        fputc('\\', stdout);
                        continue;
-yy39:
+yy40:
                        ++s->cur;
                        fputc('^', stdout);
                        continue;
-yy41:
+yy42:
                        ++s->cur;
                        fputc('|', stdout);
                        continue;
-yy43:
+yy44:
                        ++s->cur;
                        fputc('~', stdout);
                        continue;
@@ -295,87 +294,87 @@ yyFillLabel2:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy51, &&yy53, &&yy53, &&yy50, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy47,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy49, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy52, &&yy54, &&yy54, &&yy51, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy48,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy50, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54
                                };
                                goto *yytarget[s->yych];
                        }
-yy47:
-                       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 == '\n') goto yy58;
-                       if (s->yych == '\r') goto yy56;
-                       goto yy48;
+                       if (s->yych == '?') goto yy61;
+yy49:
+                       goto yyc_Skiptoeol;
 yy50:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy54;
-                       goto yy48;
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '\n') goto yy59;
+                       if (s->yych == '\r') goto yy57;
+                       goto yy49;
 yy51:
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy55;
+                       goto yy49;
+yy52:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\n', stdout);
                        continue;
-yy53:
-                       s->yych = *++s->cur;
-                       goto yy48;
 yy54:
+                       s->yych = *++s->cur;
+                       goto yy49;
+yy55:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\r', stdout);
                        fputc('\n', stdout);
                        continue;
-yy56:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy58;
 yy57:
-                       s->cur = s->tok;
-                       goto yy48;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy59;
 yy58:
+                       s->cur = s->tok;
+                       goto yy49;
+yy59:
                        ++s->cur;
                        goto yyc_Skiptoeol;
-yy60:
+yy61:
                        s->yych = *++s->cur;
-                       if (s->yych != '/') goto yy57;
+                       if (s->yych != '/') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy63;
-                       if (s->yych != '\r') goto yy57;
+                       if (s->yych == '\n') goto yy64;
+                       if (s->yych != '\r') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych != '\n') goto yy57;
-yy63:
+                       if (s->yych != '\n') goto yy58;
+yy64:
                        ++s->cur;
                        goto yyc_Skiptoeol;
 /* *********************************** */
@@ -384,22 +383,22 @@ yyc_String:
                        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;
+                       if (s->yych == '"') goto yy70;
+                       if (s->yych != '\\') goto yy72;
                        ++s->cur;
-                       if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+                       if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy69:
+yy70:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy71:
-                       s->yych = *++s->cur;
-                       goto yy68;
 yy72:
+                       s->yych = *++s->cur;
+                       goto yy69;
+yy73:
                        ++s->cur;
                        fputl((const char*)s->cur-2, 2, stdout);
                        continue;

diff --git a/re2c/test/condition_13.cg.c b/re2c/test/condition_13.cg.c
index 9e40cf8805a20d59b32ec0c1b242a5aeb835e8ab..a83e2d23a2fe75d10c5a1a889ff38c8b56bfe314 100755 (executable)
--- a/re2c/test/condition_13.cg.c
+++ b/re2c/test/condition_13.cg.c
@@ -12,76 +12,75 @@
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_0:
-
        YYSETCONDITION(yycr1);
 #line 3 "condition_13.cg.re"
        goto yyc_r1;
-#line 20 "<stdout>"
+#line 19 "<stdout>"
 /* *********************************** */
 yyc_r1:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy5;
-               if (yych <= '1') goto yy8;
-               goto yy6;
+               if (yych <= '0') goto yy6;
+               if (yych <= '1') goto yy9;
+               goto yy7;
        } else {
-               if (yych <= '`') goto yy5;
-               if (yych <= 'a') goto yy10;
-               if (yych <= 'b') goto yy12;
+               if (yych <= '`') goto yy6;
+               if (yych <= 'a') goto yy11;
+               if (yych <= 'b') goto yy13;
        }
-yy5:
 yy6:
+yy7:
        ++YYCURSOR;
 #line 5 "condition_13.cg.re"
        goto yyc_r1;
-#line 39 "<stdout>"
-yy8:
+#line 38 "<stdout>"
+yy9:
        ++YYCURSOR;
 #line 4 "condition_13.cg.re"
        goto yyc_r1;
-#line 44 "<stdout>"
-yy10:
+#line 43 "<stdout>"
+yy11:
        ++YYCURSOR;
        YYSETCONDITION(yycr2);
 #line 6 "condition_13.cg.re"
        goto yyc_r2;
-#line 50 "<stdout>"
-yy12:
+#line 49 "<stdout>"
+yy13:
        ++YYCURSOR;
        YYSETCONDITION(yycr2);
 #line 7 "condition_13.cg.re"
        goto yyc_r2;
-#line 56 "<stdout>"
+#line 55 "<stdout>"
 /* *********************************** */
 yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy16;
-               if (yych <= '1') goto yy19;
-               goto yy17;
+               if (yych <= '0') goto yy17;
+               if (yych <= '1') goto yy20;
+               goto yy18;
        } else {
-               if (yych == 'b') goto yy21;
+               if (yych == 'b') goto yy22;
        }
-yy16:
 yy17:
+yy18:
        ++YYCURSOR;
        YYSETCONDITION(yycr1);
 #line 5 "condition_13.cg.re"
        goto yyc_r1;
-#line 74 "<stdout>"
-yy19:
+#line 73 "<stdout>"
+yy20:
        ++YYCURSOR;
        YYSETCONDITION(yycr1);
 #line 4 "condition_13.cg.re"
        goto yyc_r1;
-#line 80 "<stdout>"
-yy21:
+#line 79 "<stdout>"
+yy22:
        ++YYCURSOR;
 #line 7 "condition_13.cg.re"
        goto yyc_r2;
-#line 85 "<stdout>"
+#line 84 "<stdout>"
 }
 #line 9 "condition_13.cg.re"
 

diff --git a/re2c/test/condition_14.cbif.c b/re2c/test/condition_14.cbif.c
index 9cc63442472fb997dde4f5be9631b460a79eff02..a67d75234a131444c589c801a261fde475a18b2b 100644 (file)
--- a/re2c/test/condition_14.cbif.c
+++ b/re2c/test/condition_14.cbif.c
@@ -116,20 +116,19 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                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;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-               continue;
+               if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-               s->yych = *++s->cur;
-               goto yy3;
+               continue;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                s->cond = EStateNormal;
                continue;
@@ -140,110 +139,110 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                if (s->yych <= '\'') {
-                       if (s->yych == '"') goto yy13;
-                       if (s->yych <= '&') goto yy15;
-                       goto yy12;
+                       if (s->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                fputc(s->cur[-1], stdout);
                continue;
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                s->cond = EStateString;
                fputc(s->cur[-1], stdout);
                continue;
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                fputl("'\"'", 3, stdout);
                continue;
-yy22:
+yy23:
                ++s->cur;
                s->cond = EStateSkiptoeol;
                continue;
-yy24:
+yy25:
                ++s->cur;
                s->cond = EStateComment;
                continue;
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                fputc('[', stdout);
                continue;
-yy29:
+yy30:
                ++s->cur;
                fputc(']', stdout);
                continue;
-yy31:
+yy32:
                ++s->cur;
                fputc('{', stdout);
                continue;
-yy33:
+yy34:
                ++s->cur;
                fputc('}', stdout);
                continue;
-yy35:
+yy36:
                ++s->cur;
                fputc('#', stdout);
                continue;
-yy37:
+yy38:
                ++s->cur;
                fputc('\\', stdout);
                continue;
-yy39:
+yy40:
                ++s->cur;
                fputc('^', stdout);
                continue;
-yy41:
+yy42:
                ++s->cur;
                fputc('|', stdout);
                continue;
-yy43:
+yy44:
                ++s->cur;
                fputc('~', stdout);
                continue;
@@ -254,62 +253,62 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                if (s->yych <= '\r') {
-                       if (s->yych == '\n') goto yy51;
-                       if (s->yych <= '\f') goto yy53;
-                       goto yy50;
+                       if (s->yych == '\n') goto yy52;
+                       if (s->yych <= '\f') goto yy54;
+                       goto yy51;
                } else {
                        if (s->yych <= '?') {
-                               if (s->yych <= '>') goto yy53;
+                               if (s->yych <= '>') goto yy54;
                        } else {
-                               if (s->yych == '\\') goto yy49;
-                               goto yy53;
+                               if (s->yych == '\\') goto yy50;
+                               goto yy54;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy60;
-yy48:
-               continue;
+               if (s->yych == '?') goto yy61;
 yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy58;
-               if (s->yych == '\r') goto yy56;
-               goto yy48;
+               continue;
 yy50:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy54;
-               goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy59;
+               if (s->yych == '\r') goto yy57;
+               goto yy49;
 yy51:
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy55;
+               goto yy49;
+yy52:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\n', stdout);
                continue;
-yy53:
-               s->yych = *++s->cur;
-               goto yy48;
 yy54:
+               s->yych = *++s->cur;
+               goto yy49;
+yy55:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\r', stdout);
                fputc('\n', stdout);
                continue;
-yy56:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy58;
 yy57:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
 yy58:
+               s->cur = s->tok;
+               goto yy49;
+yy59:
                ++s->cur;
                continue;
-yy60:
+yy61:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy57;
+               if (s->yych != '/') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy63;
-               if (s->yych != '\r') goto yy57;
+               if (s->yych == '\n') goto yy64;
+               if (s->yych != '\r') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy57;
-yy63:
+               if (s->yych != '\n') goto yy58;
+yy64:
                ++s->cur;
                continue;
 /* *********************************** */
@@ -318,22 +317,22 @@ yyc_String:
                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;
+               if (s->yych == '"') goto yy70;
+               if (s->yych != '\\') goto yy72;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+               if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                fputc(s->cur[-1], stdout);
                continue;
-yy69:
+yy70:
                ++s->cur;
                s->cond = EStateNormal;
                fputc(s->cur[-1], stdout);
                continue;
-yy71:
-               s->yych = *++s->cur;
-               goto yy68;
 yy72:
+               s->yych = *++s->cur;
+               goto yy69;
+yy73:
                ++s->cur;
                fputl((const char*)s->cur-2, 2, stdout);
                continue;

diff --git a/re2c/test/condition_14.cgif.c b/re2c/test/condition_14.cgif.c
index af3f5b362715e8dde9eaedd40628c6b765c05707..3506c071575cf74e20a89944c61325803193a9ad 100755 (executable)
--- a/re2c/test/condition_14.cgif.c
+++ b/re2c/test/condition_14.cgif.c
@@ -105,20 +105,19 @@ yy0:
                        goto *yyctable[s->cond];
 /* *********************************** */
 yyc_Comment:
-
                        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;
+                       if (s->yych != '*') goto yy5;
                        ++s->cur;
-                       if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-                       continue;
+                       if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-                       s->yych = *++s->cur;
-                       goto yy3;
+                       continue;
 yy5:
+                       s->yych = *++s->cur;
+                       goto yy4;
+yy6:
                        ++s->cur;
                        s->cond = EStateNormal;
                        continue;
@@ -130,160 +129,160 @@ yyFillLabel1:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy13, &&yy15, &&yy15, &&yy15, &&yy15, &&yy12,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy11,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy9,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15,
-                                       &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15, &&yy15
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy14, &&yy16, &&yy16, &&yy16, &&yy16, &&yy13,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy12,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy10,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16,
+                                       &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16, &&yy16
                                };
                                goto *yytarget[s->yych];
                        }
-yy9:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy26;
 yy10:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '?') goto yy27;
+yy11:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy11:
-                       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->cur;
+                       if (s->yych == '*') goto yy25;
+                       if (s->yych == '/') goto yy23;
+                       goto yy11;
 yy13:
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '"') goto yy17;
+                       if (s->yych == '\\') goto yy19;
+                       goto yy11;
+yy14:
                        ++s->cur;
                        s->cond = EStateString;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy15:
-                       s->yych = *++s->cur;
-                       goto yy10;
 yy16:
                        s->yych = *++s->cur;
-                       if (s->yych == '\'') goto yy20;
+                       goto yy11;
 yy17:
-                       s->cur = s->tok;
-                       goto yy10;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\'') goto yy21;
 yy18:
+                       s->cur = s->tok;
+                       goto yy11;
+yy19:
                        s->yych = *++s->cur;
-                       if (s->yych != '"') goto yy17;
+                       if (s->yych != '"') goto yy18;
                        s->yych = *++s->cur;
-                       if (s->yych != '\'') goto yy17;
-yy20:
+                       if (s->yych != '\'') goto yy18;
+yy21:
                        ++s->cur;
                        fputl("'\"'", 3, stdout);
                        continue;
-yy22:
+yy23:
                        ++s->cur;
                        s->cond = EStateSkiptoeol;
                        continue;
-yy24:
+yy25:
                        ++s->cur;
                        s->cond = EStateComment;
                        continue;
-yy26:
+yy27:
                        s->yych = *++s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy41, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy39,
-                                       &&yy27, &&yy29, &&yy17, &&yy17, &&yy17, &&yy43, &&yy17, &&yy37,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy31, &&yy35, &&yy33, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17,
-                                       &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17, &&yy17
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy42, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy40,
+                                       &&yy28, &&yy30, &&yy18, &&yy18, &&yy18, &&yy44, &&yy18, &&yy38,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy32, &&yy36, &&yy34, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18,
+                                       &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18, &&yy18
                                };
                                goto *yytarget[s->yych];
                        }
-yy27:
+yy28:
                        ++s->cur;
                        fputc('[', stdout);
                        continue;
-yy29:
+yy30:
                        ++s->cur;
                        fputc(']', stdout);
                        continue;
-yy31:
+yy32:
                        ++s->cur;
                        fputc('{', stdout);
                        continue;
-yy33:
+yy34:
                        ++s->cur;
                        fputc('}', stdout);
                        continue;
-yy35:
+yy36:
                        ++s->cur;
                        fputc('#', stdout);
                        continue;
-yy37:
+yy38:
                        ++s->cur;
                        fputc('\\', stdout);
                        continue;
-yy39:
+yy40:
                        ++s->cur;
                        fputc('^', stdout);
                        continue;
-yy41:
+yy42:
                        ++s->cur;
                        fputc('|', stdout);
                        continue;
-yy43:
+yy44:
                        ++s->cur;
                        fputc('~', stdout);
                        continue;
@@ -295,87 +294,87 @@ yyFillLabel2:
                        s->yych = *s->cur;
                        {
                                static void *yytarget[256] = {
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy51, &&yy53, &&yy53, &&yy50, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy47,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy49, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53,
-                                       &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53, &&yy53
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy52, &&yy54, &&yy54, &&yy51, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy48,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy50, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54,
+                                       &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54, &&yy54
                                };
                                goto *yytarget[s->yych];
                        }
-yy47:
-                       s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '?') goto yy60;
 yy48:
-                       continue;
-yy49:
                        s->yych = *(s->tok = ++s->cur);
-                       if (s->yych == '\n') goto yy58;
-                       if (s->yych == '\r') goto yy56;
-                       goto yy48;
+                       if (s->yych == '?') goto yy61;
+yy49:
+                       continue;
 yy50:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy54;
-                       goto yy48;
+                       s->yych = *(s->tok = ++s->cur);
+                       if (s->yych == '\n') goto yy59;
+                       if (s->yych == '\r') goto yy57;
+                       goto yy49;
 yy51:
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy55;
+                       goto yy49;
+yy52:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\n', stdout);
                        continue;
-yy53:
-                       s->yych = *++s->cur;
-                       goto yy48;
 yy54:
+                       s->yych = *++s->cur;
+                       goto yy49;
+yy55:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc('\r', stdout);
                        fputc('\n', stdout);
                        continue;
-yy56:
-                       s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy58;
 yy57:
-                       s->cur = s->tok;
-                       goto yy48;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy59;
 yy58:
+                       s->cur = s->tok;
+                       goto yy49;
+yy59:
                        ++s->cur;
                        continue;
-yy60:
+yy61:
                        s->yych = *++s->cur;
-                       if (s->yych != '/') goto yy57;
+                       if (s->yych != '/') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych == '\n') goto yy63;
-                       if (s->yych != '\r') goto yy57;
+                       if (s->yych == '\n') goto yy64;
+                       if (s->yych != '\r') goto yy58;
                        s->yych = *++s->cur;
-                       if (s->yych != '\n') goto yy57;
-yy63:
+                       if (s->yych != '\n') goto yy58;
+yy64:
                        ++s->cur;
                        continue;
 /* *********************************** */
@@ -384,22 +383,22 @@ yyc_String:
                        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;
+                       if (s->yych == '"') goto yy70;
+                       if (s->yych != '\\') goto yy72;
                        ++s->cur;
-                       if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+                       if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                        fputc(s->cur[-1], stdout);
                        continue;
-yy69:
+yy70:
                        ++s->cur;
                        s->cond = EStateNormal;
                        fputc(s->cur[-1], stdout);
                        continue;
-yy71:
-                       s->yych = *++s->cur;
-                       goto yy68;
 yy72:
+                       s->yych = *++s->cur;
+                       goto yy69;
+yy73:
                        ++s->cur;
                        fputl((const char*)s->cur-2, 2, stdout);
                        continue;

diff --git a/re2c/test/condition_14.cif.c b/re2c/test/condition_14.cif.c
index 22b75850ff2eb85de5316185ece83301787fe8cf..e1786dd306e392c44b8ff6bfc3990bd383c19263 100644 (file)
--- a/re2c/test/condition_14.cif.c
+++ b/re2c/test/condition_14.cif.c
@@ -99,27 +99,26 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                s->state = 0;
                if ((s->lim - s->cur) < 2) if (fill(s, 2) == ~0) break;
 yyFillLabel0:
                s->yych = *s->cur;
                switch (s->yych) {
-               case '*':       goto yy2;
-               default:        goto yy4;
+               case '*':       goto yy3;
+               default:        goto yy5;
                }
-yy2:
+yy3:
                ++s->cur;
                switch ((s->yych = *s->cur)) {
-               case '/':       goto yy5;
-               default:        goto yy3;
+               case '/':       goto yy6;
+               default:        goto yy4;
                }
-yy3:
-               continue;
 yy4:
-               s->yych = *++s->cur;
-               goto yy3;
+               continue;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                s->cond = EStateNormal;
                continue;
@@ -130,123 +129,123 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                switch (s->yych) {
-               case '"':       goto yy13;
-               case '\'':      goto yy12;
-               case '/':       goto yy11;
-               case '?':       goto yy9;
-               default:        goto yy15;
+               case '"':       goto yy14;
+               case '\'':      goto yy13;
+               case '/':       goto yy12;
+               case '?':       goto yy10;
+               default:        goto yy16;
                }
-yy9:
+yy10:
                s->yych = *(s->tok = ++s->cur);
                switch (s->yych) {
-               case '?':       goto yy26;
-               default:        goto yy10;
+               case '?':       goto yy27;
+               default:        goto yy11;
                }
-yy10:
+yy11:
                fputc(s->cur[-1], stdout);
                continue;
-yy11:
+yy12:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '*':       goto yy24;
-               case '/':       goto yy22;
-               default:        goto yy10;
+               case '*':       goto yy25;
+               case '/':       goto yy23;
+               default:        goto yy11;
                }
-yy12:
+yy13:
                s->yych = *(s->tok = ++s->cur);
                switch (s->yych) {
-               case '"':       goto yy16;
-               case '\\':      goto yy18;
-               default:        goto yy10;
+               case '"':       goto yy17;
+               case '\\':      goto yy19;
+               default:        goto yy11;
                }
-yy13:
+yy14:
                ++s->cur;
                s->cond = EStateString;
                fputc(s->cur[-1], stdout);
                continue;
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               switch (s->yych) {
-               case '\'':      goto yy20;
-               default:        goto yy17;
-               }
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
-yy18:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '"':       goto yy19;
-               default:        goto yy17;
+               case '\'':      goto yy21;
+               default:        goto yy18;
                }
+yy18:
+               s->cur = s->tok;
+               goto yy11;
 yy19:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '\'':      goto yy20;
-               default:        goto yy17;
+               case '"':       goto yy20;
+               default:        goto yy18;
                }
 yy20:
+               s->yych = *++s->cur;
+               switch (s->yych) {
+               case '\'':      goto yy21;
+               default:        goto yy18;
+               }
+yy21:
                ++s->cur;
                fputl("'\"'", 3, stdout);
                continue;
-yy22:
+yy23:
                ++s->cur;
                s->cond = EStateSkiptoeol;
                continue;
-yy24:
+yy25:
                ++s->cur;
                s->cond = EStateComment;
                continue;
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                fputc('[', stdout);
                continue;
-yy29:
+yy30:
                ++s->cur;
                fputc(']', stdout);
                continue;
-yy31:
+yy32:
                ++s->cur;
                fputc('{', stdout);
                continue;
-yy33:
+yy34:
                ++s->cur;
                fputc('}', stdout);
                continue;
-yy35:
+yy36:
                ++s->cur;
                fputc('#', stdout);
                continue;
-yy37:
+yy38:
                ++s->cur;
                fputc('\\', stdout);
                continue;
-yy39:
+yy40:
                ++s->cur;
                fputc('^', stdout);
                continue;
-yy41:
+yy42:
                ++s->cur;
                fputc('|', stdout);
                continue;
-yy43:
+yy44:
                ++s->cur;
                fputc('~', stdout);
                continue;
@@ -257,79 +256,79 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                switch (s->yych) {
-               case '\n':      goto yy51;
-               case '\r':      goto yy50;
-               case '?':       goto yy47;
-               case '\\':      goto yy49;
-               default:        goto yy53;
+               case '\n':      goto yy52;
+               case '\r':      goto yy51;
+               case '?':       goto yy48;
+               case '\\':      goto yy50;
+               default:        goto yy54;
                }
-yy47:
+yy48:
                s->yych = *(s->tok = ++s->cur);
                switch (s->yych) {
-               case '?':       goto yy60;
-               default:        goto yy48;
+               case '?':       goto yy61;
+               default:        goto yy49;
                }
-yy48:
-               continue;
 yy49:
+               continue;
+yy50:
                s->yych = *(s->tok = ++s->cur);
                switch (s->yych) {
-               case '\n':      goto yy58;
-               case '\r':      goto yy56;
-               default:        goto yy48;
+               case '\n':      goto yy59;
+               case '\r':      goto yy57;
+               default:        goto yy49;
                }
-yy50:
+yy51:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '\n':      goto yy54;
-               default:        goto yy48;
+               case '\n':      goto yy55;
+               default:        goto yy49;
                }
-yy51:
+yy52:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\n', stdout);
                continue;
-yy53:
-               s->yych = *++s->cur;
-               goto yy48;
 yy54:
+               s->yych = *++s->cur;
+               goto yy49;
+yy55:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\r', stdout);
                fputc('\n', stdout);
                continue;
-yy56:
+yy57:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '\n':      goto yy58;
-               default:        goto yy57;
+               case '\n':      goto yy59;
+               default:        goto yy58;
                }
-yy57:
-               s->cur = s->tok;
-               goto yy48;
 yy58:
+               s->cur = s->tok;
+               goto yy49;
+yy59:
                ++s->cur;
                continue;
-yy60:
-               s->yych = *++s->cur;
-               switch (s->yych) {
-               case '/':       goto yy61;
-               default:        goto yy57;
-               }
 yy61:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '\n':      goto yy63;
-               case '\r':      goto yy62;
-               default:        goto yy57;
+               case '/':       goto yy62;
+               default:        goto yy58;
                }
 yy62:
                s->yych = *++s->cur;
                switch (s->yych) {
-               case '\n':      goto yy63;
-               default:        goto yy57;
+               case '\n':      goto yy64;
+               case '\r':      goto yy63;
+               default:        goto yy58;
                }
 yy63:
+               s->yych = *++s->cur;
+               switch (s->yych) {
+               case '\n':      goto yy64;
+               default:        goto yy58;
+               }
+yy64:
                ++s->cur;
                continue;
 /* *********************************** */
@@ -339,28 +338,28 @@ yyc_String:
 yyFillLabel3:
                s->yych = *s->cur;
                switch (s->yych) {
-               case '"':       goto yy69;
-               case '\\':      goto yy67;
-               default:        goto yy71;
+               case '"':       goto yy70;
+               case '\\':      goto yy68;
+               default:        goto yy72;
                }
-yy67:
+yy68:
                ++s->cur;
                switch ((s->yych = *s->cur)) {
-               case '\n':      goto yy68;
-               default:        goto yy72;
+               case '\n':      goto yy69;
+               default:        goto yy73;
                }
-yy68:
+yy69:
                fputc(s->cur[-1], stdout);
                continue;
-yy69:
+yy70:
                ++s->cur;
                s->cond = EStateNormal;
                fputc(s->cur[-1], stdout);
                continue;
-yy71:
-               s->yych = *++s->cur;
-               goto yy68;
 yy72:
+               s->yych = *++s->cur;
+               goto yy69;
+yy73:
                ++s->cur;
                fputl((const char*)s->cur-2, 2, stdout);
                continue;

diff --git a/re2c/test/condition_14.csif.c b/re2c/test/condition_14.csif.c
index 79d1661179bdaf2d3bf58e0898ba92dfd93da570..1ed996733647ff661c1adf3bc4af617a26267665 100644 (file)
--- a/re2c/test/condition_14.csif.c
+++ b/re2c/test/condition_14.csif.c
@@ -106,20 +106,19 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                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;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-               continue;
+               if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-               s->yych = *++s->cur;
-               goto yy3;
+               continue;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                s->cond = EStateNormal;
                continue;
@@ -130,110 +129,110 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                if (s->yych <= '\'') {
-                       if (s->yych == '"') goto yy13;
-                       if (s->yych <= '&') goto yy15;
-                       goto yy12;
+                       if (s->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                fputc(s->cur[-1], stdout);
                continue;
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                s->cond = EStateString;
                fputc(s->cur[-1], stdout);
                continue;
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                fputl("'\"'", 3, stdout);
                continue;
-yy22:
+yy23:
                ++s->cur;
                s->cond = EStateSkiptoeol;
                continue;
-yy24:
+yy25:
                ++s->cur;
                s->cond = EStateComment;
                continue;
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                fputc('[', stdout);
                continue;
-yy29:
+yy30:
                ++s->cur;
                fputc(']', stdout);
                continue;
-yy31:
+yy32:
                ++s->cur;
                fputc('{', stdout);
                continue;
-yy33:
+yy34:
                ++s->cur;
                fputc('}', stdout);
                continue;
-yy35:
+yy36:
                ++s->cur;
                fputc('#', stdout);
                continue;
-yy37:
+yy38:
                ++s->cur;
                fputc('\\', stdout);
                continue;
-yy39:
+yy40:
                ++s->cur;
                fputc('^', stdout);
                continue;
-yy41:
+yy42:
                ++s->cur;
                fputc('|', stdout);
                continue;
-yy43:
+yy44:
                ++s->cur;
                fputc('~', stdout);
                continue;
@@ -244,62 +243,62 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                if (s->yych <= '\r') {
-                       if (s->yych == '\n') goto yy51;
-                       if (s->yych <= '\f') goto yy53;
-                       goto yy50;
+                       if (s->yych == '\n') goto yy52;
+                       if (s->yych <= '\f') goto yy54;
+                       goto yy51;
                } else {
                        if (s->yych <= '?') {
-                               if (s->yych <= '>') goto yy53;
+                               if (s->yych <= '>') goto yy54;
                        } else {
-                               if (s->yych == '\\') goto yy49;
-                               goto yy53;
+                               if (s->yych == '\\') goto yy50;
+                               goto yy54;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy60;
-yy48:
-               continue;
+               if (s->yych == '?') goto yy61;
 yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy58;
-               if (s->yych == '\r') goto yy56;
-               goto yy48;
+               continue;
 yy50:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy54;
-               goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy59;
+               if (s->yych == '\r') goto yy57;
+               goto yy49;
 yy51:
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy55;
+               goto yy49;
+yy52:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\n', stdout);
                continue;
-yy53:
-               s->yych = *++s->cur;
-               goto yy48;
 yy54:
+               s->yych = *++s->cur;
+               goto yy49;
+yy55:
                ++s->cur;
                s->cond = EStateNormal;
                fputc('\r', stdout);
                fputc('\n', stdout);
                continue;
-yy56:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy58;
 yy57:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
 yy58:
+               s->cur = s->tok;
+               goto yy49;
+yy59:
                ++s->cur;
                continue;
-yy60:
+yy61:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy57;
+               if (s->yych != '/') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy63;
-               if (s->yych != '\r') goto yy57;
+               if (s->yych == '\n') goto yy64;
+               if (s->yych != '\r') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy57;
-yy63:
+               if (s->yych != '\n') goto yy58;
+yy64:
                ++s->cur;
                continue;
 /* *********************************** */
@@ -308,22 +307,22 @@ yyc_String:
                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;
+               if (s->yych == '"') goto yy70;
+               if (s->yych != '\\') goto yy72;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+               if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                fputc(s->cur[-1], stdout);
                continue;
-yy69:
+yy70:
                ++s->cur;
                s->cond = EStateNormal;
                fputc(s->cur[-1], stdout);
                continue;
-yy71:
-               s->yych = *++s->cur;
-               goto yy68;
 yy72:
+               s->yych = *++s->cur;
+               goto yy69;
+yy73:
                ++s->cur;
                fputl((const char*)s->cur-2, 2, stdout);
                continue;

diff --git a/re2c/test/condition_15.csif.c b/re2c/test/condition_15.csif.c
index 6e4ab936ed240f9be36786d917cb8398cbe7b399..4ca3e799bc6186a690cc9afffcc4555dd11811a8 100755 (executable)
--- a/re2c/test/condition_15.csif.c
+++ b/re2c/test/condition_15.csif.c
@@ -106,20 +106,19 @@ yy0:
                }
 /* *********************************** */
 yyc_Comment:
-
                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;
+               if (s->yych != '*') goto yy5;
                ++s->cur;
-               if ((s->yych = *s->cur) == '/') goto yy5;
-yy3:
-               continue;
+               if ((s->yych = *s->cur) == '/') goto yy6;
 yy4:
-               s->yych = *++s->cur;
-               goto yy3;
+               continue;
 yy5:
+               s->yych = *++s->cur;
+               goto yy4;
+yy6:
                ++s->cur;
                s->cond = EStateNormal;
                continue;
@@ -130,121 +129,121 @@ yyc_Normal:
 yyFillLabel1:
                s->yych = *s->cur;
                if (s->yych <= '\'') {
-                       if (s->yych == '"') goto yy13;
-                       if (s->yych <= '&') goto yy15;
-                       goto yy12;
+                       if (s->yych == '"') goto yy14;
+                       if (s->yych <= '&') goto yy16;
+                       goto yy13;
                } else {
                        if (s->yych <= '/') {
-                               if (s->yych <= '.') goto yy15;
-                               goto yy11;
+                               if (s->yych <= '.') goto yy16;
+                               goto yy12;
                        } else {
-                               if (s->yych != '?') goto yy15;
+                               if (s->yych != '?') goto yy16;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy26;
-yy10:
+               if (s->yych == '?') goto yy27;
+yy11:
                fprintf(stderr, "Normal\n");
                fputc(s->cur[-1], stdout);
                continue;
-yy11:
-               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->cur;
+               if (s->yych == '*') goto yy25;
+               if (s->yych == '/') goto yy23;
+               goto yy11;
 yy13:
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '"') goto yy17;
+               if (s->yych == '\\') goto yy19;
+               goto yy11;
+yy14:
                ++s->cur;
                s->cond = EStateString;
                fprintf(stderr, "Normal\n");
                fputc(s->cur[-1], stdout);
                continue;
-yy15:
-               s->yych = *++s->cur;
-               goto yy10;
 yy16:
                s->yych = *++s->cur;
-               if (s->yych == '\'') goto yy20;
+               goto yy11;
 yy17:
-               s->cur = s->tok;
-               goto yy10;
+               s->yych = *++s->cur;
+               if (s->yych == '\'') goto yy21;
 yy18:
+               s->cur = s->tok;
+               goto yy11;
+yy19:
                s->yych = *++s->cur;
-               if (s->yych != '"') goto yy17;
+               if (s->yych != '"') goto yy18;
                s->yych = *++s->cur;
-               if (s->yych != '\'') goto yy17;
-yy20:
+               if (s->yych != '\'') goto yy18;
+yy21:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputl("'\"'", 3, stdout);
                continue;
-yy22:
+yy23:
                ++s->cur;
                s->cond = EStateSkiptoeol;
                continue;
-yy24:
+yy25:
                ++s->cur;
                s->cond = EStateComment;
                continue;
-yy26:
+yy27:
                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;
+               case '!':       goto yy42;
+               case '\'':      goto yy40;
+               case '(':       goto yy28;
+               case ')':       goto yy30;
+               case '-':       goto yy44;
+               case '/':       goto yy38;
+               case '<':       goto yy32;
+               case '=':       goto yy36;
+               case '>':       goto yy34;
+               default:        goto yy18;
                }
-yy27:
+yy28:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('[', stdout);
                continue;
-yy29:
+yy30:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc(']', stdout);
                continue;
-yy31:
+yy32:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('{', stdout);
                continue;
-yy33:
+yy34:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('}', stdout);
                continue;
-yy35:
+yy36:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('#', stdout);
                continue;
-yy37:
+yy38:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('\\', stdout);
                continue;
-yy39:
+yy40:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('^', stdout);
                continue;
-yy41:
+yy42:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('|', stdout);
                continue;
-yy43:
+yy44:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputc('~', stdout);
@@ -256,64 +255,64 @@ yyc_Skiptoeol:
 yyFillLabel2:
                s->yych = *s->cur;
                if (s->yych <= '\r') {
-                       if (s->yych == '\n') goto yy51;
-                       if (s->yych <= '\f') goto yy53;
-                       goto yy50;
+                       if (s->yych == '\n') goto yy52;
+                       if (s->yych <= '\f') goto yy54;
+                       goto yy51;
                } else {
                        if (s->yych <= '?') {
-                               if (s->yych <= '>') goto yy53;
+                               if (s->yych <= '>') goto yy54;
                        } else {
-                               if (s->yych == '\\') goto yy49;
-                               goto yy53;
+                               if (s->yych == '\\') goto yy50;
+                               goto yy54;
                        }
                }
                s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '?') goto yy60;
-yy48:
-               continue;
+               if (s->yych == '?') goto yy61;
 yy49:
-               s->yych = *(s->tok = ++s->cur);
-               if (s->yych == '\n') goto yy58;
-               if (s->yych == '\r') goto yy56;
-               goto yy48;
+               continue;
 yy50:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy54;
-               goto yy48;
+               s->yych = *(s->tok = ++s->cur);
+               if (s->yych == '\n') goto yy59;
+               if (s->yych == '\r') goto yy57;
+               goto yy49;
 yy51:
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy55;
+               goto yy49;
+yy52:
                ++s->cur;
                s->cond = EStateNormal;
                fprintf(stderr, "Comment\n");
                fputc('\n', stdout);
                continue;
-yy53:
-               s->yych = *++s->cur;
-               goto yy48;
 yy54:
+               s->yych = *++s->cur;
+               goto yy49;
+yy55:
                ++s->cur;
                s->cond = EStateNormal;
                fprintf(stderr, "Comment\n");
                fputc('\r', stdout);
                fputc('\n', stdout);
                continue;
-yy56:
-               s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy58;
 yy57:
-               s->cur = s->tok;
-               goto yy48;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
 yy58:
+               s->cur = s->tok;
+               goto yy49;
+yy59:
                ++s->cur;
                continue;
-yy60:
+yy61:
                s->yych = *++s->cur;
-               if (s->yych != '/') goto yy57;
+               if (s->yych != '/') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych == '\n') goto yy63;
-               if (s->yych != '\r') goto yy57;
+               if (s->yych == '\n') goto yy64;
+               if (s->yych != '\r') goto yy58;
                s->yych = *++s->cur;
-               if (s->yych != '\n') goto yy57;
-yy63:
+               if (s->yych != '\n') goto yy58;
+yy64:
                ++s->cur;
                continue;
 /* *********************************** */
@@ -322,24 +321,24 @@ yyc_String:
                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;
+               if (s->yych == '"') goto yy70;
+               if (s->yych != '\\') goto yy72;
                ++s->cur;
-               if ((s->yych = *s->cur) != '\n') goto yy72;
-yy68:
+               if ((s->yych = *s->cur) != '\n') goto yy73;
+yy69:
                fprintf(stderr, "Normal\n");
                fputc(s->cur[-1], stdout);
                continue;
-yy69:
+yy70:
                ++s->cur;
                s->cond = EStateNormal;
                fprintf(stderr, "Normal\n");
                fputc(s->cur[-1], stdout);
                continue;
-yy71:
-               s->yych = *++s->cur;
-               goto yy68;
 yy72:
+               s->yych = *++s->cur;
+               goto yy69;
+yy73:
                ++s->cur;
                fprintf(stderr, "Normal\n");
                fputl((const char*)s->cur-2, 2, stdout);

diff --git a/re2c/test/dot_conditions.Dc.c b/re2c/test/dot_conditions.Dc.c
index ac95120d3a48a23b6177fdcfd96328e2a0539fb9..987ee01e7db0bcd1f963576fe3fe9b1cbb9996c0 100644 (file)
--- a/re2c/test/dot_conditions.Dc.c
+++ b/re2c/test/dot_conditions.Dc.c
@@ -5,31 +5,30 @@ digraph re2c {
 0 -> state1 [label="state=state1"]
 0 -> state2 [label="state=state2"]
 /* *********************************** */
-state1 -> 1
-
-1 -> 3 [label="a"]
-1 -> 4 [label="f"]
-1 -> 2 [label=default]
-3 -> 8 [label="b"]
-3 -> 2 [label=default]
-4 -> 5 [label="o"]
-4 -> 2 [label=default]
+state1 -> 2
+2 -> 4 [label="a"]
+2 -> 5 [label="f"]
+2 -> 3 [label=default]
+4 -> 9 [label="b"]
+4 -> 3 [label=default]
 5 -> 6 [label="o"]
-5 -> 2 [label=default]
-6 -> 7
-7 [label="dot_conditions.Dc.re:8"];
-8 -> 9 [label="c"]
-8 -> 2 [label=default]
-9 -> 10
-10 [label="dot_conditions.Dc.re:6"];
+5 -> 3 [label=default]
+6 -> 7 [label="o"]
+6 -> 3 [label=default]
+7 -> 8
+8 [label="dot_conditions.Dc.re:8"];
+9 -> 10 [label="c"]
+9 -> 3 [label=default]
+10 -> 11
+11 [label="dot_conditions.Dc.re:6"];
 /* *********************************** */
-state2 -> 12
-12 -> 14 [label="a"]
-12 -> 13 [label=default]
-14 -> 15 [label="b"]
-14 -> 13 [label=default]
-15 -> 16 [label="c"]
-15 -> 13 [label=default]
-16 -> 17
-17 [label="dot_conditions.Dc.re:7"];
+state2 -> 13
+13 -> 15 [label="a"]
+13 -> 14 [label=default]
+15 -> 16 [label="b"]
+15 -> 14 [label=default]
+16 -> 17 [label="c"]
+16 -> 14 [label=default]
+17 -> 18
+18 [label="dot_conditions.Dc.re:7"];
 }

diff --git a/re2c/test/repeat-01.cgir.c b/re2c/test/repeat-01.cgir.c
index 578f575f1f89b24968072e66486991c3c848afbe..efd001e758c2637273a39b4e3d5ad81657de0fb6 100755 (executable)
--- a/re2c/test/repeat-01.cgir.c
+++ b/re2c/test/repeat-01.cgir.c
@@ -20,29 +20,28 @@ void scan(unsigned char* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
        { return "2"; }
-yy5:
+yy6:
        ++YYCURSOR;
        { return "1"; }
-yy7:
+yy8:
        ++YYCURSOR;
        { return "a"; }
-yy9:
+yy10:
        ++YYCURSOR;
        { return "b"; }
 /* *********************************** */
@@ -50,20 +49,20 @@ yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++YYCURSOR;
        { return "2"; }
-yy16:
+yy17:
        ++YYCURSOR;
        { return "1"; }
-yy18:
+yy19:
        ++YYCURSOR;
        { return "b"; }
 }
@@ -82,29 +81,28 @@ void scan(unsigned short* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
        { return "2"; }
-yy5:
+yy6:
        ++YYCURSOR;
        { return "1"; }
-yy7:
+yy8:
        ++YYCURSOR;
        { return "a"; }
-yy9:
+yy10:
        ++YYCURSOR;
        { return "b"; }
 /* *********************************** */
@@ -112,20 +110,20 @@ yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++YYCURSOR;
        { return "2"; }
-yy16:
+yy17:
        ++YYCURSOR;
        { return "1"; }
-yy18:
+yy19:
        ++YYCURSOR;
        { return "b"; }
 }
@@ -144,29 +142,28 @@ void scan(unsigned int* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
        { return "2"; }
-yy5:
+yy6:
        ++YYCURSOR;
        { return "1"; }
-yy7:
+yy8:
        ++YYCURSOR;
        { return "a"; }
-yy9:
+yy10:
        ++YYCURSOR;
        { return "b"; }
 /* *********************************** */
@@ -174,20 +171,20 @@ yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++YYCURSOR;
        { return "2"; }
-yy16:
+yy17:
        ++YYCURSOR;
        { return "1"; }
-yy18:
+yy19:
        ++YYCURSOR;
        { return "b"; }
 }

diff --git a/re2c/test/repeat-02.cgir.c b/re2c/test/repeat-02.cgir.c
index 2523688aa9df94c98adba3f9c2f80a01f15e69c1..f3b3ee747ccca27c3113b2d1244865d813f47944 100755 (executable)
--- a/re2c/test/repeat-02.cgir.c
+++ b/re2c/test/repeat-02.cgir.c
@@ -20,29 +20,28 @@ void scan(unsigned char* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (limit1 <= cursor1) fill1(1);
        yych = *cursor1;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++cursor1;
        { return "2"; }
-yy5:
+yy6:
        ++cursor1;
        { return "1"; }
-yy7:
+yy8:
        ++cursor1;
        { return "a"; }
-yy9:
+yy10:
        ++cursor1;
        { return "b"; }
 /* *********************************** */
@@ -50,20 +49,20 @@ yyc_r2:
        if (limit1 <= cursor1) fill1(1);
        yych = *cursor1;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++cursor1;
        { return "2"; }
-yy16:
+yy17:
        ++cursor1;
        { return "1"; }
-yy18:
+yy19:
        ++cursor1;
        { return "b"; }
 }
@@ -82,29 +81,28 @@ void scan(unsigned short* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (limit2 <= cursor2) fill2(1);
        yych = *cursor2;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++cursor2;
        { return "2"; }
-yy5:
+yy6:
        ++cursor2;
        { return "1"; }
-yy7:
+yy8:
        ++cursor2;
        { return "a"; }
-yy9:
+yy10:
        ++cursor2;
        { return "b"; }
 /* *********************************** */
@@ -112,20 +110,20 @@ yyc_r2:
        if (limit2 <= cursor2) fill2(1);
        yych = *cursor2;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++cursor2;
        { return "2"; }
-yy16:
+yy17:
        ++cursor2;
        { return "1"; }
-yy18:
+yy19:
        ++cursor2;
        { return "b"; }
 }
@@ -144,29 +142,28 @@ void scan(unsigned int* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (limit3 <= cursor3) fill3(1);
        yych = *cursor3;
        if (yych <= '2') {
-               if (yych <= '0') goto yy2;
-               if (yych <= '1') goto yy5;
-               goto yy3;
+               if (yych <= '0') goto yy3;
+               if (yych <= '1') goto yy6;
+               goto yy4;
        } else {
-               if (yych <= '`') goto yy2;
-               if (yych <= 'a') goto yy7;
-               if (yych <= 'b') goto yy9;
+               if (yych <= '`') goto yy3;
+               if (yych <= 'a') goto yy8;
+               if (yych <= 'b') goto yy10;
        }
-yy2:
 yy3:
+yy4:
        ++cursor3;
        { return "2"; }
-yy5:
+yy6:
        ++cursor3;
        { return "1"; }
-yy7:
+yy8:
        ++cursor3;
        { return "a"; }
-yy9:
+yy10:
        ++cursor3;
        { return "b"; }
 /* *********************************** */
@@ -174,20 +171,20 @@ yyc_r2:
        if (limit3 <= cursor3) fill3(1);
        yych = *cursor3;
        if (yych <= '2') {
-               if (yych <= '0') goto yy13;
-               if (yych <= '1') goto yy16;
-               goto yy14;
+               if (yych <= '0') goto yy14;
+               if (yych <= '1') goto yy17;
+               goto yy15;
        } else {
-               if (yych == 'b') goto yy18;
+               if (yych == 'b') goto yy19;
        }
-yy13:
 yy14:
+yy15:
        ++cursor3;
        { return "2"; }
-yy16:
+yy17:
        ++cursor3;
        { return "1"; }
-yy18:
+yy19:
        ++cursor3;
        { return "b"; }
 }

diff --git a/re2c/test/repeat-03.cgir.c b/re2c/test/repeat-03.cgir.c
index 4023045314d4192271606926d842573f403f4d8c..90e2a9ba0cf0698fe92ac4a58bb93b0ebcb0146a 100755 (executable)
--- a/re2c/test/repeat-03.cgir.c
+++ b/re2c/test/repeat-03.cgir.c
@@ -20,60 +20,59 @@ void scan(unsigned char* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        {
                static void *yytarget[256] = {
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy2,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy5,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy7,  &&yy9,  &&yy11, &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy3,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy6,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy8,  &&yy10, &&yy12, &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4
                };
                goto *yytarget[yych];
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
        { return "."; }
-yy5:
+yy6:
        ++YYCURSOR;
        { return "1"; }
-yy7:
+yy8:
        ++YYCURSOR;
        { return "a"; }
-yy9:
+yy10:
        ++YYCURSOR;
        { return "b"; }
-yy11:
+yy12:
        ++YYCURSOR;
        { return "c"; }
 /* *********************************** */
@@ -81,19 +80,19 @@ yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '`') {
-               if (yych != '\n') goto yy16;
+               if (yych != '\n') goto yy17;
        } else {
-               if (yych <= 'a') goto yy18;
-               if (yych == 'c') goto yy20;
-               goto yy16;
+               if (yych <= 'a') goto yy19;
+               if (yych == 'c') goto yy21;
+               goto yy17;
        }
-yy16:
+yy17:
        ++YYCURSOR;
        { return "."; }
-yy18:
+yy19:
        ++YYCURSOR;
        { return "a"; }
-yy20:
+yy21:
        ++YYCURSOR;
        { return "c"; }
 }
@@ -113,60 +112,59 @@ void scan(unsigned short* in)
        goto *yyctable[YYGETCONDITION()];
 /* *********************************** */
 yyc_r1:
-
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        {
                static void *yytarget[256] = {
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy2,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy5,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy7,  &&yy9,  &&yy11, &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,
-                       &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3,  &&yy3
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy3,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy6,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy8,  &&yy10, &&yy12, &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
+                       &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4
                };
                goto *yytarget[yych];
        }
-yy2:
 yy3:
+yy4:
        ++YYCURSOR;
        { return "."; }
-yy5:
+yy6:
        ++YYCURSOR;
        { return "2"; }
-yy7:
+yy8:
        ++YYCURSOR;
        { return "a"; }
-yy9:
+yy10:
        ++YYCURSOR;
        { return "b"; }
-yy11:
+yy12:
        ++YYCURSOR;
        { return "c"; }
 /* *********************************** */
@@ -174,19 +172,19 @@ yyc_r2:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= '`') {
-               if (yych != '\n') goto yy16;
+               if (yych != '\n') goto yy17;
        } else {
-               if (yych <= 'a') goto yy18;
-               if (yych == 'c') goto yy20;
-               goto yy16;
+               if (yych <= 'a') goto yy19;
+               if (yych == 'c') goto yy21;
+               goto yy17;
        }
-yy16:
+yy17:
        ++YYCURSOR;
        { return "."; }
-yy18:
+yy19:
        ++YYCURSOR;
        { return "a"; }
-yy20:
+yy21:
        ++YYCURSOR;
        { return "c"; }
 }

diff --git a/re2c/test/yyaccept_missing.bci.c b/re2c/test/yyaccept_missing.bci.c
index 212c5fdfeb6950bcadc449bd935b449c8c7af775..a2bc1cb2415fd88c49e7f2c94ee3d17b4a711c67 100755 (executable)
--- a/re2c/test/yyaccept_missing.bci.c
+++ b/re2c/test/yyaccept_missing.bci.c
@@ -42,25 +42,24 @@ int scan(char *s, int l)
                        }
 /* *********************************** */
 yyc_INITIAL:
-
                        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
                        yych = *YYCURSOR;
-                       if (yych <= 0x00) goto yy4;
-                       if (yych != '$') goto yy6;
+                       if (yych <= 0x00) goto yy5;
+                       if (yych != '$') goto yy7;
                        ++YYCURSOR;
-                       if ((yych = *YYCURSOR) <= '@') goto yy3;
-                       if (yych <= 'Z') goto yy7;
-                       if (yych <= '`') goto yy3;
-                       if (yych <= 'z') goto yy7;
-yy3:
-                       { printf("ERR\n");      return 1; }
+                       if ((yych = *YYCURSOR) <= '@') goto yy4;
+                       if (yych <= 'Z') goto yy8;
+                       if (yych <= '`') goto yy4;
+                       if (yych <= 'z') goto yy8;
 yy4:
+                       { printf("ERR\n");      return 1; }
+yy5:
                        ++YYCURSOR;
                        { printf("EOF\n");      return 0; }
-yy6:
-                       yych = *++YYCURSOR;
-                       goto yy3;
 yy7:
+                       yych = *++YYCURSOR;
+                       goto yy4;
+yy8:
                        ++YYCURSOR;
                        {
                printf("FOUND %s\n", t);
@@ -106,44 +105,44 @@ yyc_ST_VALUE:
                                if (YYLIMIT <= YYCURSOR) YYFILL(1);
                                yych = *(YYMARKER = YYCURSOR);
                                if (yybm[0+yych] & 128) {
-                                       goto yy14;
+                                       goto yy15;
                                }
-                               if (yych == '$') goto yy12;
-yy11:
+                               if (yych == '$') goto yy13;
+yy12:
                                {
                YYSETCONDITION(STATE(INITIAL));
                printf("Found spaces\n");
        }
-yy12:
+yy13:
                                ++YYCURSOR;
                                if (YYLIMIT <= YYCURSOR) YYFILL(1);
                                yych = *YYCURSOR;
-                               if (yych <= '@') goto yy13;
-                               if (yych <= 'Z') goto yy16;
-                               if (yych <= '`') goto yy13;
-                               if (yych <= 'z') goto yy16;
-yy13:
+                               if (yych <= '@') goto yy14;
+                               if (yych <= 'Z') goto yy17;
+                               if (yych <= '`') goto yy14;
+                               if (yych <= 'z') goto yy17;
+yy14:
                                YYCURSOR = YYMARKER;
                                if (yyaccept == 0) {
-                                       goto yy11;
+                                       goto yy12;
                                } else {
-                                       goto yy17;
+                                       goto yy18;
                                }
-yy14:
+yy15:
                                ++YYCURSOR;
                                if (YYLIMIT <= YYCURSOR) YYFILL(1);
                                yych = *YYCURSOR;
                                if (yybm[0+yych] & 128) {
-                                       goto yy14;
+                                       goto yy15;
                                }
-                               goto yy11;
-yy16:
+                               goto yy12;
+yy17:
                                yyaccept = 1;
                                YYMARKER = ++YYCURSOR;
                                if (YYLIMIT <= YYCURSOR) YYFILL(1);
                                yych = *YYCURSOR;
-                               if (yych == '$') goto yy12;
-yy17:
+                               if (yych == '$') goto yy13;
+yy18:
                                {
                printf("Found $ or $\\<x>\n");
                continue;