Don't move the closing tag of POSIX capture group out of the enclosing iteration.

RE2C used to perform the following optimization: when a POSIX capture is
under iteration, we only need to get tag values of the last iteration
(according to the POSIX standard). Therefore we can move the closing tag
out of loop.

This commit removes this optimization (as part of the effort to switch
from Kuklewicz POSIX disambiguation algorthm to Okui algorithm).

In other words, for RE (x)* re2c used to generate this "optimized" IRE:
    1 (3 x)* 4 2
and now it generates the "canonical" IRE:
    1 (3 x 4)* 2

Updated tests for '--posix-captures' that have been affected by the change.

diff --git a/re2c/src/re/ast_to_re.cc b/re2c/src/re/ast_to_re.cc
index dbcd0d07a3f0f905def3bb51f31bffeaf6f0e715..c1a13a99f512673db98a395c5a7c07c07be7b7b0 100644 (file)
--- a/re2c/src/re/ast_to_re.cc
+++ b/re2c/src/re/ast_to_re.cc
@@ -258,8 +258,8 @@ static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
                        } else  {
                                y = ast_to_re(spec, x, ncap);
                                y = re_cat(alc, t1, y);
-                               y = re_iter(alc, y, n1, m);
                                y = re_cat(alc, y, t2);
+                               y = re_iter(alc, y, n1, m);
                        }
                        if (n == 0) {
                                y = re_alt(alc, y, re_nil(alc));

diff --git a/re2c/test/posix_captures/basic/01.i--flex-syntax.c b/re2c/test/posix_captures/basic/01.i--flex-syntax.c
index f5a76faa3dbcf6d80638137379da6e401db1e666..90adc86b163fe8b2ca7d91c7c15601f24f3ea182 100644 (file)
--- a/re2c/test/posix_captures/basic/01.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/01.i--flex-syntax.c
@@ -2,7 +2,7 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
                yyt3 = yyt5 = NULL;
@@ -41,45 +41,29 @@ yy5:
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt2 = yyt6;
-               yyt4 = yyt5 = NULL;
-               yyt3 = YYCURSOR;
-               goto yy2;
-       }
-       yyt3 = yyt4 = yyt5 = YYCURSOR;
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt3 = yyt6;
-               yyt4 = yyt6;
-               yyt5 = YYCURSOR;
-               goto yy2;
-       }
-yy9:
+yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
                yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt6;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt2;
-       yyt4 = yyt2;
-       yyt6 = yyt5;
-       yyt5 = yyt2;
-       goto yy9;
+       yyt2 = yyt6;
+       yyt6 = yyt3;
+       goto yy7;
 }
 
 re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/basic/02.i--flex-syntax.c b/re2c/test/posix_captures/basic/02.i--flex-syntax.c
index f5a76faa3dbcf6d80638137379da6e401db1e666..90adc86b163fe8b2ca7d91c7c15601f24f3ea182 100644 (file)
--- a/re2c/test/posix_captures/basic/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/02.i--flex-syntax.c
@@ -2,7 +2,7 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
                yyt3 = yyt5 = NULL;
@@ -41,45 +41,29 @@ yy5:
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt2 = yyt6;
-               yyt4 = yyt5 = NULL;
-               yyt3 = YYCURSOR;
-               goto yy2;
-       }
-       yyt3 = yyt4 = yyt5 = YYCURSOR;
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt3 = yyt6;
-               yyt4 = yyt6;
-               yyt5 = YYCURSOR;
-               goto yy2;
-       }
-yy9:
+yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
                yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt6;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt2;
-       yyt4 = yyt2;
-       yyt6 = yyt5;
-       yyt5 = yyt2;
-       goto yy9;
+       yyt2 = yyt6;
+       yyt6 = yyt3;
+       goto yy7;
 }
 
 re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/basic/37.i--flex-syntax.c b/re2c/test/posix_captures/basic/37.i--flex-syntax.c
index 7b70c2f987b1855056ee63f19df1611009b6343a..101e077f34c9bd4da4994f4524e1c451baf6c654 100644 (file)
--- a/re2c/test/posix_captures/basic/37.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/37.i--flex-syntax.c
@@ -4,17 +4,20 @@
        YYCTYPE yych;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       yyt1 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':
+               yyt1 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt1 = yyt2 = YYCURSOR;
+               goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        ++YYCURSOR;
@@ -22,7 +25,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       default:        goto yy2;
+       default:
+               yyt2 = YYCURSOR;
+               goto yy2;
        }
 }
 

diff --git a/re2c/test/posix_captures/basic/40.i--flex-syntax.c b/re2c/test/posix_captures/basic/40.i--flex-syntax.c
index 2ed422b12f8bc9c00f963b3be148847fddd46f88..892a1fed57c589fa04230bddd76c01ba248ba9ad 100644 (file)
--- a/re2c/test/posix_captures/basic/40.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/40.i--flex-syntax.c
@@ -27,14 +27,16 @@ yy3:
        case 'b':
                yyt2 = YYCURSOR;
                goto yy6;
-       default:        goto yy5;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy5;
        }
 yy5:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy6:
        ++YYCURSOR;
@@ -47,7 +49,9 @@ yy6:
        case 'b':
                yyt2 = YYCURSOR;
                goto yy6;
-       default:        goto yy5;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy5;
        }
 }
 

diff --git a/re2c/test/posix_captures/basic/43.i--flex-syntax.c b/re2c/test/posix_captures/basic/43.i--flex-syntax.c
index 3dc665650d7664d6c8bd6a6d121b3f28175a2907..cb79387b342ba68ba2775190e6fce5098675eceb 100644 (file)
--- a/re2c/test/posix_captures/basic/43.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/43.i--flex-syntax.c
@@ -2,16 +2,16 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
        case 'c':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = yyt4 = NULL;
-               yyt1 = yyt3 = YYCURSOR;
+               yyt2 = yyt3 = NULL;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -24,75 +24,59 @@ yy3:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-yy4:
        switch (yych) {
        case 'a':
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = yyt4 = YYCURSOR;
-               goto yy7;
+               yyt2 = yyt4;
+               yyt3 = yyt4 = YYCURSOR;
+               goto yy6;
        default:        goto yy5;
        }
 yy5:
        YYCURSOR = YYMARKER;
        goto yy2;
 yy6:
-       yych = *++YYCURSOR;
-       switch (yych) {
-       case 'c':
-               yyt3 = YYCURSOR;
-               goto yy9;
-       default:        goto yy4;
-       }
-yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt2;
-               yyt2 = yyt4 = YYCURSOR;
-               goto yy7;
+               yyt2 = yyt4;
+               yyt3 = yyt4 = YYCURSOR;
+               goto yy6;
        case 'c':
-               yyt2 = YYCURSOR;
-               goto yy10;
+               yyt4 = YYCURSOR;
+               goto yy8;
        default:        goto yy5;
        }
-yy9:
-       yych = *++YYCURSOR;
-       switch (yych) {
-       case 'd':       goto yy11;
-       default:        goto yy4;
-       }
-yy10:
+yy8:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt2;
-               yyt2 = yyt4 = YYCURSOR;
-               goto yy7;
-       case 'd':
-               yyt2 = yyt3;
-               goto yy11;
+               yyt2 = yyt4;
+               yyt3 = yyt4 = YYCURSOR;
+               goto yy6;
+       case 'd':       goto yy9;
        default:        goto yy5;
        }
-yy11:
+yy9:
        ++YYCURSOR;
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[3] = yyt4;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
        {}
 }

diff --git a/re2c/test/posix_captures/categorize/06.i--flex-syntax.c b/re2c/test/posix_captures/categorize/06.i--flex-syntax.c
index 7727f3724b84c9e330e6f817e266bdb2e023ec3d..ed8cdd0a269a5bc648e2b479d92a6f0a543fe109 100644 (file)
--- a/re2c/test/posix_captures/categorize/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/06.i--flex-syntax.c
@@ -16,8 +16,8 @@ yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        ++YYCURSOR;

diff --git a/re2c/test/posix_captures/categorize/09.i--flex-syntax.c b/re2c/test/posix_captures/categorize/09.i--flex-syntax.c
index a911bfc4e1a17d46f75d9b739b2ef10235aa6bf3..576dd1bcc9f6c1cc54e42a6ac6ed3f1eea66ac44 100644 (file)
--- a/re2c/test/posix_captures/categorize/09.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/09.i--flex-syntax.c
@@ -24,20 +24,21 @@ yy3:
                yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy6;
        default:
-               yyt3 = yyt4 = NULL;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy5;
        }
 yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy6:
        ++YYCURSOR;
@@ -48,7 +49,7 @@ yy6:
                yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy5;
        }
 }

diff --git a/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c
index c22b766ea5594d49931f366c391e3f260af61c7a..2fc9e6f8c7601438fbe4379aade279361fdb12f0 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c
@@ -8,19 +8,23 @@
                yyt1 = YYCURSOR;
                goto yy3;
        }
-       yyt1 = yyt2 = YYCURSOR;
+       yyt1 = yyt2 = yyt3 = YYCURSOR;
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
+       if (yych <= 0x00) {
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
+       }
        yyt2 = YYCURSOR;
-       if (yych <= 0x00) goto yy2;
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c
index 27620d8aa2160e4111b21d6113e18d562edd43f5..740daa4def836bd3817cf56db79c4ac38bde7bc7 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c
@@ -8,26 +8,33 @@
                yyt1 = YYCURSOR;
                goto yy3;
        }
-       yyt1 = yyt2 = YYCURSOR;
+       yyt1 = yyt2 = yyt3 = YYCURSOR;
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
+       if (yych <= 0x00) {
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
+       }
        yyt2 = YYCURSOR;
-       if (yych <= 0x00) goto yy2;
        yych = *++YYCURSOR;
-       if (yych <= 0x00) goto yy2;
+       if (yych <= 0x00) {
+               yyt3 = YYCURSOR;
+               goto yy2;
+       }
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c
index a2b6486b2e69aef78c877ced2a2e3bd0947de811..48e38246d00513a4f1010bee252168266881721f 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c
@@ -8,36 +8,43 @@
                yyt1 = YYCURSOR;
                goto yy3;
        }
-       yyt1 = yyt2 = YYCURSOR;
+       yyt1 = yyt2 = yyt3 = YYCURSOR;
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
+       if (yych <= 0x00) {
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
+       }
        yyt2 = YYCURSOR;
-       if (yych <= 0x00) goto yy2;
        yych = *++YYCURSOR;
-       if (yych <= 0x00) goto yy2;
+       if (yych <= 0x00) {
+               yyt3 = YYCURSOR;
+               goto yy2;
+       }
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c
index 7727f3724b84c9e330e6f817e266bdb2e023ec3d..ed8cdd0a269a5bc648e2b479d92a6f0a543fe109 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c
@@ -16,8 +16,8 @@ yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        ++YYCURSOR;

diff --git a/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c
index a911bfc4e1a17d46f75d9b739b2ef10235aa6bf3..576dd1bcc9f6c1cc54e42a6ac6ed3f1eea66ac44 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c
@@ -24,20 +24,21 @@ yy3:
                yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy6;
        default:
-               yyt3 = yyt4 = NULL;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy5;
        }
 yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy6:
        ++YYCURSOR;
@@ -48,7 +49,7 @@ yy6:
                yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy5;
        }
 }

diff --git a/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c
index 033385ea4c8086a6e73a1187620060767ab60b8c..56236f77a1c408786474a96dd214a164634a585e 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c
@@ -2,7 +2,7 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
                yyt3 = yyt5 = NULL;
@@ -43,45 +43,29 @@ yy5:
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt2 = yyt6;
-               yyt4 = yyt5 = NULL;
-               yyt3 = YYCURSOR;
-               goto yy2;
-       }
-       yyt3 = yyt4 = yyt5 = YYCURSOR;
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt3 = yyt6;
-               yyt4 = yyt6;
-               yyt5 = YYCURSOR;
-               goto yy2;
-       }
-yy9:
+yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
                yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt6;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
                yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt2;
-       yyt4 = yyt2;
-       yyt6 = yyt5;
-       yyt5 = yyt2;
-       goto yy9;
+       yyt2 = yyt6;
+       yyt6 = yyt3;
+       goto yy7;
 }
 
 re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c
index c6835a9c8629753ba92b74bf097ac8efa6b7acc8..861b6094fce263f11067d18783d4ebf0975dafe9 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c
@@ -2,7 +2,7 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
                yyt3 = yyt5 = NULL;
@@ -42,7 +42,7 @@ yy5:
                yyt3 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt6 = YYCURSOR;
+       yyt6 = yyt7 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt2 = yyt5;
@@ -50,47 +50,31 @@ yy5:
                yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt2 = yyt6;
-               yyt4 = yyt5 = yyt7 = NULL;
-               yyt3 = yyt6 = YYCURSOR;
-               goto yy2;
-       }
-       yyt3 = yyt4 = yyt5 = YYCURSOR;
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt3 = yyt6;
-               yyt4 = yyt6;
-               yyt7 = NULL;
-               yyt5 = yyt6 = YYCURSOR;
-               goto yy2;
-       }
-yy9:
+yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = NULL;
                yyt3 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt6;
+               yyt3 = yyt6;
+               yyt4 = yyt7;
                yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt2;
-       yyt4 = yyt2;
-       yyt6 = yyt5;
-       yyt5 = yyt2;
-       goto yy9;
+       yyt2 = yyt6;
+       yyt6 = yyt3;
+       yyt7 = yyt3;
+       goto yy7;
 }
 
 re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c
index ae41f7e04034f8b0d1e8a90728c1666c179ee14b..e0f9d131ea06738d6d04545be8b8edd31b6747d9 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c
@@ -2,7 +2,7 @@
 
 {
        YYCTYPE yych;
-       if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+       if ((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
                yyt2 = yyt4 = NULL;
@@ -43,45 +43,29 @@ yy5:
                yyt2 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt3 = yyt6;
-               yyt5 = yyt6 = NULL;
-               yyt2 = yyt4 = YYCURSOR;
-               goto yy2;
-       }
-       yyt2 = yyt4 = yyt5 = YYCURSOR;
-       yych = *++YYCURSOR;
-       if (yych <= 0x00) {
-               yyt4 = yyt6;
-               yyt5 = yyt6;
-               yyt2 = yyt6 = YYCURSOR;
-               goto yy2;
-       }
-yy9:
+yy7:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt2;
+               yyt3 = yyt6;
                yyt5 = yyt6 = NULL;
                yyt2 = yyt4 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt6;
+               yyt4 = yyt6;
+               yyt5 = yyt6;
                yyt2 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = yyt3;
-       yyt5 = yyt3;
+       yyt3 = yyt6;
        yyt6 = yyt2;
-       yyt2 = yyt3;
-       goto yy9;
+       goto yy7;
 }
 
 re2c: warning: line 5: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c
index 7b70c2f987b1855056ee63f19df1611009b6343a..101e077f34c9bd4da4994f4524e1c451baf6c654 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c
@@ -4,17 +4,20 @@
        YYCTYPE yych;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       yyt1 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':
+               yyt1 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt1 = yyt2 = YYCURSOR;
+               goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        ++YYCURSOR;
@@ -22,7 +25,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       default:        goto yy2;
+       default:
+               yyt2 = YYCURSOR;
+               goto yy2;
        }
 }
 

diff --git a/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c
index c4ab4f5cd3141c515f79730f5f30e07f3e12e248..bdf73e124ff02ecc07fa23e0741580ee80543064 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c
@@ -21,14 +21,16 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       default:        goto yy5;
+       default:
+               yyt2 = YYCURSOR;
+               goto yy5;
        }
 yy5:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 }
 

diff --git a/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c
index 7b70c2f987b1855056ee63f19df1611009b6343a..101e077f34c9bd4da4994f4524e1c451baf6c654 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c
@@ -4,17 +4,20 @@
        YYCTYPE yych;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       yyt1 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy3;
-       default:        goto yy2;
+       case 'a':
+               yyt1 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt1 = yyt2 = YYCURSOR;
+               goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        ++YYCURSOR;
@@ -22,7 +25,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       default:        goto yy2;
+       default:
+               yyt2 = YYCURSOR;
+               goto yy2;
        }
 }
 

diff --git a/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c
index b99d36bc866ba5967008d74b1e3f73b73d818735..6d7dcddd34ace478927988c58789f5a776c181b2 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c
@@ -9,7 +9,7 @@
                yyt1 = YYCURSOR;
                goto yy3;
        case 'x':
-               yyt1 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -24,7 +24,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       case 'x':       goto yy6;
+       case 'x':
+               yyt2 = YYCURSOR;
+               goto yy6;
        default:        goto yy5;
        }
 yy5:
@@ -35,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c
index b99d36bc866ba5967008d74b1e3f73b73d818735..6d7dcddd34ace478927988c58789f5a776c181b2 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c
@@ -9,7 +9,7 @@
                yyt1 = YYCURSOR;
                goto yy3;
        case 'x':
-               yyt1 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -24,7 +24,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       case 'x':       goto yy6;
+       case 'x':
+               yyt2 = YYCURSOR;
+               goto yy6;
        default:        goto yy5;
        }
 yy5:
@@ -35,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c
index b99d36bc866ba5967008d74b1e3f73b73d818735..6d7dcddd34ace478927988c58789f5a776c181b2 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c
@@ -9,7 +9,7 @@
                yyt1 = YYCURSOR;
                goto yy3;
        case 'x':
-               yyt1 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -24,7 +24,9 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':       goto yy3;
-       case 'x':       goto yy6;
+       case 'x':
+               yyt2 = YYCURSOR;
+               goto yy6;
        default:        goto yy5;
        }
 yy5:
@@ -35,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt1;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c
index 0d63898e856704672f8f9bc52948801300ad5e33..8f7381a186a2ef4764827acc70f774d81d46c70a 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c
@@ -37,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c
index 0d63898e856704672f8f9bc52948801300ad5e33..8f7381a186a2ef4764827acc70f774d81d46c70a 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c
@@ -37,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c
index 0d63898e856704672f8f9bc52948801300ad5e33..8f7381a186a2ef4764827acc70f774d81d46c70a 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c
@@ -37,8 +37,8 @@ yy6:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt2;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        yypmatch[4] = YYCURSOR - 1;
        yypmatch[5] = YYCURSOR;
        {}

diff --git a/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c
index ba8d7eb39b6428f9eba52781dcee26316ec7f876..06cd5e8b44640a9541d0e10d95afe4cf1b1002fe 100644 (file)
--- a/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c
+++ b/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c
@@ -7,10 +7,10 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt4 = YYCURSOR;
+               yyt1 = yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = yyt4 = YYCURSOR;
+               yyt1 = yyt3 = yyt4 = yyt5 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -25,11 +25,11 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:        goto yy5;
        }
@@ -45,8 +45,8 @@ yy6:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'b':
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:        goto yy9;
        }
@@ -54,10 +54,10 @@ yy7:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt3;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt4;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yyaccept = 1;
@@ -67,16 +67,16 @@ yy8:
 yy9:
        switch (yych) {
        case 'a':
-               yyt2 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt4 = yyt2;
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt5 = yyt2;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        }
 }

diff --git a/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c b/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c
index ba8d7eb39b6428f9eba52781dcee26316ec7f876..06cd5e8b44640a9541d0e10d95afe4cf1b1002fe 100644 (file)
--- a/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c
@@ -7,10 +7,10 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt4 = YYCURSOR;
+               yyt1 = yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = yyt4 = YYCURSOR;
+               yyt1 = yyt3 = yyt4 = yyt5 = YYCURSOR;
                goto yy6;
        default:        goto yy2;
        }
@@ -25,11 +25,11 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:        goto yy5;
        }
@@ -45,8 +45,8 @@ yy6:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'b':
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:        goto yy9;
        }
@@ -54,10 +54,10 @@ yy7:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt3;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt4;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yyaccept = 1;
@@ -67,16 +67,16 @@ yy8:
 yy9:
        switch (yych) {
        case 'a':
-               yyt2 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt4 = yyt2;
-               yyt3 = NULL;
-               yyt2 = YYCURSOR;
+               yyt5 = yyt2;
+               yyt4 = NULL;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        }
 }

diff --git a/re2c/test/posix_captures/other/11.i--flex-syntax.c b/re2c/test/posix_captures/other/11.i--flex-syntax.c
index 3225b11216cbe22273ab85c0071e40ba17893229..7aa4f297d0bc23b62a9c0bd4c5c16cea90a01756 100644 (file)
--- a/re2c/test/posix_captures/other/11.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/11.i--flex-syntax.c
@@ -7,7 +7,7 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt4 = yyt5 = YYCURSOR;
+               yyt1 = yyt2 = yyt5 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -17,10 +17,10 @@
 yy2:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt4;
-       yypmatch[3] = yyt2;
+       yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[4] = yyt5;
-       yypmatch[5] = yyt3;
+       yypmatch[5] = yyt4;
        yypmatch[1] = YYCURSOR;
        {}
 yy3:
@@ -39,13 +39,13 @@ yy4:
                yyt1 = YYCURSOR;
                goto yy2;
        case 1: 
-               yyt3 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        default:
-               yyt4 = yyt2;
-               yyt3 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -54,11 +54,11 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy6;
        default:
-               yyt3 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy6:
@@ -68,8 +68,8 @@ yy6:
        switch (yych) {
        case 'a':       goto yy7;
        default:
-               yyt2 = yyt4 = NULL;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt3 = NULL;
+               yyt4 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -79,11 +79,11 @@ yy7:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy8:
@@ -101,12 +101,12 @@ yy9:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = yyt5 = YYCURSOR;
+               yyt2 = yyt5 = YYCURSOR;
                goto yy3;
        default:
-               yyt4 = yyt2;
-               yyt3 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/other/13.i--flex-syntax.c b/re2c/test/posix_captures/other/13.i--flex-syntax.c
index 5348b4cacc4b71ccad39142fdf6f621e539d95dc..b37036a1a20d70c388c790128d9b457a38d81fc6 100644 (file)
--- a/re2c/test/posix_captures/other/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/13.i--flex-syntax.c
@@ -28,11 +28,12 @@ yy4:
        goto yy2;
 yy5:
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 }
 

diff --git a/re2c/test/posix_captures/other/15.i--flex-syntax.c b/re2c/test/posix_captures/other/15.i--flex-syntax.c
index 4a8781bc74bfecfafbf9eaf2d105193ad2240cb7..b3d8b0b4005177dc4b1104ddd340bb2c7f82ac1a 100644 (file)
--- a/re2c/test/posix_captures/other/15.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/15.i--flex-syntax.c
@@ -21,17 +21,20 @@ yy3:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy5;
-       default:        goto yy4;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy4:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy5:
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy4;
 }
 

diff --git a/re2c/test/posix_captures/other/16.i--flex-syntax.c b/re2c/test/posix_captures/other/16.i--flex-syntax.c
index d3ee98e18fdbc5922a17be7318650192c2305018..33dc95247b2843b59dd35c6272a40af4dc34b70f 100644 (file)
--- a/re2c/test/posix_captures/other/16.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/16.i--flex-syntax.c
@@ -19,7 +19,7 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy5;
        default:        goto yy4;
        }
@@ -29,19 +29,21 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'y':       goto yy7;
+       case 'y':
+               yyt3 = YYCURSOR;
+               goto yy7;
        default:        goto yy6;
        }
 yy6:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy7:
        ++YYCURSOR;
-       yyt2 = yyt3;
+       yyt2 = yyt4;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/other/18.i--flex-syntax.c b/re2c/test/posix_captures/other/18.i--flex-syntax.c
index e9134c238bab754280242a6d02c08630aaf9da7e..ab2c932540442e43e00f19d6e1bc7415c3e405cd 100644 (file)
--- a/re2c/test/posix_captures/other/18.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/18.i--flex-syntax.c
@@ -34,14 +34,16 @@ yy5:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy5;
-       default:        goto yy7;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy7;
        }
 yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 }
 

diff --git a/re2c/test/posix_captures/other/19.i--flex-syntax.c b/re2c/test/posix_captures/other/19.i--flex-syntax.c
index d64803fcd9e72ac2bba01677e54144bad06bff11..e05ef808070d8caf8ec9dd3c2258972f0c0b3365 100644 (file)
--- a/re2c/test/posix_captures/other/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/19.i--flex-syntax.c
@@ -9,25 +9,29 @@
                yyt1 = YYCURSOR;
                goto yy3;
        default:
-               yyt1 = yyt2 = YYCURSOR;
+               yyt1 = yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'y':       goto yy4;
-       default:        goto yy2;
+       case 'y':
+               yyt2 = YYCURSOR;
+               goto yy4;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
        }
 yy4:
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/other/21.i--flex-syntax.c b/re2c/test/posix_captures/other/21.i--flex-syntax.c
index d31d8904f23dece8b1e1459081d67e907879973e..c06320c3036698c92c3906d0638cc6aa133cc682 100644 (file)
--- a/re2c/test/posix_captures/other/21.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/21.i--flex-syntax.c
@@ -4,17 +4,20 @@
        YYCTYPE yych;
        if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
        yych = *YYCURSOR;
-       yyt1 = yyt2 = YYCURSOR;
        switch (yych) {
-       case 'y':       goto yy3;
-       default:        goto yy2;
+       case 'y':
+               yyt1 = yyt2 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt1 = yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
@@ -22,10 +25,13 @@ yy3:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy4;
-       default:        goto yy2;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy2;
        }
 yy4:
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/other/22.i--flex-syntax.c b/re2c/test/posix_captures/other/22.i--flex-syntax.c
index d6905cc384de0247fd06ac212eb51a6a74cffc1d..6651362f49fe2fb9f092b9f7981f1c2e03af9fbe 100644 (file)
--- a/re2c/test/posix_captures/other/22.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/22.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt1 = yyt2 = YYCURSOR;
+               yyt1 = yyt2 = yyt3 = YYCURSOR;
                goto yy3;
        default:        goto yy2;
        }
@@ -19,7 +19,7 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy5;
        default:        goto yy4;
        }
@@ -27,18 +27,20 @@ yy4:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy5:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'y':       goto yy6;
+       case 'y':
+               yyt3 = YYCURSOR;
+               goto yy6;
        default:        goto yy4;
        }
 yy6:
        ++YYCURSOR;
-       yyt2 = yyt3;
+       yyt2 = yyt4;
        goto yy4;
 }
 

diff --git a/re2c/test/posix_captures/other/24.i--flex-syntax.c b/re2c/test/posix_captures/other/24.i--flex-syntax.c
index 6503ad44dddf5495155506d681d7700360f1851a..c7d9e281c1241e9ae8e65958b0c91c02c95171af 100644 (file)
--- a/re2c/test/posix_captures/other/24.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/24.i--flex-syntax.c
@@ -9,22 +9,25 @@
                yyt1 = YYCURSOR;
                goto yy3;
        default:
-               yyt1 = yyt2 = YYCURSOR;
+               yyt1 = yyt2 = yyt3 = YYCURSOR;
                goto yy2;
        }
 yy2:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'y':       goto yy4;
-       default:        goto yy2;
+       case 'y':
+               yyt2 = YYCURSOR;
+               goto yy4;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy2;
        }
 yy4:
        ++YYCURSOR;
@@ -34,7 +37,9 @@ yy4:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy4;
-       default:        goto yy2;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy2;
        }
 }
 

diff --git a/re2c/test/posix_captures/other/25.i--flex-syntax.c b/re2c/test/posix_captures/other/25.i--flex-syntax.c
index b9f450b3643d219ada357ec0aefdaea186372ddd..15c7f20d196ba628abc40ba14564e4d8f1b5dcfe 100644 (file)
--- a/re2c/test/posix_captures/other/25.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/25.i--flex-syntax.c
@@ -6,83 +6,86 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt1 = yyt2 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        case 'y':
                yyt1 = yyt2 = YYCURSOR;
                goto yy4;
        default:
-               yyt1 = yyt2 = yyt3 = yyt4 = YYCURSOR;
+               yyt1 = yyt2 = yyt3 = yyt4 = yyt5 = YYCURSOR;
                goto yy2;
        }
 yy2:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy5;
        case 'y':
                yyt2 = YYCURSOR;
                goto yy6;
        default:
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
 yy4:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy5;
        case 'y':
                yyt2 = YYCURSOR;
                goto yy6;
        default:
-               yyt3 = yyt4 = NULL;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy7;
        case 'y':
                yyt2 = YYCURSOR;
                goto yy8;
        default:
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
 yy6:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy7;
        case 'y':
                yyt2 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = yyt4 = NULL;
+               yyt4 = yyt5 = NULL;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy7:
        ++YYCURSOR;
-       yyt4 = YYCURSOR;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy2;
 yy8:
        ++YYCURSOR;
-       yyt3 = yyt4 = NULL;
+       yyt4 = yyt5 = NULL;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

diff --git a/re2c/test/posix_captures/other/26.i--flex-syntax.c b/re2c/test/posix_captures/other/26.i--flex-syntax.c
index d3c538adcbf9795f986b77d513cb208132f83576..8659cbf3154ac6822d777f68f80791e37798f911 100644 (file)
--- a/re2c/test/posix_captures/other/26.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/26.i--flex-syntax.c
@@ -38,14 +38,16 @@ yy6:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy8;
-       default:        goto yy7;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy7;
        }
 yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
@@ -53,16 +55,21 @@ yy8:
        case 'y':
                yyt2 = YYCURSOR;
                goto yy9;
-       default:        goto yy7;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy7;
        }
 yy9:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':       goto yy10;
-       default:        goto yy7;
+       default:
+               yyt3 = YYCURSOR;
+               goto yy7;
        }
 yy10:
        ++YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/05.i--flex-syntax.c b/re2c/test/posix_captures/repetition/05.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/05.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/05.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/06.i--flex-syntax.c b/re2c/test/posix_captures/repetition/06.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/06.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/12.i--flex-syntax.c b/re2c/test/posix_captures/repetition/12.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/12.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/12.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/13.i--flex-syntax.c b/re2c/test/posix_captures/repetition/13.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/13.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/19.i--flex-syntax.c b/re2c/test/posix_captures/repetition/19.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/19.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/20.i--flex-syntax.c b/re2c/test/posix_captures/repetition/20.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/20.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/26.i--flex-syntax.c b/re2c/test/posix_captures/repetition/26.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/26.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/26.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/27.i--flex-syntax.c b/re2c/test/posix_captures/repetition/27.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/27.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/27.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/33.i--flex-syntax.c b/re2c/test/posix_captures/repetition/33.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/33.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/33.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/34.i--flex-syntax.c b/re2c/test/posix_captures/repetition/34.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/34.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/34.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/40.i--flex-syntax.c b/re2c/test/posix_captures/repetition/40.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/40.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/40.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/41.i--flex-syntax.c b/re2c/test/posix_captures/repetition/41.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/41.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/41.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/47.i--flex-syntax.c b/re2c/test/posix_captures/repetition/47.i--flex-syntax.c
index 7306fe13b1ff30a3b356487d9758f851e239a2ee..09ce47a77ac6646d4a0d6e9ee0aa2104ea977019 100644 (file)
--- a/re2c/test/posix_captures/repetition/47.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/47.i--flex-syntax.c
@@ -16,7 +16,7 @@ yy2:
 yy3:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy5;
        }
        YYCURSOR = YYMARKER;
@@ -24,32 +24,32 @@ yy3:
 yy5:
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy7;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy6:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy7:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy6;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy6;
 }
 

diff --git a/re2c/test/posix_captures/repetition/48.i--flex-syntax.c b/re2c/test/posix_captures/repetition/48.i--flex-syntax.c
index 8d53bf90dfe48a72082889c9bf9d8b74e095dbf8..e1379f617236fd97735fd8ac64d12f2608c5f69c 100644 (file)
--- a/re2c/test/posix_captures/repetition/48.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/48.i--flex-syntax.c
@@ -22,42 +22,42 @@ yy4:
 yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) goto yy4;
-       yyt2 = yyt5 = YYCURSOR;
+       yyt2 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych >= 0x01) {
-               yyt2 = yyt5 = YYCURSOR;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy8;
        }
-       yyt3 = yyt4 = NULL;
-       yyt6 = YYCURSOR;
+       yyt4 = yyt5 = NULL;
+       yyt3 = yyt7 = YYCURSOR;
 yy7:
        yynmatch = 4;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[5] = yyt4;
-       yypmatch[6] = yyt5;
-       yypmatch[7] = yyt6;
+       yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[5] = yyt5;
+       yypmatch[6] = yyt6;
+       yypmatch[7] = yyt7;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR;
        {}
 yy8:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
-       yyt2 = yyt3 = yyt5 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4 = NULL;
-               yyt6 = YYCURSOR;
+               yyt4 = yyt5 = NULL;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy7;
        }
        ++YYCURSOR;
-       yyt5 = yyt6 = NULL;
-       yyt4 = YYCURSOR;
+       yyt6 = yyt7 = NULL;
+       yyt3 = yyt5 = YYCURSOR;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/51.i--flex-syntax.c b/re2c/test/posix_captures/repetition/51.i--flex-syntax.c
index 05e948f73494b159ef2907b8b9bec388555532cb..a30233c632a8b64cabe4f0f6b476da5d0b00f279 100644 (file)
--- a/re2c/test/posix_captures/repetition/51.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/51.i--flex-syntax.c
@@ -20,7 +20,7 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy7;
        default:        goto yy6;
        }
@@ -39,10 +39,10 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy5;
        }
 yy7:
@@ -50,7 +50,7 @@ yy7:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy10;
        }
@@ -58,8 +58,8 @@ yy8:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy9:
        yyaccept = 1;
@@ -69,15 +69,15 @@ yy9:
 yy10:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy8;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy5;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/52.i--flex-syntax.c b/re2c/test/posix_captures/repetition/52.i--flex-syntax.c
index 1bc0769529b28574ce0cfdc3d060daf68a3afa65..c3dc12d1bc4cdb891ba0ab57eef0e348302bbf32 100644 (file)
--- a/re2c/test/posix_captures/repetition/52.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/52.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -36,7 +36,7 @@ yy5:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy10;
        default:        goto yy9;
        }
@@ -46,18 +46,18 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy10;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        ++YYCURSOR;
@@ -67,10 +67,10 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy10:
@@ -78,7 +78,7 @@ yy10:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy12;
        }
@@ -90,15 +90,15 @@ yy11:
 yy12:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/53.i--flex-syntax.c b/re2c/test/posix_captures/repetition/53.i--flex-syntax.c
index 4ff182d47d48e8fa2276e0c3a495626e358ee367..20d6e960bcb04193bbde068d553c595c009641ae 100644 (file)
--- a/re2c/test/posix_captures/repetition/53.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/53.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,14 +55,14 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy12;
        default:        goto yy11;
        }
@@ -72,10 +72,10 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy12;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        }
 yy10:
@@ -86,10 +86,10 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        }
 yy12:
@@ -97,7 +97,7 @@ yy12:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy14;
        }
@@ -109,15 +109,15 @@ yy13:
 yy14:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy10;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/54.i--flex-syntax.c b/re2c/test/posix_captures/repetition/54.i--flex-syntax.c
index f147e5270fa799c64b2eb187cdad5de9e86a78d4..5d6f29dc4859d9a6bc2bbf8deec7c1268d9481bd 100644 (file)
--- a/re2c/test/posix_captures/repetition/54.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/54.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -81,7 +81,7 @@ yy10:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        default:        goto yy13;
        }
@@ -91,10 +91,10 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        }
 yy12:
@@ -105,10 +105,10 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        }
 yy14:
@@ -116,7 +116,7 @@ yy14:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy16;
        }
@@ -128,15 +128,15 @@ yy15:
 yy16:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy12;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/55.i--flex-syntax.c b/re2c/test/posix_captures/repetition/55.i--flex-syntax.c
index 758aa39b14565e5a1960a1140e34998924ae586c..744764f0dc9191d3a187efc137a1c3901206d44c 100644 (file)
--- a/re2c/test/posix_captures/repetition/55.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/55.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -82,7 +82,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -92,7 +92,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -100,7 +100,7 @@ yy12:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:        goto yy15;
        }
@@ -110,10 +110,10 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -124,10 +124,10 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        }
 yy16:
@@ -135,7 +135,7 @@ yy16:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy18;
        }
@@ -147,15 +147,15 @@ yy17:
 yy18:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy14;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/56.i--flex-syntax.c b/re2c/test/posix_captures/repetition/56.i--flex-syntax.c
index 74bfdc5dfc2b3f4b48bee30b29ca6b36cdc0cf9a..30c556e8303568fc3be4e1d59bd25c380781d420 100644 (file)
--- a/re2c/test/posix_captures/repetition/56.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/56.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -82,7 +82,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -92,7 +92,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -101,7 +101,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -111,7 +111,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -119,7 +119,7 @@ yy14:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy18;
        default:        goto yy17;
        }
@@ -129,10 +129,10 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy18;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -143,10 +143,10 @@ yy17:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        }
 yy18:
@@ -154,7 +154,7 @@ yy18:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:        goto yy20;
        }
@@ -166,15 +166,15 @@ yy19:
 yy20:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy16;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/57.i--flex-syntax.c b/re2c/test/posix_captures/repetition/57.i--flex-syntax.c
index f5e0f460826ec30fd4979745d98fda49bb27e04d..2fc8a6f62c7affc02d75a680b60ced74a55a5478 100644 (file)
--- a/re2c/test/posix_captures/repetition/57.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/57.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -82,7 +82,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -92,7 +92,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -101,7 +101,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -111,7 +111,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -120,7 +120,7 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -130,7 +130,7 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -138,7 +138,7 @@ yy16:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        default:        goto yy19;
        }
@@ -148,10 +148,10 @@ yy17:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -162,10 +162,10 @@ yy19:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy21;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        }
 yy20:
@@ -173,7 +173,7 @@ yy20:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy21;
        default:        goto yy22;
        }
@@ -185,15 +185,15 @@ yy21:
 yy22:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy21;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy18;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/58.i--flex-syntax.c b/re2c/test/posix_captures/repetition/58.i--flex-syntax.c
index 9e5193f8a09f96337454963d50da4c60eed84b88..da80c011f9f9432543c322eb63cfb98bac94e918 100644 (file)
--- a/re2c/test/posix_captures/repetition/58.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/58.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -82,7 +82,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -92,7 +92,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -101,7 +101,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -111,7 +111,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -120,7 +120,7 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -130,7 +130,7 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -139,7 +139,7 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:        goto yy18;
        }
@@ -149,7 +149,7 @@ yy17:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:        goto yy18;
        }
@@ -157,7 +157,7 @@ yy18:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:        goto yy21;
        }
@@ -167,10 +167,10 @@ yy19:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        }
 yy20:
@@ -181,10 +181,10 @@ yy21:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy23;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        }
 yy22:
@@ -192,7 +192,7 @@ yy22:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy23;
        default:        goto yy24;
        }
@@ -204,15 +204,15 @@ yy23:
 yy24:
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy23;
        default:
-               yyt2 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt4 = YYCURSOR;
                goto yy20;
        }
 }

diff --git a/re2c/test/posix_captures/repetition/60.i--flex-syntax.c b/re2c/test/posix_captures/repetition/60.i--flex-syntax.c
index f79fa692f78f7ca053610b70bb2c3aeffae9c8c2..0168779fd90522c0ca091c29c302c30e7bb80712 100644 (file)
--- a/re2c/test/posix_captures/repetition/60.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/60.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:
                yyt2 = YYCURSOR;
@@ -33,19 +33,19 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 3: 
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 4: 
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 5: 
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        default:
-               yyt2 = yyt7;
+               yyt2 = yyt8;
                goto yy7;
        }
 yy5:
@@ -53,10 +53,10 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy6:
@@ -65,28 +65,28 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy10;
        }
 yy9:
@@ -95,10 +95,10 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy10;
        }
 yy10:
@@ -106,10 +106,10 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy12;
        }
 yy11:
@@ -117,13 +117,13 @@ yy11:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy12;
        }
 yy12:
@@ -131,10 +131,10 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy14;
        }
 yy13:
@@ -142,13 +142,13 @@ yy13:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -156,10 +156,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -167,13 +167,13 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -181,10 +181,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -192,13 +192,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -206,10 +206,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt9 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
-               yyt9 = YYCURSOR;
+               yyt10 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -217,32 +217,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt7;
+               yyt2 = yyt8;
                goto yy7;
        case 'Y':
-               yyt9 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
-               yyt9 = YYCURSOR;
+               yyt10 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt8;
+               yyt2 = yyt9;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt9;
+       yyt2 = yyt10;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/61.i--flex-syntax.c b/re2c/test/posix_captures/repetition/61.i--flex-syntax.c
index abe89e200b0a9a245fe85c5596982587f184ab39..4b568ed477ad4fc8d8c640e0d9df30522301337e 100644 (file)
--- a/re2c/test/posix_captures/repetition/61.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/61.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,19 +31,19 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 3: 
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 4: 
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 5: 
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        default:
-               yyt2 = yyt7;
+               yyt2 = yyt8;
                goto yy7;
        }
 yy5:
@@ -51,10 +51,10 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy6:
@@ -63,28 +63,28 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy8;
        }
 yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy10;
        }
 yy9:
@@ -92,13 +92,13 @@ yy9:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy10;
        }
 yy10:
@@ -106,10 +106,10 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy12;
        }
 yy11:
@@ -117,13 +117,13 @@ yy11:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy12;
        }
 yy12:
@@ -131,10 +131,10 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy14;
        }
 yy13:
@@ -142,13 +142,13 @@ yy13:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -156,10 +156,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -167,13 +167,13 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -181,10 +181,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -192,13 +192,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -206,10 +206,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt9 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
-               yyt9 = YYCURSOR;
+               yyt10 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -217,32 +217,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt7;
+               yyt2 = yyt8;
                goto yy7;
        case 'Y':
-               yyt9 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
-               yyt9 = YYCURSOR;
+               yyt10 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt8;
+               yyt2 = yyt9;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt9;
+       yyt2 = yyt10;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/62.i--flex-syntax.c b/re2c/test/posix_captures/repetition/62.i--flex-syntax.c
index 7942b60f6d690e016062b77cdf62d0c63870fb6d..6366759c42f57ead2c1ecbc77d0a8e06cc79022b 100644 (file)
--- a/re2c/test/posix_captures/repetition/62.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/62.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,16 +31,16 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 3: 
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 4: 
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        default:
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        }
 yy5:
@@ -48,7 +48,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -58,7 +58,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -66,18 +66,18 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        }
 yy9:
@@ -86,10 +86,10 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        }
 yy10:
@@ -97,10 +97,10 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy13;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy12;
        }
 yy11:
@@ -108,13 +108,13 @@ yy11:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy13;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy12;
        }
 yy12:
@@ -122,10 +122,10 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy15;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy14;
        }
 yy13:
@@ -133,13 +133,13 @@ yy13:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy15;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -147,10 +147,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy17;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -158,13 +158,13 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy17;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -172,10 +172,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy19;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -183,13 +183,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy19;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -197,10 +197,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy21;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -208,32 +208,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        case 'Y':
-               yyt8 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy21;
        default:
-               yyt8 = YYCURSOR;
+               yyt9 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt7;
+               yyt2 = yyt8;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt8;
+       yyt2 = yyt9;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/63.i--flex-syntax.c b/re2c/test/posix_captures/repetition/63.i--flex-syntax.c
index 28f7bf0bc60a5f91ca16d48f0b1e1c6ff4cc077c..c284bea629d5b1c6ba0f2dee100ea873514357ad 100644 (file)
--- a/re2c/test/posix_captures/repetition/63.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/63.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,13 +31,13 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 3: 
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        default:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        }
 yy5:
@@ -45,7 +45,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,7 +55,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -63,15 +63,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -81,7 +81,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -90,10 +90,10 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy13;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        }
 yy11:
@@ -102,10 +102,10 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy13;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        }
 yy12:
@@ -113,10 +113,10 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy15;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy14;
        }
 yy13:
@@ -124,13 +124,13 @@ yy13:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy15;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -138,10 +138,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy17;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -149,13 +149,13 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy17;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -163,10 +163,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy19;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -174,13 +174,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy19;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -188,10 +188,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy21;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -199,32 +199,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        case 'Y':
-               yyt7 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy21;
        default:
-               yyt7 = YYCURSOR;
+               yyt8 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt6;
+               yyt2 = yyt7;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt7;
+       yyt2 = yyt8;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/64.i--flex-syntax.c b/re2c/test/posix_captures/repetition/64.i--flex-syntax.c
index 89e8f22e697e6c61c667d18bb06f88293b246f69..8b8d4641581d04ec2a36f4f481440d0fe913e218 100644 (file)
--- a/re2c/test/posix_captures/repetition/64.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/64.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,10 +31,10 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        default:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        }
 yy5:
@@ -42,7 +42,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -52,7 +52,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -60,15 +60,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -78,7 +78,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -87,7 +87,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -97,7 +97,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -106,10 +106,10 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy15;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        }
 yy13:
@@ -118,10 +118,10 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy15;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        }
 yy14:
@@ -129,10 +129,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy17;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -140,13 +140,13 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy17;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -154,10 +154,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy19;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -165,13 +165,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy19;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -179,10 +179,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy21;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -190,32 +190,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt6 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy21;
        default:
-               yyt6 = YYCURSOR;
+               yyt7 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt5;
+               yyt2 = yyt6;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt6;
+       yyt2 = yyt7;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/65.i--flex-syntax.c b/re2c/test/posix_captures/repetition/65.i--flex-syntax.c
index 8302d2e64e00926ed794221992eb68a88bbda7d9..a8c5393b440f8c5524818af51a78e9243fdeabc2 100644 (file)
--- a/re2c/test/posix_captures/repetition/65.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/65.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,7 +31,7 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        default:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        }
 yy5:
@@ -39,7 +39,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -49,7 +49,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -57,15 +57,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -75,7 +75,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -84,7 +84,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -94,7 +94,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -103,7 +103,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -113,7 +113,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -122,10 +122,10 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy17;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        }
 yy15:
@@ -134,10 +134,10 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy17;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        }
 yy16:
@@ -145,10 +145,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy19;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -156,13 +156,13 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy19;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -170,10 +170,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy21;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -181,32 +181,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt5 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy21;
        default:
-               yyt5 = YYCURSOR;
+               yyt6 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt4;
+               yyt2 = yyt5;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt5;
+       yyt2 = yyt6;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/66.i--flex-syntax.c b/re2c/test/posix_captures/repetition/66.i--flex-syntax.c
index 1a89c9d568130e569b73a168a7d0fd7770731dac..b42f54b6a6a3f0b304a6e53b022f64ee80ce3fff 100644 (file)
--- a/re2c/test/posix_captures/repetition/66.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/66.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -31,7 +31,7 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        default:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        }
 yy5:
@@ -39,7 +39,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -49,7 +49,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -57,15 +57,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -75,7 +75,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -84,7 +84,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -94,7 +94,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -103,7 +103,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -113,7 +113,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -122,7 +122,7 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -132,7 +132,7 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -141,10 +141,10 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy19;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        }
 yy17:
@@ -153,10 +153,10 @@ yy17:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy19;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        }
 yy18:
@@ -164,10 +164,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy21;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -175,32 +175,36 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy21;
        default:
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt4;
+       yyt2 = yyt5;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/67.i--flex-syntax.c b/re2c/test/posix_captures/repetition/67.i--flex-syntax.c
index e41ce6f1a911820a388ce1affd9b510411290449..b0c669bbde4cbf73efdd37e3526a54b7375bfeb0 100644 (file)
--- a/re2c/test/posix_captures/repetition/67.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/67.i--flex-syntax.c
@@ -21,7 +21,7 @@ yy3:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:        goto yy5;
        }
@@ -37,7 +37,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -47,7 +47,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy9;
        default:        goto yy8;
        }
@@ -55,15 +55,15 @@ yy7:
        yynmatch = 2;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = YYCURSOR - 1;
        {}
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -73,7 +73,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:        goto yy10;
        }
@@ -82,7 +82,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -92,7 +92,7 @@ yy11:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:        goto yy12;
        }
@@ -101,7 +101,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -111,7 +111,7 @@ yy13:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy15;
        default:        goto yy14;
        }
@@ -120,7 +120,7 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -130,7 +130,7 @@ yy15:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy17;
        default:        goto yy16;
        }
@@ -139,7 +139,7 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:        goto yy18;
        }
@@ -149,7 +149,7 @@ yy17:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:        goto yy18;
        }
@@ -158,10 +158,10 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy21;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        }
 yy19:
@@ -170,29 +170,33 @@ yy19:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy21;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:        goto yy4;
        }
 yy21:
        yych = *++YYCURSOR;
        switch (yych) {
-       case 'Y':       goto yy22;
+       case 'Y':
+               yyt3 = YYCURSOR;
+               goto yy22;
        default:
-               yyt2 = yyt3;
+               yyt2 = yyt4;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt2 = yyt3;
+       yyt2 = yyt4;
        goto yy7;
 }
 

diff --git a/re2c/test/posix_captures/repetition/69.i--flex-syntax.c b/re2c/test/posix_captures/repetition/69.i--flex-syntax.c
index 5b0b3e33c75c46f8eb643ecb6243fe3fa3a2f3ee..882347c8ab3b4a990b81813f7d540ad80fd10fa3 100644 (file)
--- a/re2c/test/posix_captures/repetition/69.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/69.i--flex-syntax.c
@@ -48,9 +48,9 @@ yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[4] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = yyt3;
        yypmatch[5] = YYCURSOR;
        {}
 yy6:

diff --git a/re2c/test/posix_captures/repetition/70.i--flex-syntax.c b/re2c/test/posix_captures/repetition/70.i--flex-syntax.c
index 0571c7e4fa4dc4e1fa1da917efa950371d55ef72..fdb0b02eacebf632df00f64737f27039cd41d900 100644 (file)
--- a/re2c/test/posix_captures/repetition/70.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/70.i--flex-syntax.c
@@ -41,11 +41,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy5:
@@ -77,19 +77,19 @@ yy7:
                yyt2 = YYCURSOR;
                goto yy11;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy9:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy10:
@@ -123,10 +123,10 @@ yy12:
                yyt2 = YYCURSOR;
                goto yy11;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy13:
@@ -160,10 +160,10 @@ yy15:
                yyt4 = YYCURSOR;
                goto yy18;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy16:
@@ -192,7 +192,7 @@ yy18:
        case 'd':       goto yy11;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy19:

diff --git a/re2c/test/posix_captures/repetition/71.i--flex-syntax.c b/re2c/test/posix_captures/repetition/71.i--flex-syntax.c
index 2f6bc478a56cf4e71e702f0b3cc853dfa9f37bbb..741a915f763d779d89764f162fb14585f566f258 100644 (file)
--- a/re2c/test/posix_captures/repetition/71.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/71.i--flex-syntax.c
@@ -35,11 +35,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy5:
@@ -113,19 +113,19 @@ yy12:
                yyt2 = YYCURSOR;
                goto yy16;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy14:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy15:
@@ -159,10 +159,10 @@ yy17:
                yyt2 = YYCURSOR;
                goto yy16;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy18:
@@ -205,10 +205,10 @@ yy21:
                yyt4 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy22:
@@ -237,7 +237,7 @@ yy24:
        case 'd':       goto yy16;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy25:

diff --git a/re2c/test/posix_captures/repetition/72.i--flex-syntax.c b/re2c/test/posix_captures/repetition/72.i--flex-syntax.c
index b3ae2e053ff71c37f5dd43d0d6e5e03077716689..2771a53ddacb2359a547bdbe429278a14f7826a0 100644 (file)
--- a/re2c/test/posix_captures/repetition/72.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/72.i--flex-syntax.c
@@ -35,11 +35,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy5:
@@ -158,19 +158,19 @@ yy18:
                yyt2 = YYCURSOR;
                goto yy22;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy21:
@@ -204,10 +204,10 @@ yy23:
                yyt2 = YYCURSOR;
                goto yy22;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy24:
@@ -250,10 +250,10 @@ yy27:
                yyt4 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy28:
@@ -282,7 +282,7 @@ yy30:
        case 'd':       goto yy22;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy31:

diff --git a/re2c/test/posix_captures/repetition/74.i--flex-syntax.c b/re2c/test/posix_captures/repetition/74.i--flex-syntax.c
index 03a92dad41326d7aa2d587a80521fdf86f91ce8d..c1c486bffd5ed334e13f0070c996c9d63106a2c5 100644 (file)
--- a/re2c/test/posix_captures/repetition/74.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/74.i--flex-syntax.c
@@ -7,13 +7,13 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy7;
        default:        goto yy2;
        }
@@ -24,20 +24,30 @@ yy2:
        {}
 yy3:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy8;
-       case 'b':       goto yy9;
-       case 'c':       goto yy10;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy8;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy9;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy10;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy4:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy5:
@@ -51,46 +61,56 @@ yy6:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy7:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy8;
-       case 'b':       goto yy14;
-       case 'c':       goto yy10;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy8;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy14;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy10;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy9:
@@ -104,13 +124,13 @@ yy9:
                yyt2 = YYCURSOR;
                goto yy14;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy18;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy10:
@@ -118,21 +138,21 @@ yy10:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy11:
@@ -158,62 +178,82 @@ yy14:
        }
 yy15:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy21;
-       case 'b':       goto yy22;
-       case 'c':       goto yy23;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy22;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy23;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy16:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy17:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy21;
-       case 'b':       goto yy25;
-       case 'c':       goto yy23;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy23;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy18:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':       goto yy10;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy19:
@@ -232,21 +272,21 @@ yy21:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy28;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy22:
@@ -260,13 +300,13 @@ yy22:
                yyt2 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy23:
@@ -274,21 +314,21 @@ yy23:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy24:
@@ -306,8 +346,8 @@ yy24:
                goto yy23;
        case 'd':       goto yy17;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy25:
@@ -324,62 +364,82 @@ yy26:
        }
 yy27:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy34;
-       case 'c':       goto yy35;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy34;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy28:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy29:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy37;
-       case 'c':       goto yy35;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy37;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy30:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':       goto yy23;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy31:
@@ -398,21 +458,21 @@ yy33:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy40;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy34:
@@ -426,13 +486,13 @@ yy34:
                yyt2 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy35:
@@ -440,21 +500,21 @@ yy35:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy36:
@@ -472,8 +532,8 @@ yy36:
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy37:
@@ -490,62 +550,82 @@ yy38:
        }
 yy39:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy46;
-       case 'c':       goto yy47;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy46;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy40:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy41:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy49;
-       case 'c':       goto yy47;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy49;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy42:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy43:
@@ -564,21 +644,21 @@ yy45:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy52;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy46:
@@ -592,13 +672,13 @@ yy46:
                yyt2 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy47:
@@ -606,21 +686,21 @@ yy47:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy48:
@@ -638,8 +718,8 @@ yy48:
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy49:
@@ -656,62 +736,82 @@ yy50:
        }
 yy51:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy58;
-       case 'c':       goto yy59;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy58;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy52:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy53:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy61;
-       case 'c':       goto yy59;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy61;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy54:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy55:
@@ -731,12 +831,12 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy58:
@@ -750,19 +850,19 @@ yy58:
                yyt2 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt3 = yyt2;
-       yyt2 = YYCURSOR;
+       yyt4 = yyt2;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy12;
 yy60:
        yyaccept = 3;
@@ -779,8 +879,8 @@ yy60:
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy61:
@@ -800,7 +900,7 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/75.i--flex-syntax.c b/re2c/test/posix_captures/repetition/75.i--flex-syntax.c
index 505ecefba6a8df66e38ea4fb685314a942a96629..add23726b4f358f9d80bfc639ab657a2a07bca01 100644 (file)
--- a/re2c/test/posix_captures/repetition/75.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/75.i--flex-syntax.c
@@ -26,13 +26,13 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy9;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        default:        goto yy4;
        }
@@ -41,15 +41,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy5:
@@ -62,57 +62,77 @@ yy6:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        default:        goto yy4;
        }
 yy7:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy13;
-       case 'b':       goto yy14;
-       case 'c':       goto yy15;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy13;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy14;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy15;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy8:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy9:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy18;
        default:        goto yy4;
        }
 yy10:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy13;
-       case 'b':       goto yy19;
-       case 'c':       goto yy15;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy13;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy15;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy11:
        yych = *++YYCURSOR;
@@ -130,21 +150,21 @@ yy13:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy22;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy14:
@@ -158,13 +178,13 @@ yy14:
                yyt2 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy15:
@@ -172,21 +192,21 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy16:
@@ -213,8 +233,8 @@ yy18:
                goto yy15;
        case 'd':       goto yy10;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy19:
@@ -231,62 +251,82 @@ yy20:
        }
 yy21:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy27;
-       case 'b':       goto yy28;
-       case 'c':       goto yy29;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy28;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy29;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy22:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy23:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy27;
-       case 'b':       goto yy31;
-       case 'c':       goto yy29;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy31;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy29;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy24:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':       goto yy15;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy25:
@@ -305,21 +345,21 @@ yy27:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy34;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy28:
@@ -333,13 +373,13 @@ yy28:
                yyt2 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy29:
@@ -347,21 +387,21 @@ yy29:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy30:
@@ -379,8 +419,8 @@ yy30:
                goto yy29;
        case 'd':       goto yy23;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy31:
@@ -397,62 +437,82 @@ yy32:
        }
 yy33:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy40;
-       case 'c':       goto yy41;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy40;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy34:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy35:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy43;
-       case 'c':       goto yy41;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy43;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy36:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy37:
@@ -471,21 +531,21 @@ yy39:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy46;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy40:
@@ -499,13 +559,13 @@ yy40:
                yyt2 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy41:
@@ -513,21 +573,21 @@ yy41:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy42:
@@ -545,8 +605,8 @@ yy42:
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy43:
@@ -563,62 +623,82 @@ yy44:
        }
 yy45:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy52;
-       case 'c':       goto yy53;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy52;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy46:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy47:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy55;
-       case 'c':       goto yy53;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy55;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy48:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy49:
@@ -637,21 +717,21 @@ yy51:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy58;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy52:
@@ -665,13 +745,13 @@ yy52:
                yyt2 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy53:
@@ -679,21 +759,21 @@ yy53:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy54:
@@ -711,8 +791,8 @@ yy54:
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy55:
@@ -732,10 +812,10 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy58:
@@ -743,44 +823,44 @@ yy58:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
                yyt2 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy17;
 yy60:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy61:
@@ -800,8 +880,8 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/76.i--flex-syntax.c b/re2c/test/posix_captures/repetition/76.i--flex-syntax.c
index fd504da918139df69c6bf90ac1fbf58f1e2f2299..0aab0e170991bcdad4aad93a76eed6a56c6c1baa 100644 (file)
--- a/re2c/test/posix_captures/repetition/76.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/76.i--flex-syntax.c
@@ -35,15 +35,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy5:
@@ -64,13 +64,13 @@ yy7:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        default:        goto yy4;
        }
@@ -86,13 +86,13 @@ yy9:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        default:        goto yy4;
        }
@@ -110,57 +110,77 @@ yy11:
        }
 yy12:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy19;
-       case 'b':       goto yy20;
-       case 'c':       goto yy21;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy20;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy13:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy14:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        default:        goto yy4;
        }
 yy15:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy19;
-       case 'b':       goto yy25;
-       case 'c':       goto yy21;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy16:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'd':       goto yy9;
        default:        goto yy4;
@@ -181,21 +201,21 @@ yy19:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy28;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy20:
@@ -209,13 +229,13 @@ yy20:
                yyt2 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy21:
@@ -223,21 +243,21 @@ yy21:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy22:
@@ -264,8 +284,8 @@ yy24:
                goto yy21;
        case 'd':       goto yy15;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy25:
@@ -282,62 +302,82 @@ yy26:
        }
 yy27:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy34;
-       case 'c':       goto yy35;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy34;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy28:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy29:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy37;
-       case 'c':       goto yy35;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy37;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy30:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':       goto yy21;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy31:
@@ -356,21 +396,21 @@ yy33:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy40;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy34:
@@ -384,13 +424,13 @@ yy34:
                yyt2 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy35:
@@ -398,21 +438,21 @@ yy35:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy36:
@@ -430,8 +470,8 @@ yy36:
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy37:
@@ -448,62 +488,82 @@ yy38:
        }
 yy39:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy46;
-       case 'c':       goto yy47;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy46;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy40:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy41:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy49;
-       case 'c':       goto yy47;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy49;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy42:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy43:
@@ -522,21 +582,21 @@ yy45:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy52;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy46:
@@ -550,13 +610,13 @@ yy46:
                yyt2 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy47:
@@ -564,21 +624,21 @@ yy47:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy48:
@@ -596,8 +656,8 @@ yy48:
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy49:
@@ -614,62 +674,82 @@ yy50:
        }
 yy51:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy58;
-       case 'c':       goto yy59;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy58;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy52:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy53:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy61;
-       case 'c':       goto yy59;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy61;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy54:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy55:
@@ -689,12 +769,12 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy58:
@@ -708,19 +788,19 @@ yy58:
                yyt2 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt3 = yyt2;
-       yyt2 = YYCURSOR;
+       yyt4 = yyt2;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy23;
 yy60:
        yyaccept = 3;
@@ -737,8 +817,8 @@ yy60:
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy61:
@@ -758,7 +838,7 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/77.i--flex-syntax.c b/re2c/test/posix_captures/repetition/77.i--flex-syntax.c
index 3bb79f838b4cc606c2270c17ffb4d57cdbe9ee3a..16e8d1c8d6132d698aee69090399880d6be570d6 100644 (file)
--- a/re2c/test/posix_captures/repetition/77.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/77.i--flex-syntax.c
@@ -35,15 +35,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy5:
@@ -100,13 +100,13 @@ yy12:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        default:        goto yy4;
        }
@@ -122,13 +122,13 @@ yy14:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        default:        goto yy4;
        }
@@ -155,57 +155,77 @@ yy17:
        }
 yy18:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy25;
-       case 'b':       goto yy26;
-       case 'c':       goto yy27;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy26;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy19:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        default:        goto yy4;
        }
 yy21:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy25;
-       case 'b':       goto yy31;
-       case 'c':       goto yy27;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy31;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy22:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'd':       goto yy14;
        default:        goto yy4;
@@ -226,21 +246,21 @@ yy25:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy34;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy26:
@@ -254,13 +274,13 @@ yy26:
                yyt2 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy27:
@@ -268,21 +288,21 @@ yy27:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy28:
@@ -309,8 +329,8 @@ yy30:
                goto yy27;
        case 'd':       goto yy21;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy31:
@@ -327,62 +347,82 @@ yy32:
        }
 yy33:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy40;
-       case 'c':       goto yy41;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy40;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy34:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy35:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy43;
-       case 'c':       goto yy41;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy43;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy36:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':       goto yy27;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy37:
@@ -401,21 +441,21 @@ yy39:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy46;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy40:
@@ -429,13 +469,13 @@ yy40:
                yyt2 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy41:
@@ -443,21 +483,21 @@ yy41:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy42:
@@ -475,8 +515,8 @@ yy42:
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy43:
@@ -493,62 +533,82 @@ yy44:
        }
 yy45:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy52;
-       case 'c':       goto yy53;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy52;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy46:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy47:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy55;
-       case 'c':       goto yy53;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy55;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy48:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy49:
@@ -567,21 +627,21 @@ yy51:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy58;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy52:
@@ -595,13 +655,13 @@ yy52:
                yyt2 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy53:
@@ -609,21 +669,21 @@ yy53:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy54:
@@ -641,8 +701,8 @@ yy54:
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy55:
@@ -662,10 +722,10 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy58:
@@ -673,44 +733,44 @@ yy58:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
                yyt2 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy29;
 yy60:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy61:
@@ -730,8 +790,8 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/79.i--flex-syntax.c b/re2c/test/posix_captures/repetition/79.i--flex-syntax.c
index 5b0b3e33c75c46f8eb643ecb6243fe3fa3a2f3ee..882347c8ab3b4a990b81813f7d540ad80fd10fa3 100644 (file)
--- a/re2c/test/posix_captures/repetition/79.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/79.i--flex-syntax.c
@@ -48,9 +48,9 @@ yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[4] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = yyt3;
        yypmatch[5] = YYCURSOR;
        {}
 yy6:

diff --git a/re2c/test/posix_captures/repetition/81.i--flex-syntax.c b/re2c/test/posix_captures/repetition/81.i--flex-syntax.c
index 5b0b3e33c75c46f8eb643ecb6243fe3fa3a2f3ee..882347c8ab3b4a990b81813f7d540ad80fd10fa3 100644 (file)
--- a/re2c/test/posix_captures/repetition/81.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/81.i--flex-syntax.c
@@ -48,9 +48,9 @@ yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[4] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = yyt3;
        yypmatch[5] = YYCURSOR;
        {}
 yy6:

diff --git a/re2c/test/posix_captures/repetition/82.i--flex-syntax.c b/re2c/test/posix_captures/repetition/82.i--flex-syntax.c
index 0571c7e4fa4dc4e1fa1da917efa950371d55ef72..fdb0b02eacebf632df00f64737f27039cd41d900 100644 (file)
--- a/re2c/test/posix_captures/repetition/82.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/82.i--flex-syntax.c
@@ -41,11 +41,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy5:
@@ -77,19 +77,19 @@ yy7:
                yyt2 = YYCURSOR;
                goto yy11;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy9:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy10:
@@ -123,10 +123,10 @@ yy12:
                yyt2 = YYCURSOR;
                goto yy11;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy13:
@@ -160,10 +160,10 @@ yy15:
                yyt4 = YYCURSOR;
                goto yy18;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy16:
@@ -192,7 +192,7 @@ yy18:
        case 'd':       goto yy11;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        }
 yy19:

diff --git a/re2c/test/posix_captures/repetition/83.i--flex-syntax.c b/re2c/test/posix_captures/repetition/83.i--flex-syntax.c
index 2f6bc478a56cf4e71e702f0b3cc853dfa9f37bbb..741a915f763d779d89764f162fb14585f566f258 100644 (file)
--- a/re2c/test/posix_captures/repetition/83.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/83.i--flex-syntax.c
@@ -35,11 +35,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy5:
@@ -113,19 +113,19 @@ yy12:
                yyt2 = YYCURSOR;
                goto yy16;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy14:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy15:
@@ -159,10 +159,10 @@ yy17:
                yyt2 = YYCURSOR;
                goto yy16;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy18:
@@ -205,10 +205,10 @@ yy21:
                yyt4 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy22:
@@ -237,7 +237,7 @@ yy24:
        case 'd':       goto yy16;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy14;
        }
 yy25:

diff --git a/re2c/test/posix_captures/repetition/84.i--flex-syntax.c b/re2c/test/posix_captures/repetition/84.i--flex-syntax.c
index b3ae2e053ff71c37f5dd43d0d6e5e03077716689..2771a53ddacb2359a547bdbe429278a14f7826a0 100644 (file)
--- a/re2c/test/posix_captures/repetition/84.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/84.i--flex-syntax.c
@@ -35,11 +35,11 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy5:
@@ -158,19 +158,19 @@ yy18:
                yyt2 = YYCURSOR;
                goto yy22;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy20:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
-       yypmatch[4] = yyt3;
-       yypmatch[1] = YYCURSOR;
        yypmatch[3] = yyt3;
+       yypmatch[4] = yyt4;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy21:
@@ -204,10 +204,10 @@ yy23:
                yyt2 = YYCURSOR;
                goto yy22;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy24:
@@ -250,10 +250,10 @@ yy27:
                yyt4 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy28:
@@ -282,7 +282,7 @@ yy30:
        case 'd':       goto yy22;
        default:
                yyt2 = yyt4;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy20;
        }
 yy31:

diff --git a/re2c/test/posix_captures/repetition/86.i--flex-syntax.c b/re2c/test/posix_captures/repetition/86.i--flex-syntax.c
index 03a92dad41326d7aa2d587a80521fdf86f91ce8d..c1c486bffd5ed334e13f0070c996c9d63106a2c5 100644 (file)
--- a/re2c/test/posix_captures/repetition/86.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/86.i--flex-syntax.c
@@ -7,13 +7,13 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy7;
        default:        goto yy2;
        }
@@ -24,20 +24,30 @@ yy2:
        {}
 yy3:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy8;
-       case 'b':       goto yy9;
-       case 'c':       goto yy10;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy8;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy9;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy10;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy4:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy5:
@@ -51,46 +61,56 @@ yy6:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy7:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy8;
-       case 'b':       goto yy14;
-       case 'c':       goto yy10;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy8;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy14;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy10;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy8:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy16;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy9:
@@ -104,13 +124,13 @@ yy9:
                yyt2 = YYCURSOR;
                goto yy14;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy18;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy10:
@@ -118,21 +138,21 @@ yy10:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy11:
@@ -158,62 +178,82 @@ yy14:
        }
 yy15:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy21;
-       case 'b':       goto yy22;
-       case 'c':       goto yy23;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy22;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy23;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy16:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy17:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy21;
-       case 'b':       goto yy25;
-       case 'c':       goto yy23;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy23;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy18:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'd':       goto yy10;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy19:
@@ -232,21 +272,21 @@ yy21:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy28;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy22:
@@ -260,13 +300,13 @@ yy22:
                yyt2 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy23:
@@ -274,21 +314,21 @@ yy23:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy24:
@@ -306,8 +346,8 @@ yy24:
                goto yy23;
        case 'd':       goto yy17;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy25:
@@ -324,62 +364,82 @@ yy26:
        }
 yy27:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy34;
-       case 'c':       goto yy35;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy34;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy28:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy29:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy37;
-       case 'c':       goto yy35;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy37;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy30:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':       goto yy23;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy31:
@@ -398,21 +458,21 @@ yy33:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy40;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy34:
@@ -426,13 +486,13 @@ yy34:
                yyt2 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy35:
@@ -440,21 +500,21 @@ yy35:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy36:
@@ -472,8 +532,8 @@ yy36:
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy37:
@@ -490,62 +550,82 @@ yy38:
        }
 yy39:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy46;
-       case 'c':       goto yy47;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy46;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy40:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy41:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy49;
-       case 'c':       goto yy47;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy49;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy42:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy43:
@@ -564,21 +644,21 @@ yy45:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy52;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy46:
@@ -592,13 +672,13 @@ yy46:
                yyt2 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy47:
@@ -606,21 +686,21 @@ yy47:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy48:
@@ -638,8 +718,8 @@ yy48:
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy49:
@@ -656,62 +736,82 @@ yy50:
        }
 yy51:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy58;
-       case 'c':       goto yy59;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy58;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy52:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy53:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy61;
-       case 'c':       goto yy59;
-       default:        goto yy12;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy61;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy11;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy4;
        }
 yy54:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy55:
@@ -731,12 +831,12 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy58:
@@ -750,19 +850,19 @@ yy58:
                yyt2 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy11;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt3 = yyt2;
-       yyt2 = YYCURSOR;
+       yyt4 = yyt2;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy12;
 yy60:
        yyaccept = 3;
@@ -779,8 +879,8 @@ yy60:
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy61:
@@ -800,7 +900,7 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/87.i--flex-syntax.c b/re2c/test/posix_captures/repetition/87.i--flex-syntax.c
index 505ecefba6a8df66e38ea4fb685314a942a96629..add23726b4f358f9d80bfc639ab657a2a07bca01 100644 (file)
--- a/re2c/test/posix_captures/repetition/87.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/87.i--flex-syntax.c
@@ -26,13 +26,13 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy9;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        default:        goto yy4;
        }
@@ -41,15 +41,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy5:
@@ -62,57 +62,77 @@ yy6:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy10;
        default:        goto yy4;
        }
 yy7:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy13;
-       case 'b':       goto yy14;
-       case 'c':       goto yy15;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy13;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy14;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy15;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy8:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy9:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy18;
        default:        goto yy4;
        }
 yy10:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy13;
-       case 'b':       goto yy19;
-       case 'c':       goto yy15;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy13;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy15;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy11:
        yych = *++YYCURSOR;
@@ -130,21 +150,21 @@ yy13:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy22;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy14:
@@ -158,13 +178,13 @@ yy14:
                yyt2 = YYCURSOR;
                goto yy19;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy15:
@@ -172,21 +192,21 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy16:
@@ -213,8 +233,8 @@ yy18:
                goto yy15;
        case 'd':       goto yy10;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy19:
@@ -231,62 +251,82 @@ yy20:
        }
 yy21:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy27;
-       case 'b':       goto yy28;
-       case 'c':       goto yy29;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy28;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy29;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy22:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy23:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy27;
-       case 'b':       goto yy31;
-       case 'c':       goto yy29;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy31;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy29;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy24:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'd':       goto yy15;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy25:
@@ -305,21 +345,21 @@ yy27:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy34;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy28:
@@ -333,13 +373,13 @@ yy28:
                yyt2 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy29:
@@ -347,21 +387,21 @@ yy29:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy30:
@@ -379,8 +419,8 @@ yy30:
                goto yy29;
        case 'd':       goto yy23;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy31:
@@ -397,62 +437,82 @@ yy32:
        }
 yy33:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy40;
-       case 'c':       goto yy41;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy40;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy34:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy35:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy43;
-       case 'c':       goto yy41;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy43;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy36:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy37:
@@ -471,21 +531,21 @@ yy39:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy46;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy40:
@@ -499,13 +559,13 @@ yy40:
                yyt2 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy41:
@@ -513,21 +573,21 @@ yy41:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy42:
@@ -545,8 +605,8 @@ yy42:
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy43:
@@ -563,62 +623,82 @@ yy44:
        }
 yy45:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy52;
-       case 'c':       goto yy53;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy52;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy46:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy47:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy55;
-       case 'c':       goto yy53;
-       default:        goto yy17;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy55;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy16;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy8;
        }
 yy48:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy49:
@@ -637,21 +717,21 @@ yy51:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy58;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy52:
@@ -665,13 +745,13 @@ yy52:
                yyt2 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy53:
@@ -679,21 +759,21 @@ yy53:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy54:
@@ -711,8 +791,8 @@ yy54:
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy55:
@@ -732,10 +812,10 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy58:
@@ -743,44 +823,44 @@ yy58:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
                yyt2 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy16;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy17;
 yy60:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy61:
@@ -800,8 +880,8 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy8;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/88.i--flex-syntax.c b/re2c/test/posix_captures/repetition/88.i--flex-syntax.c
index fd504da918139df69c6bf90ac1fbf58f1e2f2299..0aab0e170991bcdad4aad93a76eed6a56c6c1baa 100644 (file)
--- a/re2c/test/posix_captures/repetition/88.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/88.i--flex-syntax.c
@@ -35,15 +35,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy5:
@@ -64,13 +64,13 @@ yy7:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy14;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        default:        goto yy4;
        }
@@ -86,13 +86,13 @@ yy9:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        default:        goto yy4;
        }
@@ -110,57 +110,77 @@ yy11:
        }
 yy12:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy19;
-       case 'b':       goto yy20;
-       case 'c':       goto yy21;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy20;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy13:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy14:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy24;
        default:        goto yy4;
        }
 yy15:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy19;
-       case 'b':       goto yy25;
-       case 'c':       goto yy21;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy19;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy21;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy16:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy12;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy17;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy15;
        case 'd':       goto yy9;
        default:        goto yy4;
@@ -181,21 +201,21 @@ yy19:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy28;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy20:
@@ -209,13 +229,13 @@ yy20:
                yyt2 = YYCURSOR;
                goto yy25;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy21:
@@ -223,21 +243,21 @@ yy21:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy22:
@@ -264,8 +284,8 @@ yy24:
                goto yy21;
        case 'd':       goto yy15;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy25:
@@ -282,62 +302,82 @@ yy26:
        }
 yy27:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy34;
-       case 'c':       goto yy35;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy34;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy28:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy29:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy33;
-       case 'b':       goto yy37;
-       case 'c':       goto yy35;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy33;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy37;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy35;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy30:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy27;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy29;
        case 'd':       goto yy21;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy31:
@@ -356,21 +396,21 @@ yy33:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy40;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy34:
@@ -384,13 +424,13 @@ yy34:
                yyt2 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy35:
@@ -398,21 +438,21 @@ yy35:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy36:
@@ -430,8 +470,8 @@ yy36:
                goto yy35;
        case 'd':       goto yy29;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy37:
@@ -448,62 +488,82 @@ yy38:
        }
 yy39:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy46;
-       case 'c':       goto yy47;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy46;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy40:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy41:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy45;
-       case 'b':       goto yy49;
-       case 'c':       goto yy47;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy45;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy49;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy47;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy42:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy39;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy43:
@@ -522,21 +582,21 @@ yy45:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy52;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy46:
@@ -550,13 +610,13 @@ yy46:
                yyt2 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy47:
@@ -564,21 +624,21 @@ yy47:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy48:
@@ -596,8 +656,8 @@ yy48:
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy49:
@@ -614,62 +674,82 @@ yy50:
        }
 yy51:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy58;
-       case 'c':       goto yy59;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy58;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy52:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy53:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy57;
-       case 'b':       goto yy61;
-       case 'c':       goto yy59;
-       default:        goto yy23;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy57;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy61;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy59;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy22;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy13;
        }
 yy54:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy51;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy55:
@@ -689,12 +769,12 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy58:
@@ -708,19 +788,19 @@ yy58:
                yyt2 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt3 = yyt2;
-       yyt2 = YYCURSOR;
+       yyt4 = yyt2;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy23;
 yy60:
        yyaccept = 3;
@@ -737,8 +817,8 @@ yy60:
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy61:
@@ -758,7 +838,7 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy13;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/89.i--flex-syntax.c b/re2c/test/posix_captures/repetition/89.i--flex-syntax.c
index 3bb79f838b4cc606c2270c17ffb4d57cdbe9ee3a..16e8d1c8d6132d698aee69090399880d6be570d6 100644 (file)
--- a/re2c/test/posix_captures/repetition/89.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/89.i--flex-syntax.c
@@ -35,15 +35,15 @@ yy4:
        switch (yyaccept) {
        case 0:         goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        case 2: 
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy5:
@@ -100,13 +100,13 @@ yy12:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy20;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        default:        goto yy4;
        }
@@ -122,13 +122,13 @@ yy14:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        default:        goto yy4;
        }
@@ -155,57 +155,77 @@ yy17:
        }
 yy18:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy25;
-       case 'b':       goto yy26;
-       case 'c':       goto yy27;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy26;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy19:
        yynmatch = 3;
        yypmatch[0] = yyt1;
-       yypmatch[2] = yyt3;
-       yypmatch[4] = yyt2;
-       yypmatch[1] = YYCURSOR;
+       yypmatch[2] = yyt4;
        yypmatch[3] = yyt2;
+       yypmatch[4] = yyt3;
+       yypmatch[1] = YYCURSOR;
        yypmatch[5] = YYCURSOR;
        {}
 yy20:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy30;
        default:        goto yy4;
        }
 yy21:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy25;
-       case 'b':       goto yy31;
-       case 'c':       goto yy27;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy25;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy31;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy27;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy22:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy18;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy23;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy21;
        case 'd':       goto yy14;
        default:        goto yy4;
@@ -226,21 +246,21 @@ yy25:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy34;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy26:
@@ -254,13 +274,13 @@ yy26:
                yyt2 = YYCURSOR;
                goto yy31;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy36;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy27:
@@ -268,21 +288,21 @@ yy27:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy28:
@@ -309,8 +329,8 @@ yy30:
                goto yy27;
        case 'd':       goto yy21;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy31:
@@ -327,62 +347,82 @@ yy32:
        }
 yy33:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy40;
-       case 'c':       goto yy41;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy40;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy34:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy42;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy35:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy39;
-       case 'b':       goto yy43;
-       case 'c':       goto yy41;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy39;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy43;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy41;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy36:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy33;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy37;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy35;
        case 'd':       goto yy27;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy37:
@@ -401,21 +441,21 @@ yy39:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy46;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy40:
@@ -429,13 +469,13 @@ yy40:
                yyt2 = YYCURSOR;
                goto yy43;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy48;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy41:
@@ -443,21 +483,21 @@ yy41:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy42:
@@ -475,8 +515,8 @@ yy42:
                goto yy41;
        case 'd':       goto yy35;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy43:
@@ -493,62 +533,82 @@ yy44:
        }
 yy45:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy52;
-       case 'c':       goto yy53;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy52;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy46:
        yyaccept = 2;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy54;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy47:
        yyaccept = 1;
        yych = *(YYMARKER = ++YYCURSOR);
-       yyt2 = YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy51;
-       case 'b':       goto yy55;
-       case 'c':       goto yy53;
-       default:        goto yy29;
+       case 'a':
+               yyt2 = YYCURSOR;
+               goto yy51;
+       case 'b':
+               yyt2 = YYCURSOR;
+               goto yy55;
+       case 'c':
+               yyt2 = YYCURSOR;
+               goto yy53;
+       case 'd':
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy28;
+       default:
+               yyt2 = yyt3 = YYCURSOR;
+               goto yy19;
        }
 yy48:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy45;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy49;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy47;
        case 'd':       goto yy41;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy49:
@@ -567,21 +627,21 @@ yy51:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy58;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy52:
@@ -595,13 +655,13 @@ yy52:
                yyt2 = YYCURSOR;
                goto yy55;
        case 'c':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy60;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy53:
@@ -609,21 +669,21 @@ yy53:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy54:
@@ -641,8 +701,8 @@ yy54:
                goto yy53;
        case 'd':       goto yy47;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy55:
@@ -662,10 +722,10 @@ yy57:
        switch (yych) {
        case 'b':       goto yy59;
        case 'd':
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy58:
@@ -673,44 +733,44 @@ yy58:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
                yyt2 = YYCURSOR;
                goto yy63;
        case 'd':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy28;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy59:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt2 = yyt3 = YYCURSOR;
        goto yy29;
 yy60:
        yyaccept = 3;
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy57;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy61;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy59;
        case 'd':       goto yy53;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt3;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy61:
@@ -730,8 +790,8 @@ yy63:
        switch (yych) {
        case 'd':       goto yy59;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt4 = yyt2;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy19;
        }
 yy64:

diff --git a/re2c/test/posix_captures/repetition/91.i--flex-syntax.c b/re2c/test/posix_captures/repetition/91.i--flex-syntax.c
index 5b0b3e33c75c46f8eb643ecb6243fe3fa3a2f3ee..882347c8ab3b4a990b81813f7d540ad80fd10fa3 100644 (file)
--- a/re2c/test/posix_captures/repetition/91.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/91.i--flex-syntax.c
@@ -48,9 +48,9 @@ yy5:
        yynmatch = 3;
        yypmatch[0] = yyt1;
        yypmatch[2] = yyt2;
+       yypmatch[3] = yyt3;
        yypmatch[4] = yyt3;
        yypmatch[1] = YYCURSOR;
-       yypmatch[3] = yyt3;
        yypmatch[5] = YYCURSOR;
        {}
 yy6:

diff --git a/re2c/test/posix_captures/skeleton_01.i--posix-captures.c b/re2c/test/posix_captures/skeleton_01.i--posix-captures.c
index a23a5c5418f12f207b1ad2307b01e623d28c0e74..523a92ec82ed6a306e2d79be078ac1967cc2d28e 100644 (file)
--- a/re2c/test/posix_captures/skeleton_01.i--posix-captures.c
+++ b/re2c/test/posix_captures/skeleton_01.i--posix-captures.c
@@ -211,7 +211,7 @@ yy16:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt9 = yyt14 = YYCURSOR;
+               yyt9 = yyt15 = YYCURSOR;
                goto yy24;
        }
 yy17:
@@ -259,7 +259,7 @@ yy19:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy30;
        }
 yy20:
@@ -273,7 +273,7 @@ yy20:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy30;
        }
 yy21:
@@ -292,7 +292,7 @@ yy21:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy33;
        }
 yy22:
@@ -306,7 +306,7 @@ yy22:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy33;
        }
 yy23:
@@ -325,7 +325,7 @@ yy23:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy30;
        }
 yy24:
@@ -344,7 +344,7 @@ yy24:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy33;
        }
 yy25:
@@ -358,7 +358,7 @@ yy25:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy36;
        }
 yy26:
@@ -377,7 +377,7 @@ yy26:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt7 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy38;
        }
 yy27:
@@ -391,7 +391,7 @@ yy27:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt7 = YYCURSOR;
+               yyt4 = yyt7 = YYCURSOR;
                goto yy40;
        }
 yy28:
@@ -530,7 +530,7 @@ yy36:
        switch (yych) {
        case 'a':
                yyt2 = yyt6;
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy53;
        case 'b':
                yyt7 = yyt9;
@@ -588,7 +588,7 @@ yy39:
                goto yy55;
        }
 yy40:
-       yyaccept = 9;
+       yyaccept = 10;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -596,7 +596,7 @@ yy40:
        case 'a':
                yyt2 = yyt6;
                yyt3 = yyt10;
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy59;
        case 'b':
                yyt7 = yyt10;
@@ -621,7 +621,7 @@ yy41:
                goto yy60;
        }
 yy42:
-       yyaccept = 10;
+       yyaccept = 11;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -658,7 +658,7 @@ yy43:
                goto yy21;
        }
 yy44:
-       yyaccept = 10;
+       yyaccept = 11;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -695,7 +695,7 @@ yy45:
                goto yy26;
        }
 yy46:
-       yyaccept = 11;
+       yyaccept = 12;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -761,7 +761,7 @@ yy49:
                goto yy67;
        }
 yy50:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -795,7 +795,7 @@ yy51:
                goto yy71;
        }
 yy52:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -971,7 +971,7 @@ yy61:
                goto yy80;
        }
 yy62:
-       yyaccept = 11;
+       yyaccept = 12;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1003,7 +1003,7 @@ yy63:
                goto yy84;
        }
 yy64:
-       yyaccept = 11;
+       yyaccept = 12;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1051,7 +1051,7 @@ yy66:
                goto yy90;
        }
 yy67:
-       yyaccept = 11;
+       yyaccept = 12;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1083,7 +1083,7 @@ yy68:
                goto yy90;
        }
 yy69:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1113,7 +1113,7 @@ yy70:
                goto yy96;
        }
 yy71:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1145,7 +1145,7 @@ yy72:
                goto yy99;
        }
 yy73:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1163,7 +1163,7 @@ yy73:
                goto yy82;
        }
 yy74:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1186,7 +1186,7 @@ yy75:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt11 = yyt4;
+               yyt11 = yyt5;
                goto yy89;
        case 'b':
                yyt7 = yyt12;
@@ -1197,7 +1197,7 @@ yy75:
                goto yy88;
        }
 yy76:
-       yyaccept = 12;
+       yyaccept = 13;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1295,7 +1295,7 @@ yy81:
                goto yy111;
        }
 yy82:
-       yyaccept = 13;
+       yyaccept = 14;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1329,7 +1329,7 @@ yy83:
                goto yy115;
        }
 yy84:
-       yyaccept = 14;
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1363,7 +1363,7 @@ yy85:
                goto yy115;
        }
 yy86:
-       yyaccept = 15;
+       yyaccept = 16;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1397,7 +1397,7 @@ yy87:
                goto yy122;
        }
 yy88:
-       yyaccept = 16;
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1431,7 +1431,7 @@ yy89:
                goto yy126;
        }
 yy90:
-       yyaccept = 16;
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1454,14 +1454,14 @@ yy91:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt15 = yyt16 = YYCURSOR;
+               yyt14 = yyt16 = YYCURSOR;
                goto yy131;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt15 = yyt16 = YYCURSOR;
+               yyt14 = yyt16 = YYCURSOR;
                goto yy130;
        }
 yy92:
@@ -1497,7 +1497,7 @@ yy93:
                goto yy133;
        }
 yy94:
-       yyaccept = 17;
+       yyaccept = 18;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1533,7 +1533,7 @@ yy95:
                goto yy115;
        }
 yy96:
-       yyaccept = 18;
+       yyaccept = 19;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1570,7 +1570,7 @@ yy97:
                goto yy115;
        }
 yy98:
-       yyaccept = 9;
+       yyaccept = 20;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1624,7 +1624,7 @@ yy100:
                goto yy137;
        }
 yy101:
-       yyaccept = 14;
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1658,7 +1658,7 @@ yy102:
                goto yy141;
        }
 yy103:
-       yyaccept = 14;
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1692,7 +1692,7 @@ yy104:
                goto yy145;
        }
 yy105:
-       yyaccept = 17;
+       yyaccept = 18;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1724,7 +1724,7 @@ yy106:
                goto yy149;
        }
 yy107:
-       yyaccept = 18;
+       yyaccept = 19;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1826,7 +1826,7 @@ yy112:
                goto yy160;
        }
 yy113:
-       yyaccept = 14;
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1860,7 +1860,7 @@ yy114:
                goto yy164;
        }
 yy115:
-       yyaccept = 19;
+       yyaccept = 21;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1894,7 +1894,7 @@ yy116:
                goto yy168;
        }
 yy117:
-       yyaccept = 20;
+       yyaccept = 22;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1909,7 +1909,7 @@ yy117:
                goto yy8;
        default:
                yyt9 = yyt14 = YYCURSOR;
-               goto yy162;
+               goto yy170;
        }
 yy118:
        ++YYCURSOR;
@@ -1918,14 +1918,14 @@ yy118:
        switch (yych) {
        case 'a':
                yyt15 = yyt16 = YYCURSOR;
-               goto yy170;
+               goto yy172;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt15 = yyt16 = YYCURSOR;
-               goto yy164;
+               goto yy171;
        }
 yy119:
        ++YYCURSOR;
@@ -1934,17 +1934,17 @@ yy119:
        switch (yych) {
        case 'a':
                yyt10 = yyt16 = yyt17 = YYCURSOR;
-               goto yy172;
+               goto yy174;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt16 = yyt17 = YYCURSOR;
-               goto yy171;
+               goto yy173;
        }
 yy120:
-       yyaccept = 16;
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -1982,7 +1982,7 @@ yy121:
                goto yy164;
        }
 yy122:
-       yyaccept = 21;
+       yyaccept = 23;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2020,7 +2020,7 @@ yy123:
                goto yy168;
        }
 yy124:
-       yyaccept = 22;
+       yyaccept = 24;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2037,7 +2037,7 @@ yy124:
        default:
                yyt11 = yyt12;
                yyt9 = yyt14 = YYCURSOR;
-               goto yy162;
+               goto yy170;
        }
 yy125:
        ++YYCURSOR;
@@ -2047,7 +2047,7 @@ yy125:
        case 'a':
                yyt11 = yyt12;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy170;
+               goto yy172;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
@@ -2055,10 +2055,10 @@ yy125:
        default:
                yyt11 = yyt12;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy164;
+               goto yy171;
        }
 yy126:
-       yyaccept = 23;
+       yyaccept = 25;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2066,14 +2066,14 @@ yy126:
        case 'a':
                yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = yyt19 = YYCURSOR;
-               goto yy174;
+               goto yy176;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy173;
+               goto yy175;
        }
 yy127:
        ++YYCURSOR;
@@ -2081,18 +2081,18 @@ yy127:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = yyt5 = YYCURSOR;
-               goto yy176;
+               yyt5 = yyt14 = YYCURSOR;
+               goto yy178;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt4 = yyt5 = YYCURSOR;
-               goto yy175;
+               yyt5 = yyt14 = YYCURSOR;
+               goto yy177;
        }
 yy128:
-       yyaccept = 24;
+       yyaccept = 26;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2100,14 +2100,14 @@ yy128:
        case 'a':
                yyt2 = yyt6;
                yyt9 = yyt10 = yyt14 = yyt19 = YYCURSOR;
-               goto yy178;
+               goto yy180;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt9 = yyt14 = YYCURSOR;
-               goto yy177;
+               goto yy179;
        }
 yy129:
        ++YYCURSOR;
@@ -2116,17 +2116,17 @@ yy129:
        switch (yych) {
        case 'a':
                yyt15 = yyt16 = YYCURSOR;
-               goto yy180;
+               goto yy182;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt15 = yyt16 = YYCURSOR;
-               goto yy179;
+               goto yy181;
        }
 yy130:
-       yyaccept = 25;
+       yyaccept = 27;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2134,14 +2134,14 @@ yy130:
        case 'a':
                yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = yyt19 = YYCURSOR;
-               goto yy174;
+               goto yy176;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy173;
+               goto yy175;
        }
 yy131:
        ++YYCURSOR;
@@ -2150,14 +2150,14 @@ yy131:
        switch (yych) {
        case 'a':
                yyt4 = yyt5 = YYCURSOR;
-               goto yy182;
+               goto yy184;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy181;
+               goto yy183;
        }
 yy132:
        ++YYCURSOR;
@@ -2180,7 +2180,7 @@ yy132:
                goto yy168;
        }
 yy133:
-       yyaccept = 26;
+       yyaccept = 28;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2188,14 +2188,14 @@ yy133:
        case 'a':
                yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = yyt10 = YYCURSOR;
-               goto yy184;
+               goto yy186;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy183;
+               goto yy185;
        }
 yy134:
        ++YYCURSOR;
@@ -2204,17 +2204,17 @@ yy134:
        switch (yych) {
        case 'a':
                yyt4 = yyt5 = yyt13 = YYCURSOR;
-               goto yy186;
+               goto yy188;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy185;
+               goto yy187;
        }
 yy135:
-       yyaccept = 27;
+       yyaccept = 29;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2223,14 +2223,14 @@ yy135:
                yyt2 = yyt6;
                yyt3 = yyt12;
                yyt4 = yyt5 = yyt7 = yyt15 = YYCURSOR;
-               goto yy188;
+               goto yy190;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy187;
+               goto yy189;
        }
 yy136:
        ++YYCURSOR;
@@ -2239,14 +2239,14 @@ yy136:
        switch (yych) {
        case 'a':
                yyt14 = yyt15 = YYCURSOR;
-               goto yy190;
+               goto yy192;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt14 = yyt15 = YYCURSOR;
-               goto yy189;
+               goto yy191;
        }
 yy137:
        yyaccept = 1;
@@ -2260,14 +2260,14 @@ yy137:
                yyt4 = yyt9;
                yyt5 = yyt14;
                yyt7 = yyt8 = yyt10 = yyt16 = YYCURSOR;
-               goto yy192;
+               goto yy194;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt8 = yyt16 = YYCURSOR;
-               goto yy191;
+               goto yy193;
        }
 yy138:
        ++YYCURSOR;
@@ -2276,17 +2276,17 @@ yy138:
        switch (yych) {
        case 'a':
                yyt11 = YYCURSOR;
-               goto yy194;
+               goto yy196;
        case 'b':
                yyt7 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt11 = YYCURSOR;
-               goto yy193;
+               goto yy195;
        }
 yy139:
-       yyaccept = 28;
+       yyaccept = 30;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2301,7 +2301,7 @@ yy139:
                goto yy8;
        default:
                yyt9 = yyt14 = YYCURSOR;
-               goto yy162;
+               goto yy170;
        }
 yy140:
        ++YYCURSOR;
@@ -2310,17 +2310,17 @@ yy140:
        switch (yych) {
        case 'a':
                yyt15 = yyt16 = YYCURSOR;
-               goto yy195;
+               goto yy197;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt15 = yyt16 = YYCURSOR;
-               goto yy164;
+               goto yy171;
        }
 yy141:
-       yyaccept = 29;
+       yyaccept = 31;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2344,7 +2344,7 @@ yy142:
        switch (yych) {
        case 'a':
                yyt16 = YYCURSOR;
-               goto yy196;
+               goto yy198;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
@@ -2354,7 +2354,7 @@ yy142:
                goto yy168;
        }
 yy143:
-       yyaccept = 30;
+       yyaccept = 32;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2362,14 +2362,14 @@ yy143:
        case 'a':
                yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = yyt15 = YYCURSOR;
-               goto yy198;
+               goto yy200;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy197;
+               goto yy199;
        }
 yy144:
        ++YYCURSOR;
@@ -2378,17 +2378,17 @@ yy144:
        switch (yych) {
        case 'a':
                yyt14 = yyt15 = YYCURSOR;
-               goto yy200;
+               goto yy202;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt14 = yyt15 = YYCURSOR;
-               goto yy199;
+               goto yy201;
        }
 yy145:
-       yyaccept = 31;
+       yyaccept = 33;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2396,14 +2396,14 @@ yy145:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt8 = yyt10 = yyt16 = YYCURSOR;
-               goto yy202;
+               goto yy204;
        case 'b':
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt8 = yyt16 = YYCURSOR;
-               goto yy201;
+               goto yy203;
        }
 yy146:
        ++YYCURSOR;
@@ -2412,14 +2412,14 @@ yy146:
        switch (yych) {
        case 'a':
                yyt12 = YYCURSOR;
-               goto yy203;
+               goto yy205;
        default:
                yyt7 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        }
 yy147:
-       yyaccept = 18;
+       yyaccept = 19;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2455,7 +2455,7 @@ yy148:
                goto yy164;
        }
 yy149:
-       yyaccept = 32;
+       yyaccept = 34;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2491,7 +2491,7 @@ yy150:
                goto yy168;
        }
 yy151:
-       yyaccept = 33;
+       yyaccept = 35;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2507,7 +2507,7 @@ yy151:
        default:
                yyt11 = yyt7;
                yyt9 = yyt14 = YYCURSOR;
-               goto yy162;
+               goto yy170;
        }
 yy152:
        ++YYCURSOR;
@@ -2517,14 +2517,14 @@ yy152:
        case 'a':
                yyt11 = yyt7;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy170;
+               goto yy172;
        case 'b':
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt11 = yyt7;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy164;
+               goto yy171;
        }
 yy153:
        ++YYCURSOR;
@@ -2534,17 +2534,17 @@ yy153:
        case 'a':
                yyt11 = yyt7;
                yyt10 = yyt16 = yyt17 = YYCURSOR;
-               goto yy172;
+               goto yy174;
        case 'b':
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt11 = yyt7;
                yyt16 = yyt17 = YYCURSOR;
-               goto yy171;
+               goto yy173;
        }
 yy154:
-       yyaccept = 34;
+       yyaccept = 36;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2562,7 +2562,7 @@ yy154:
        default:
                yyt11 = yyt13;
                yyt9 = yyt14 = YYCURSOR;
-               goto yy162;
+               goto yy170;
        }
 yy155:
        ++YYCURSOR;
@@ -2572,7 +2572,7 @@ yy155:
        case 'a':
                yyt11 = yyt13;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy195;
+               goto yy197;
        case 'b':
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
@@ -2580,10 +2580,10 @@ yy155:
        default:
                yyt11 = yyt13;
                yyt15 = yyt16 = YYCURSOR;
-               goto yy164;
+               goto yy171;
        }
 yy156:
-       yyaccept = 35;
+       yyaccept = 37;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2611,7 +2611,7 @@ yy157:
        case 'a':
                yyt11 = yyt13;
                yyt16 = YYCURSOR;
-               goto yy196;
+               goto yy198;
        case 'b':
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
@@ -2622,7 +2622,7 @@ yy157:
                goto yy168;
        }
 yy158:
-       yyaccept = 27;
+       yyaccept = 29;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2632,7 +2632,7 @@ yy158:
                yyt3 = yyt13;
                yyt11 = yyt13;
                yyt4 = yyt5 = yyt7 = yyt15 = YYCURSOR;
-               goto yy198;
+               goto yy200;
        case 'b':
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
@@ -2640,7 +2640,7 @@ yy158:
        default:
                yyt11 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
-               goto yy197;
+               goto yy199;
        }
 yy159:
        ++YYCURSOR;
@@ -2650,7 +2650,7 @@ yy159:
        case 'a':
                yyt11 = yyt13;
                yyt14 = yyt15 = YYCURSOR;
-               goto yy200;
+               goto yy202;
        case 'b':
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
@@ -2658,7 +2658,7 @@ yy159:
        default:
                yyt11 = yyt13;
                yyt14 = yyt15 = YYCURSOR;
-               goto yy199;
+               goto yy201;
        }
 yy160:
        yyaccept = 1;
@@ -2673,7 +2673,7 @@ yy160:
                yyt5 = yyt18;
                yyt11 = yyt13;
                yyt7 = yyt8 = yyt10 = yyt16 = YYCURSOR;
-               goto yy202;
+               goto yy204;
        case 'b':
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
@@ -2681,7 +2681,7 @@ yy160:
        default:
                yyt11 = yyt13;
                yyt8 = yyt16 = YYCURSOR;
-               goto yy201;
+               goto yy203;
        }
 yy161:
        ++YYCURSOR;
@@ -2690,35 +2690,36 @@ yy161:
        switch (yych) {
        case 'a':
                yyt20 = YYCURSOR;
-               goto yy204;
+               goto yy206;
        default:
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        }
 yy162:
-       yyaccept = 31;
+       yyaccept = 38;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt2 = yyt6;
+               yyt4 = yyt9;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt4 = yyt9;
                yyt5 = yyt14;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy206;
+       default:        goto yy208;
        }
 yy163:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy209;
+       case 'a':       goto yy211;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -2726,43 +2727,44 @@ yy163:
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy208;
+               goto yy210;
        }
 yy164:
-       yyaccept = 36;
+       yyaccept = 39;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt2 = yyt6;
+               yyt4 = yyt16;
                yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               goto yy213;
        case 'b':
                yyt4 = yyt16;
                yyt5 = yyt15;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy210;
+       default:        goto yy212;
        }
 yy165:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy213;
+       case 'a':       goto yy215;
        case 'b':
                yyt6 = yyt14;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy214;
+       case 'c':       goto yy216;
        default:
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
 yy166:
-       yyaccept = 14;
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2770,18 +2772,18 @@ yy166:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy215;
+       default:        goto yy217;
        }
 yy167:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy217;
+       case 'a':       goto yy219;
        case 'b':
                yyt6 = yyt17;
                yyt7 = yyt10;
@@ -2789,10 +2791,10 @@ yy167:
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy216;
+               goto yy218;
        }
 yy168:
-       yyaccept = 37;
+       yyaccept = 40;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2800,13 +2802,13 @@ yy168:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               goto yy213;
        case 'b':
                yyt4 = yyt16;
                yyt5 = yyt16;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy218;
+       default:        goto yy220;
        }
 yy169:
        ++YYCURSOR;
@@ -2815,13 +2817,13 @@ yy169:
        switch (yych) {
        case 'a':
                yyt10 = YYCURSOR;
-               goto yy219;
+               goto yy221;
        case 'b':
                yyt6 = yyt13;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy220;
+       case 'c':       goto yy222;
        default:
                yyt6 = yyt13;
                yyt7 = yyt10;
@@ -2829,14 +2831,48 @@ yy169:
                goto yy26;
        }
 yy170:
-       ++YYCURSOR;
+       yyaccept = 33;
+       YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt14 = yyt10;
-               yyt10 = yyt9;
-               goto yy213;
+               yyt2 = yyt6;
+               yyt10 = yyt19 = YYCURSOR;
+               goto yy209;
+       case 'b':
+               yyt4 = yyt9;
+               yyt5 = yyt14;
+               yyt7 = yyt11;
+               goto yy8;
+       default:        goto yy208;
+       }
+yy171:
+       yyaccept = 41;
+       YYMARKER = ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt2 = yyt6;
+               yyt10 = yyt17 = YYCURSOR;
+               goto yy213;
+       case 'b':
+               yyt4 = yyt16;
+               yyt5 = yyt15;
+               yyt7 = yyt11;
+               goto yy8;
+       default:        goto yy212;
+       }
+yy172:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt14 = yyt10;
+               yyt10 = yyt9;
+               goto yy215;
        case 'b':
                yyt6 = yyt10;
                yyt7 = yyt9;
@@ -2845,15 +2881,15 @@ yy170:
        case 'c':
                yyt4 = yyt3;
                yyt5 = yyt8;
-               goto yy214;
+               goto yy216;
        default:
                yyt14 = yyt10;
                yyt10 = yyt9;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy171:
-       yyaccept = 38;
+yy173:
+       yyaccept = 42;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2861,33 +2897,33 @@ yy171:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt19 = YYCURSOR;
-               goto yy222;
+               goto yy224;
        case 'b':
                yyt4 = yyt16;
                yyt5 = yyt17;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy221;
+       default:        goto yy223;
        }
-yy172:
+yy174:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy223;
+       case 'a':       goto yy225;
        case 'b':
                yyt6 = yyt12;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy220;
+       case 'c':       goto yy222;
        default:
                yyt6 = yyt12;
-               yyt7 = YYCURSOR;
+               yyt4 = yyt7 = YYCURSOR;
                goto yy40;
        }
-yy173:
-       yyaccept = 16;
+yy175:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2895,28 +2931,28 @@ yy173:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy224;
+       default:        goto yy226;
        }
-yy174:
+yy176:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy226;
+       case 'a':       goto yy228;
        case 'b':
                yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy225;
+               goto yy227;
        }
-yy175:
-       yyaccept = 16;
+yy177:
+       yyaccept = 43;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2924,31 +2960,32 @@ yy175:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt19 = YYCURSOR;
-               goto yy222;
+               goto yy224;
        case 'b':
+               yyt4 = yyt14;
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy227;
+       default:        goto yy229;
        }
-yy176:
+yy178:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy228;
+       case 'a':       goto yy230;
        case 'b':
                yyt6 = yyt11;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy229;
+       case 'c':       goto yy231;
        default:
                yyt6 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy60;
        }
-yy177:
-       yyaccept = 39;
+yy179:
+       yyaccept = 44;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2956,7 +2993,7 @@ yy177:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt4 = yyt9;
                yyt5 = yyt14;
@@ -2964,16 +3001,16 @@ yy177:
                goto yy8;
        default:
                yyt11 = yyt12;
-               goto yy206;
+               goto yy208;
        }
-yy178:
+yy180:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt11 = yyt12;
-               goto yy209;
+               goto yy211;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -2981,10 +3018,10 @@ yy178:
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy208;
+               goto yy210;
        }
-yy179:
-       yyaccept = 40;
+yy181:
+       yyaccept = 45;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -2992,7 +3029,7 @@ yy179:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               goto yy213;
        case 'b':
                yyt4 = yyt16;
                yyt5 = yyt15;
@@ -3000,9 +3037,9 @@ yy179:
                goto yy8;
        default:
                yyt11 = yyt12;
-               goto yy210;
+               goto yy212;
        }
-yy180:
+yy182:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3011,7 +3048,7 @@ yy180:
                yyt10 = yyt8;
                yyt11 = yyt12;
                yyt14 = yyt9;
-               goto yy213;
+               goto yy215;
        case 'b':
                yyt6 = yyt9;
                yyt7 = yyt8;
@@ -3021,15 +3058,15 @@ yy180:
                yyt4 = yyt3;
                yyt5 = yyt7;
                yyt11 = yyt12;
-               goto yy214;
+               goto yy216;
        default:
                yyt10 = yyt8;
                yyt14 = yyt9;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy181:
-       yyaccept = 16;
+yy183:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3037,33 +3074,33 @@ yy181:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt10 = YYCURSOR;
-               goto yy231;
+               goto yy233;
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy230;
+       default:        goto yy232;
        }
-yy182:
+yy184:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt13 = YYCURSOR;
-               goto yy232;
+               goto yy234;
        case 'b':
                yyt6 = yyt11;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy233;
+       case 'c':       goto yy235;
        default:
                yyt6 = yyt11;
                yyt4 = yyt5 = yyt13 = YYCURSOR;
                goto yy80;
        }
-yy183:
-       yyaccept = 16;
+yy185:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3071,28 +3108,28 @@ yy183:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt15 = YYCURSOR;
-               goto yy235;
+               goto yy237;
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy234;
+       default:        goto yy236;
        }
-yy184:
+yy186:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy237;
+       case 'a':       goto yy239;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy236;
+               goto yy238;
        }
-yy185:
-       yyaccept = 16;
+yy187:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3104,26 +3141,26 @@ yy185:
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy238;
+       default:        goto yy240;
        }
-yy186:
+yy188:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy239;
+       case 'a':       goto yy241;
        case 'b':
                yyt6 = yyt9;
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy240;
+       case 'c':       goto yy242;
        default:
                yyt6 = yyt9;
                yyt4 = yyt5 = YYCURSOR;
                goto yy111;
        }
-yy187:
+yy189:
        yyaccept = 1;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -3133,28 +3170,28 @@ yy187:
                yyt2 = yyt6;
                yyt3 = yyt12;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy241;
+       default:        goto yy243;
        }
-yy188:
+yy190:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy243;
+       case 'a':       goto yy245;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy242;
+               goto yy244;
        }
-yy189:
-       yyaccept = 41;
+yy191:
+       yyaccept = 46;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3163,32 +3200,32 @@ yy189:
                yyt2 = yyt6;
                yyt3 = yyt12;
                yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               goto yy213;
        case 'b':
                yyt4 = yyt14;
                yyt5 = yyt15;
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy244;
+       default:        goto yy246;
        }
-yy190:
+yy192:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy245;
+       case 'a':       goto yy247;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy246;
+       case 'c':       goto yy248;
        default:
                yyt6 = yyt10;
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy191:
-       yyaccept = 42;
+yy193:
+       yyaccept = 47;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3197,20 +3234,20 @@ yy191:
                yyt2 = yyt6;
                yyt3 = yyt12;
                yyt7 = yyt15 = YYCURSOR;
-               goto yy235;
+               goto yy237;
        case 'b':
                yyt4 = yyt8;
                yyt5 = yyt16;
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy247;
+       default:        goto yy249;
        }
-yy192:
+yy194:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy248;
+       case 'a':       goto yy250;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
@@ -3220,8 +3257,8 @@ yy192:
                yyt4 = yyt5 = YYCURSOR;
                goto yy6;
        }
-yy193:
-       yyaccept = 43;
+yy195:
+       yyaccept = 48;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3242,26 +3279,26 @@ yy193:
                yyt5 = yyt11;
                goto yy11;
        }
-yy194:
+yy196:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt18 = YYCURSOR;
-               goto yy249;
+               goto yy251;
        case 'b':
                yyt6 = yyt8;
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy250;
+       case 'c':       goto yy252;
        default:
                yyt6 = yyt8;
                yyt18 = YYCURSOR;
                goto yy160;
        }
-yy195:
+yy197:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3269,7 +3306,7 @@ yy195:
        case 'a':
                yyt14 = yyt10;
                yyt10 = yyt9;
-               goto yy213;
+               goto yy215;
        case 'b':
                yyt6 = yyt10;
                yyt7 = yyt9;
@@ -3278,14 +3315,14 @@ yy195:
        case 'c':
                yyt4 = yyt7;
                yyt5 = yyt8;
-               goto yy214;
+               goto yy216;
        default:
                yyt14 = yyt10;
                yyt10 = yyt9;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy196:
+yy198:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3293,7 +3330,7 @@ yy196:
        case 'a':
                yyt13 = yyt8;
                yyt10 = YYCURSOR;
-               goto yy219;
+               goto yy221;
        case 'b':
                yyt6 = yyt8;
                yyt4 = yyt5 = YYCURSOR;
@@ -3301,14 +3338,14 @@ yy196:
        case 'c':
                yyt15 = yyt14;
                yyt14 = yyt12;
-               goto yy220;
+               goto yy222;
        default:
                yyt6 = yyt8;
                yyt8 = yyt10 = YYCURSOR;
                goto yy26;
        }
-yy197:
-       yyaccept = 14;
+yy199:
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3316,32 +3353,32 @@ yy197:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt19 = YYCURSOR;
-               goto yy207;
+               goto yy209;
        case 'b':
                yyt7 = yyt11;
                goto yy8;
        default:
                yyt12 = yyt11;
-               goto yy241;
+               goto yy243;
        }
-yy198:
+yy200:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt12 = yyt11;
-               goto yy243;
+               goto yy245;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy242;
+               goto yy244;
        }
-yy199:
-       yyaccept = 19;
+yy201:
+       yyaccept = 21;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3349,7 +3386,7 @@ yy199:
        case 'a':
                yyt2 = yyt6;
                yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               goto yy213;
        case 'b':
                yyt4 = yyt14;
                yyt5 = yyt15;
@@ -3357,30 +3394,30 @@ yy199:
                goto yy8;
        default:
                yyt12 = yyt11;
-               goto yy244;
+               goto yy246;
        }
-yy200:
+yy202:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt12 = yyt11;
-               goto yy245;
+               goto yy247;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        case 'c':
                yyt12 = yyt11;
-               goto yy246;
+               goto yy248;
        default:
                yyt6 = yyt10;
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy201:
-       yyaccept = 44;
+yy203:
+       yyaccept = 49;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3388,7 +3425,7 @@ yy201:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt15 = YYCURSOR;
-               goto yy235;
+               goto yy237;
        case 'b':
                yyt4 = yyt8;
                yyt5 = yyt16;
@@ -3396,16 +3433,16 @@ yy201:
                goto yy8;
        default:
                yyt12 = yyt11;
-               goto yy247;
+               goto yy249;
        }
-yy202:
+yy204:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt12 = yyt11;
-               goto yy248;
+               goto yy250;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
@@ -3415,36 +3452,36 @@ yy202:
                yyt4 = yyt5 = YYCURSOR;
                goto yy6;
        }
-yy203:
+yy205:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt20 = YYCURSOR;
-               goto yy251;
+               goto yy253;
        case 'c':
                yyt12 = yyt11;
-               goto yy250;
+               goto yy252;
        default:
                yyt6 = yyt8;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        }
-yy204:
+yy206:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy252;
+       case 'a':       goto yy254;
        case 'c':
                yyt9 = yyt18;
                yyt12 = yyt13;
                yyt14 = yyt18;
-               goto yy250;
-       default:        goto yy205;
+               goto yy252;
+       default:        goto yy207;
        }
-yy205:
+yy207:
        YYCURSOR = YYMARKER;
        switch (yyaccept) {
        case 0: 
@@ -3470,8 +3507,8 @@ yy205:
                yyt6 = YYCURSOR;
                goto yy2;
        case 5: 
-               yyt4 = yyt14;
-               yyt5 = yyt14;
+               yyt4 = yyt15;
+               yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
        case 6: 
@@ -3480,258 +3517,299 @@ yy205:
                yyt6 = YYCURSOR;
                goto yy2;
        case 7: 
-               yyt4 = yyt3;
                yyt5 = yyt3;
                yyt3 = yyt8;
                yyt6 = YYCURSOR;
                goto yy2;
        case 8: 
-               yyt4 = yyt3;
                yyt5 = yyt3;
                yyt3 = yyt9;
                yyt6 = YYCURSOR;
                goto yy2;
        case 9: 
-               yyt4 = yyt7;
-               yyt5 = yyt7;
+               yyt5 = yyt4;
                yyt6 = YYCURSOR;
                goto yy2;
        case 10: 
+               yyt5 = yyt7;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 11: 
                yyt3 = yyt7;
                yyt4 = yyt2;
                yyt5 = yyt2;
                yyt2 = yyt10;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 11: 
+       case 12: 
                yyt3 = yyt8;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 12: 
+       case 13: 
                yyt3 = yyt9;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 13: 
+       case 14: 
                yyt4 = yyt3;
                yyt5 = yyt3;
                yyt3 = yyt11;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 14: 
+       case 15: 
                yyt3 = yyt11;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 15: 
+       case 16: 
                yyt4 = yyt3;
                yyt5 = yyt3;
                yyt3 = yyt12;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 16: 
+       case 17: 
                yyt3 = yyt12;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 17: 
+       case 18: 
                yyt4 = yyt3;
                yyt5 = yyt3;
                yyt3 = yyt7;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 18: 
+       case 19: 
                yyt3 = yyt7;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 19: 
+       case 20: 
+               yyt4 = yyt7;
+               yyt5 = yyt7;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 21: 
                yyt3 = yyt11;
                yyt4 = yyt14;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 20: 
+       case 22: 
                yyt4 = yyt3;
                yyt5 = yyt8;
                yyt3 = yyt11;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 21: 
+       case 23: 
                yyt3 = yyt12;
                yyt4 = yyt14;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 22: 
+       case 24: 
                yyt4 = yyt3;
                yyt5 = yyt8;
                yyt3 = yyt12;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 23: 
+       case 25: 
                yyt3 = yyt12;
                yyt4 = yyt16;
                yyt5 = yyt17;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 24: 
+       case 26: 
                yyt4 = yyt3;
                yyt5 = yyt7;
                yyt3 = yyt12;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 25: 
+       case 27: 
                yyt3 = yyt12;
-               yyt4 = yyt15;
+               yyt4 = yyt14;
                yyt5 = yyt16;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 26: 
+       case 28: 
                yyt3 = yyt12;
                yyt4 = yyt8;
                yyt5 = yyt11;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 27: 
+       case 29: 
                yyt4 = yyt8;
                yyt5 = yyt9;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 28: 
+       case 30: 
                yyt3 = yyt11;
                yyt4 = yyt7;
                yyt5 = yyt8;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 29: 
+       case 31: 
                yyt3 = yyt11;
                yyt4 = yyt12;
                yyt5 = yyt14;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 30: 
+       case 32: 
                yyt3 = yyt11;
                yyt4 = yyt8;
                yyt5 = yyt9;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 31: 
+       case 33: 
                yyt3 = yyt11;
                yyt4 = yyt9;
                yyt5 = yyt14;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 32: 
+       case 34: 
                yyt3 = yyt7;
                yyt4 = yyt14;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 33: 
+       case 35: 
                yyt4 = yyt3;
                yyt5 = yyt8;
                yyt3 = yyt7;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 34: 
+       case 36: 
                yyt4 = yyt7;
                yyt5 = yyt8;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 35: 
+       case 37: 
                yyt4 = yyt12;
                yyt5 = yyt14;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 36: 
+       case 38: 
+               yyt3 = yyt11;
+               yyt5 = yyt14;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 39: 
                yyt3 = yyt11;
-               yyt4 = yyt16;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 37: 
+       case 40: 
                yyt3 = yyt11;
                yyt4 = yyt16;
                yyt5 = yyt16;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 38: 
+       case 41: 
+               yyt3 = yyt11;
+               yyt4 = yyt16;
+               yyt5 = yyt15;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 42: 
                yyt3 = yyt11;
                yyt4 = yyt16;
                yyt5 = yyt17;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 39: 
+       case 43: 
+               yyt3 = yyt12;
+               yyt4 = yyt14;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 44: 
                yyt3 = yyt12;
                yyt4 = yyt9;
                yyt5 = yyt14;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 40: 
+       case 45: 
                yyt3 = yyt12;
                yyt4 = yyt16;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 41: 
+       case 46: 
                yyt4 = yyt14;
                yyt5 = yyt15;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 42: 
+       case 47: 
                yyt4 = yyt8;
                yyt5 = yyt16;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 43: 
+       case 48: 
                yyt4 = yyt11;
                yyt5 = yyt11;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 44: 
+       case 49: 
                yyt3 = yyt11;
                yyt4 = yyt8;
                yyt5 = yyt16;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 45: 
+       case 50: 
                yyt2 = yyt19;
                yyt3 = yyt10;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 46: 
+       case 51: 
                yyt3 = yyt10;
                yyt4 = yyt2;
                yyt5 = yyt2;
                yyt2 = yyt14;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 47: 
+       case 52: 
                yyt2 = yyt17;
                yyt3 = yyt10;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 48: 
+       case 53: 
                yyt2 = yyt19;
                yyt3 = yyt7;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 49: 
+       case 54: 
                yyt2 = yyt15;
                yyt3 = yyt7;
                yyt6 = YYCURSOR;
                goto yy2;
-       case 50: 
+       case 55: 
                yyt3 = yyt10;
                yyt4 = yyt2;
                yyt5 = yyt2;
                yyt2 = yyt19;
                yyt6 = YYCURSOR;
                goto yy2;
-       default:
+       case 56: 
+               yyt2 = yyt17;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 57: 
+               yyt2 = yyt19;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       case 58: 
                yyt2 = yyt10;
                yyt6 = YYCURSOR;
                goto yy2;
+       case 59: 
+               yyt2 = yyt17;
+               yyt3 = yyt7;
+               yyt6 = YYCURSOR;
+               goto yy2;
+       default:
+               yyt3 = yyt7;
+               yyt4 = yyt2;
+               yyt5 = yyt2;
+               yyt2 = yyt17;
+               yyt6 = YYCURSOR;
+               goto yy2;
        }
-yy206:
-       yyaccept = 31;
+yy208:
+       yyaccept = 33;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3745,14 +3823,14 @@ yy206:
                yyt5 = yyt14;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy253;
+       default:        goto yy255;
        }
-yy207:
+yy209:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy254;
+       case 'a':       goto yy256;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -3760,17 +3838,17 @@ yy207:
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy208;
+               goto yy210;
        }
-yy208:
-       yyaccept = 45;
+yy210:
+       yyaccept = 50;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt8 = YYCURSOR;
-               goto yy256;
+               goto yy258;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -3778,14 +3856,14 @@ yy208:
                goto yy8;
        default:
                yyt2 = YYCURSOR;
-               goto yy255;
+               goto yy257;
        }
-yy209:
+yy211:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy257;
+       case 'a':       goto yy259;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -3794,14 +3872,14 @@ yy209:
        case 'c':
                yyt4 = yyt9;
                yyt5 = yyt14;
-               goto yy214;
+               goto yy216;
        default:
                yyt2 = YYCURSOR;
                yyt14 = yyt19;
-               goto yy212;
+               goto yy214;
        }
-yy210:
-       yyaccept = 36;
+yy212:
+       yyaccept = 41;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3815,14 +3893,14 @@ yy210:
                yyt5 = yyt15;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy258;
+       default:        goto yy260;
        }
-yy211:
+yy213:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy259;
+       case 'a':       goto yy261;
        case 'b':
                yyt6 = yyt17;
                yyt7 = yyt10;
@@ -3830,10 +3908,10 @@ yy211:
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy216;
+               goto yy218;
        }
-yy212:
-       yyaccept = 46;
+yy214:
+       yyaccept = 51;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3853,7 +3931,7 @@ yy212:
                yyt8 = yyt9 = YYCURSOR;
                goto yy23;
        }
-yy213:
+yy215:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3869,34 +3947,34 @@ yy213:
                goto yy8;
        case 'c':
                yyt14 = yyt16;
-               goto yy220;
+               goto yy222;
        default:
                yyt6 = yyt14;
                yyt7 = yyt10;
                yyt8 = yyt10 = YYCURSOR;
                goto yy26;
        }
-yy214:
-       yyaccept = 14;
+yy216:
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt2 = yyt6;
-               yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               yyt7 = yyt17 = YYCURSOR;
+               goto yy263;
        case 'b':
                yyt4 = yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy8;
        default:
                yyt3 = yyt4 = NULL;
-               yyt2 = yyt5 = yyt7 = YYCURSOR;
-               goto yy260;
+               yyt5 = yyt7 = yyt17 = YYCURSOR;
+               goto yy262;
        }
-yy215:
-       yyaccept = 14;
+yy217:
+       yyaccept = 15;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3911,10 +3989,10 @@ yy215:
        default:
                yyt9 = yyt4;
                yyt14 = yyt5;
-               goto yy253;
+               goto yy255;
        }
-yy216:
-       yyaccept = 47;
+yy218:
+       yyaccept = 52;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3922,7 +4000,7 @@ yy216:
        case 'a':
                yyt19 = yyt17;
                yyt8 = YYCURSOR;
-               goto yy256;
+               goto yy258;
        case 'b':
                yyt6 = yyt17;
                yyt7 = yyt10;
@@ -3931,29 +4009,29 @@ yy216:
        default:
                yyt19 = yyt17;
                yyt2 = YYCURSOR;
-               goto yy255;
+               goto yy257;
        }
-yy217:
+yy219:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt19 = yyt17;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt17;
                yyt7 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
-       case 'c':       goto yy214;
+       case 'c':       goto yy216;
        default:
                yyt14 = yyt17;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy218:
-       yyaccept = 37;
+yy220:
+       yyaccept = 40;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3969,9 +4047,9 @@ yy218:
                goto yy8;
        default:
                yyt15 = yyt16;
-               goto yy258;
+               goto yy260;
        }
-yy219:
+yy221:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -3987,14 +4065,14 @@ yy219:
        case 'c':
                yyt14 = yyt16;
                yyt15 = yyt16;
-               goto yy220;
+               goto yy222;
        default:
                yyt6 = yyt13;
-               yyt7 = YYCURSOR;
+               yyt4 = yyt7 = YYCURSOR;
                goto yy40;
        }
-yy220:
-       yyaccept = 19;
+yy222:
+       yyaccept = 21;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4002,18 +4080,18 @@ yy220:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt19 = YYCURSOR;
-               goto yy222;
+               goto yy224;
        case 'b':
                yyt4 = yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy8;
        default:
                yyt3 = yyt4 = NULL;
-               yyt5 = yyt7 = yyt10 = YYCURSOR;
-               goto yy261;
+               yyt5 = yyt7 = yyt19 = YYCURSOR;
+               goto yy264;
        }
-yy221:
-       yyaccept = 38;
+yy223:
+       yyaccept = 42;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4027,23 +4105,23 @@ yy221:
                yyt5 = yyt17;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy262;
+       default:        goto yy265;
        }
-yy222:
+yy224:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy263;
+       case 'a':       goto yy266;
        case 'b':
                yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy225;
+               goto yy227;
        }
-yy223:
+yy225:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4058,14 +4136,14 @@ yy223:
                goto yy8;
        case 'c':
                yyt12 = yyt11;
-               goto yy229;
+               goto yy231;
        default:
                yyt6 = yyt12;
                yyt4 = yyt5 = YYCURSOR;
                goto yy60;
        }
-yy224:
-       yyaccept = 16;
+yy226:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4081,10 +4159,10 @@ yy224:
                yyt9 = yyt4;
                yyt11 = yyt12;
                yyt14 = yyt5;
-               goto yy253;
+               goto yy255;
        }
-yy225:
-       yyaccept = 48;
+yy227:
+       yyaccept = 53;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4092,7 +4170,7 @@ yy225:
        case 'a':
                yyt10 = yyt7;
                yyt8 = YYCURSOR;
-               goto yy256;
+               goto yy258;
        case 'b':
                yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
@@ -4100,31 +4178,31 @@ yy225:
        default:
                yyt10 = yyt7;
                yyt2 = YYCURSOR;
-               goto yy255;
+               goto yy257;
        }
-yy226:
+yy228:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt10 = yyt7;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        case 'c':
                yyt11 = yyt12;
-               goto yy214;
+               goto yy216;
        default:
                yyt10 = yyt7;
                yyt14 = yyt19;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy227:
-       yyaccept = 16;
+yy229:
+       yyaccept = 43;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4134,15 +4212,16 @@ yy227:
                yyt7 = yyt10 = YYCURSOR;
                goto yy18;
        case 'b':
+               yyt4 = yyt14;
                yyt7 = yyt12;
                goto yy8;
        default:
                yyt11 = yyt12;
-               yyt16 = yyt4;
+               yyt16 = yyt14;
                yyt17 = yyt5;
-               goto yy262;
+               goto yy265;
        }
-yy228:
+yy230:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4157,16 +4236,15 @@ yy228:
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        case 'c':
-               yyt15 = yyt4;
                yyt16 = yyt5;
-               goto yy233;
+               goto yy235;
        default:
                yyt6 = yyt11;
                yyt4 = yyt5 = yyt13 = YYCURSOR;
                goto yy80;
        }
-yy229:
-       yyaccept = 23;
+yy231:
+       yyaccept = 25;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4174,18 +4252,18 @@ yy229:
        case 'a':
                yyt2 = yyt6;
                yyt7 = yyt10 = YYCURSOR;
-               goto yy231;
+               goto yy233;
        case 'b':
                yyt4 = yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy8;
        default:
                yyt3 = yyt4 = NULL;
-               yyt2 = yyt5 = yyt7 = YYCURSOR;
-               goto yy264;
+               yyt5 = yyt7 = yyt10 = YYCURSOR;
+               goto yy267;
        }
-yy230:
-       yyaccept = 16;
+yy232:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4197,23 +4275,23 @@ yy230:
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy238;
+       default:        goto yy240;
        }
-yy231:
+yy233:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy265;
+       case 'a':       goto yy268;
        case 'b':
                yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy236;
+               goto yy238;
        }
-yy232:
+yy234:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4229,33 +4307,33 @@ yy232:
        case 'c':
                yyt8 = yyt4;
                yyt11 = yyt5;
-               goto yy240;
+               goto yy242;
        default:
                yyt6 = yyt11;
                yyt4 = yyt5 = YYCURSOR;
                goto yy111;
        }
-yy233:
-       yyaccept = 25;
+yy235:
+       yyaccept = 27;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt2 = yyt6;
-               yyt6 = yyt7 = YYCURSOR;
-               goto yy4;
+               yyt7 = yyt10 = YYCURSOR;
+               goto yy270;
        case 'b':
                yyt4 = yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy8;
        default:
                yyt3 = yyt4 = NULL;
-               yyt2 = yyt5 = yyt7 = YYCURSOR;
-               goto yy266;
+               yyt5 = yyt7 = yyt10 = YYCURSOR;
+               goto yy269;
        }
-yy234:
-       yyaccept = 16;
+yy236:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4267,23 +4345,23 @@ yy234:
        case 'b':
                yyt7 = yyt12;
                goto yy8;
-       default:        goto yy267;
+       default:        goto yy271;
        }
-yy235:
+yy237:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy268;
+       case 'a':       goto yy272;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy242;
+               goto yy244;
        }
-yy236:
+yy238:
        yyaccept = 6;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -4302,7 +4380,7 @@ yy236:
                yyt10 = YYCURSOR;
                goto yy13;
        }
-yy237:
+yy239:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4317,14 +4395,14 @@ yy237:
        case 'c':
                yyt8 = yyt4;
                yyt9 = yyt5;
-               goto yy246;
+               goto yy248;
        default:
                yyt6 = yyt10;
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy238:
-       yyaccept = 16;
+yy240:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4340,7 +4418,7 @@ yy238:
                yyt3 = yyt12;
                goto yy11;
        }
-yy239:
+yy241:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4357,14 +4435,14 @@ yy239:
        case 'c':
                yyt9 = yyt4;
                yyt14 = yyt5;
-               goto yy250;
+               goto yy252;
        default:
                yyt6 = yyt9;
                yyt18 = YYCURSOR;
                goto yy160;
        }
-yy240:
-       yyaccept = 26;
+yy242:
+       yyaccept = 28;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4382,7 +4460,7 @@ yy240:
                yyt5 = yyt6 = yyt7 = YYCURSOR;
                goto yy3;
        }
-yy241:
+yy243:
        yyaccept = 1;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -4400,10 +4478,10 @@ yy241:
                yyt9 = yyt4;
                yyt11 = yyt12;
                yyt14 = yyt5;
-               goto yy253;
+               goto yy255;
        }
-yy242:
-       yyaccept = 49;
+yy244:
+       yyaccept = 54;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4412,7 +4490,7 @@ yy242:
                yyt10 = yyt7;
                yyt19 = yyt15;
                yyt8 = YYCURSOR;
-               goto yy256;
+               goto yy258;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
@@ -4421,9 +4499,9 @@ yy242:
                yyt10 = yyt7;
                yyt19 = yyt15;
                yyt2 = YYCURSOR;
-               goto yy255;
+               goto yy257;
        }
-yy243:
+yy245:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4431,22 +4509,22 @@ yy243:
        case 'a':
                yyt10 = yyt7;
                yyt19 = yyt15;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        case 'c':
                yyt11 = yyt12;
-               goto yy214;
+               goto yy216;
        default:
                yyt10 = yyt7;
                yyt14 = yyt15;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy244:
-       yyaccept = 41;
+yy246:
+       yyaccept = 46;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4464,9 +4542,9 @@ yy244:
        default:
                yyt11 = yyt12;
                yyt16 = yyt14;
-               goto yy258;
+               goto yy260;
        }
-yy245:
+yy247:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4481,14 +4559,14 @@ yy245:
                goto yy8;
        case 'c':
                yyt11 = yyt12;
-               goto yy220;
+               goto yy222;
        default:
                yyt6 = yyt10;
                yyt8 = yyt10 = YYCURSOR;
                goto yy26;
        }
-yy246:
-       yyaccept = 27;
+yy248:
+       yyaccept = 29;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4496,19 +4574,19 @@ yy246:
        case 'a':
                yyt2 = yyt6;
                yyt3 = yyt12;
-               yyt10 = yyt17 = YYCURSOR;
-               goto yy211;
+               yyt7 = yyt17 = YYCURSOR;
+               goto yy263;
        case 'b':
                yyt4 = yyt7 = NULL;
                yyt5 = yyt6 = YYCURSOR;
                goto yy8;
        default:
                yyt3 = yyt4 = NULL;
-               yyt2 = yyt5 = yyt7 = YYCURSOR;
-               goto yy260;
+               yyt5 = yyt7 = yyt17 = YYCURSOR;
+               goto yy262;
        }
-yy247:
-       yyaccept = 42;
+yy249:
+       yyaccept = 47;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4526,9 +4604,9 @@ yy247:
        default:
                yyt4 = yyt8;
                yyt5 = yyt16;
-               goto yy267;
+               goto yy271;
        }
-yy248:
+yy250:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4542,13 +4620,13 @@ yy248:
                goto yy8;
        case 'c':
                yyt9 = yyt16;
-               goto yy246;
+               goto yy248;
        default:
                yyt6 = yyt10;
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy249:
+yy251:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4556,18 +4634,18 @@ yy249:
        case 'a':
                yyt6 = yyt8;
                yyt20 = YYCURSOR;
-               goto yy204;
+               goto yy206;
        case 'c':
                yyt9 = yyt11;
                yyt14 = yyt11;
-               goto yy250;
+               goto yy252;
        default:
                yyt6 = yyt8;
                yyt7 = yyt13;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        }
-yy250:
+yy252:
        yyaccept = 1;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -4589,7 +4667,7 @@ yy250:
                yyt5 = yyt6 = yyt7 = YYCURSOR;
                goto yy3;
        }
-yy251:
+yy253:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4597,15 +4675,15 @@ yy251:
        case 'a':
                yyt6 = yyt8;
                yyt13 = yyt7;
-               goto yy252;
+               goto yy254;
        case 'c':
                yyt9 = yyt12;
                yyt14 = yyt12;
                yyt12 = yyt11;
-               goto yy250;
-       default:        goto yy205;
+               goto yy252;
+       default:        goto yy207;
        }
-yy252:
+yy254:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4614,11 +4692,11 @@ yy252:
                yyt9 = yyt20;
                yyt12 = yyt13;
                yyt14 = yyt20;
-               goto yy250;
-       default:        goto yy205;
+               goto yy252;
+       default:        goto yy207;
        }
-yy253:
-       yyaccept = 31;
+yy255:
+       yyaccept = 33;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4632,14 +4710,14 @@ yy253:
                yyt5 = yyt14;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy269;
+       default:        goto yy273;
        }
-yy254:
+yy256:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy257;
+       case 'a':       goto yy259;
        case 'b':
                yyt6 = yyt19;
                yyt7 = yyt10;
@@ -4648,10 +4726,10 @@ yy254:
        default:
                yyt14 = yyt19;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy255:
-       yyaccept = 50;
+yy257:
+       yyaccept = 55;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4671,7 +4749,7 @@ yy255:
                yyt8 = YYCURSOR;
                goto yy19;
        }
-yy256:
+yy258:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4691,7 +4769,7 @@ yy256:
                yyt9 = YYCURSOR;
                goto yy21;
        }
-yy257:
+yy259:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4711,8 +4789,8 @@ yy257:
                yyt8 = yyt10 = YYCURSOR;
                goto yy26;
        }
-yy258:
-       yyaccept = 36;
+yy260:
+       yyaccept = 41;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4726,16 +4804,19 @@ yy258:
                yyt5 = yyt15;
                yyt7 = yyt11;
                goto yy8;
-       default:        goto yy270;
+       default:
+               yyt9 = yyt16;
+               yyt14 = yyt15;
+               goto yy273;
        }
-yy259:
+yy261:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt19 = yyt17;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt17;
                yyt7 = yyt10;
@@ -4744,44 +4825,61 @@ yy259:
        default:
                yyt2 = YYCURSOR;
                yyt14 = yyt17;
-               goto yy212;
+               goto yy214;
        }
-yy260:
-       yyaccept = 1;
+yy262:
+       yyaccept = 56;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt6 = YYCURSOR;
-               goto yy272;
+               goto yy275;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy271;
+               goto yy274;
        }
-yy261:
-       yyaccept = 51;
+yy263:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt10 = yyt7;
+               goto yy261;
+       case 'b':
+               yyt6 = yyt17;
+               yyt4 = yyt5 = YYCURSOR;
+               goto yy8;
+       default:
+               yyt10 = yyt7;
+               yyt4 = yyt5 = YYCURSOR;
+               goto yy218;
+       }
+yy264:
+       yyaccept = 57;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt6 = YYCURSOR;
-               goto yy274;
+               goto yy277;
        case 'b':
-               yyt6 = yyt10;
+               yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy273;
+               goto yy276;
        }
-yy262:
-       yyaccept = 38;
+yy265:
+       yyaccept = 42;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4796,17 +4894,18 @@ yy262:
                yyt7 = yyt11;
                goto yy8;
        default:
-               yyt15 = yyt17;
-               goto yy270;
+               yyt9 = yyt16;
+               yyt14 = yyt17;
+               goto yy273;
        }
-yy263:
+yy266:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt10 = yyt7;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
@@ -4815,26 +4914,26 @@ yy263:
                yyt10 = yyt7;
                yyt14 = yyt19;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy264:
-       yyaccept = 1;
+yy267:
+       yyaccept = 58;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt8 = YYCURSOR;
-               goto yy276;
+               goto yy278;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = YYCURSOR;
-               goto yy275;
+               goto yy238;
        }
-yy265:
+yy268:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4851,27 +4950,44 @@ yy265:
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy266:
-       yyaccept = 1;
+yy269:
+       yyaccept = 58;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt8 = YYCURSOR;
                goto yy7;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy6;
        }
-yy267:
-       yyaccept = 16;
+yy270:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt6 = yyt10;
+               goto yy10;
+       case 'b':
+               yyt6 = yyt10;
+               yyt4 = yyt5 = YYCURSOR;
+               goto yy8;
+       default:
+               yyt6 = yyt10;
+               yyt4 = yyt5 = YYCURSOR;
+               goto yy6;
+       }
+yy271:
+       yyaccept = 17;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4887,9 +5003,9 @@ yy267:
                yyt9 = yyt4;
                yyt11 = yyt12;
                yyt14 = yyt5;
-               goto yy269;
+               goto yy273;
        }
-yy268:
+yy272:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4897,7 +5013,7 @@ yy268:
        case 'a':
                yyt10 = yyt7;
                yyt19 = yyt15;
-               goto yy257;
+               goto yy259;
        case 'b':
                yyt6 = yyt15;
                yyt4 = yyt5 = YYCURSOR;
@@ -4906,10 +5022,10 @@ yy268:
                yyt10 = yyt7;
                yyt14 = yyt15;
                yyt2 = YYCURSOR;
-               goto yy212;
+               goto yy214;
        }
-yy269:
-       yyaccept = 31;
+yy273:
+       yyaccept = 33;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
@@ -4929,203 +5045,163 @@ yy269:
                yyt5 = yyt14;
                goto yy11;
        }
-yy270:
-       yyaccept = 36;
-       YYMARKER = ++YYCURSOR;
-       if (YYLIMIT <= YYCURSOR) YYFILL(1);
-       yych = *YYCURSOR;
-       switch (yych) {
-       case 'a':
-               yyt2 = yyt6;
-               yyt7 = yyt10 = YYCURSOR;
-               goto yy18;
-       case 'b':
-               yyt4 = yyt16;
-               yyt5 = yyt15;
-               yyt7 = yyt11;
-               goto yy8;
-       default:
-               yyt3 = yyt11;
-               yyt4 = yyt16;
-               yyt5 = yyt15;
-               goto yy11;
-       }
-yy271:
-       yyaccept = 18;
+yy274:
+       yyaccept = 59;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt8 = YYCURSOR;
-               goto yy278;
+               goto yy280;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
-               goto yy277;
+               yyt2 = YYCURSOR;
+               goto yy279;
        }
-yy272:
+yy275:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
-       case 'a':       goto yy280;
+       case 'a':       goto yy282;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = YYCURSOR;
-               goto yy279;
+               yyt2 = YYCURSOR;
+               goto yy281;
        }
-yy273:
-       yyaccept = 6;
+yy276:
+       yyaccept = 53;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = yyt10;
+               yyt17 = yyt19;
                yyt8 = YYCURSOR;
-               goto yy278;
-       case 'b':
-               yyt6 = yyt10;
-               yyt4 = yyt5 = YYCURSOR;
-               goto yy8;
-       default:
-               yyt2 = yyt10;
-               yyt3 = YYCURSOR;
-               goto yy277;
-       }
-yy274:
-       ++YYCURSOR;
-       if (YYLIMIT <= YYCURSOR) YYFILL(1);
-       yych = *YYCURSOR;
-       switch (yych) {
-       case 'a':
-               yyt2 = yyt10;
                goto yy280;
        case 'b':
-               yyt6 = yyt10;
+               yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt2 = yyt10;
-               yyt3 = YYCURSOR;
+               yyt17 = yyt19;
+               yyt2 = YYCURSOR;
                goto yy279;
        }
-yy275:
-       yyaccept = 18;
-       YYMARKER = ++YYCURSOR;
+yy277:
+       ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
-               yyt8 = YYCURSOR;
-               goto yy14;
+               yyt17 = yyt19;
+               goto yy282;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt19;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
-               yyt10 = YYCURSOR;
-               goto yy13;
+               yyt17 = yyt19;
+               yyt2 = YYCURSOR;
+               goto yy281;
        }
-yy276:
+yy278:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                goto yy16;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
+               yyt6 = yyt10;
                yyt10 = YYCURSOR;
                goto yy15;
        }
-yy277:
-       yyaccept = 17;
+yy279:
+       yyaccept = 60;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt8 = yyt9 = YYCURSOR;
                goto yy20;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt8 = YYCURSOR;
                goto yy19;
        }
-yy278:
+yy280:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt9 = YYCURSOR;
                goto yy22;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt9 = YYCURSOR;
                goto yy21;
        }
-yy279:
-       yyaccept = 17;
+yy281:
+       yyaccept = 60;
        YYMARKER = ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt8 = yyt9 = YYCURSOR;
                goto yy20;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt8 = yyt9 = YYCURSOR;
                goto yy23;
        }
-yy280:
+yy282:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
                yyt8 = yyt6;
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt9 = YYCURSOR;
                goto yy25;
        case 'b':
-               yyt6 = yyt2;
+               yyt6 = yyt17;
                yyt4 = yyt5 = YYCURSOR;
                goto yy8;
        default:
-               yyt6 = yyt2;
-               yyt9 = yyt14 = YYCURSOR;
+               yyt6 = yyt17;
+               yyt9 = yyt15 = YYCURSOR;
                goto yy24;
        }
 }