Use two tags instead of three for captures under iteration.

Before we simplified POSIX disambiguation by inserting missing
captures, using three tags to represent captures under iteration
was the only way: we needed to guard where the first iteration starts,
where the last iteration starts and where the last iteration ends.
Therefore we used three tags: opening, closing and orbit.

Now that we insert missing pieces of capture hierarchy, we no longer
need a special opening tag for captures under iteration: there always
is a higher-priority tag that guards the start of the first iteration.

Massive test updates are mostly due to the fact that orbit tag is no
longer fixed (fixed tags go in the end): ~100 out of 147 tests.
Some other ~45 tests have two tag variables flipped. There are 4 tests
with non-trivial changes. All updated tests pass POSIX test
(/test/posix_captures/.run/__run.sh).

diff --git a/re2c/src/code/emit_action.cc b/re2c/src/code/emit_action.cc
index 2c9bee13e1cbc1380403bdde890d8271d6c10e98..13fb2ea7e2dc58e811bd58b03bfeabc6498912fc 100644 (file)
--- a/re2c/src/code/emit_action.cc
+++ b/re2c/src/code/emit_action.cc
@@ -389,7 +389,7 @@ void gen_fintags(OutputFile &o, uint32_t ind, const DFA &dfa, const Rule &rule)
                const Tag &tag = tags[t];
 
                // see note [fixed and variable tags]
-               if (fictive(tag) || orbit(tag) || fixed(tag)) continue;
+               if (fictive(tag) || fixed(tag)) continue;
 
                expr = vartag_expr(fins[t], prefix, expression);
 
@@ -417,7 +417,7 @@ void gen_fintags(OutputFile &o, uint32_t ind, const DFA &dfa, const Rule &rule)
                const Tag &tag = tags[t];
 
                // see note [fixed and variable tags]
-               if (fictive(tag) || orbit(tag) || !fixed(tag)) continue;
+               if (fictive(tag) || !fixed(tag)) continue;
 
                const size_t dist = tag.dist;
                const bool fixed_on_cursor = tag.base == Tag::RIGHTMOST;
@@ -452,7 +452,7 @@ std::string tagname(const Tag &tag)
 {
        assert(!trailing(tag));
        return capture(tag)
-               ? "yypmatch[" + to_string(2 * (tag.ncap / 3) + (tag.ncap % 3)) + "]"
+               ? "yypmatch[" + to_string(tag.ncap) + "]"
                : *tag.name;
 }
 

diff --git a/re2c/src/re/ast_to_re.cc b/re2c/src/re/ast_to_re.cc
index fc1424d49540a65c499655ebcbee8b9366528f09..3546e08832ee4da81db5c22df02ab538b4bc478f 100644 (file)
--- a/re2c/src/re/ast_to_re.cc
+++ b/re2c/src/re/ast_to_re.cc
@@ -24,11 +24,11 @@ namespace re2c {
  *
  * POSIX treats subexpressions with and without captures as equal,
  * therefore we have to insert missing captures in subexpressions
- * that influence disambiguation of existing captures. Such cases
- * are: left alternative in union, if right alternative has captures;
- * first operand in concatenation, if second operand has captures
- * (unless all strings accepted by the first operand have the same
- * length).
+ * that influence disambiguation of existing captures. Such cases are:
+ * left alternative in union (unless it is already a capture) and first
+ * operand in concatenation (unless it is a capture or the length of
+ * strings accepted by it is fixed). Of course, this insertion only
+ * applies to subexpressions that have nested captures.
  */
 
 static bool has_tags(const AST *ast)
@@ -85,17 +85,6 @@ static size_t fixlen(const AST *ast)
        }
 }
 
-static bool is_capture(const AST *ast)
-{
-       return ast->type == AST::CAP
-               || (ast->type == AST::ITER && ast->iter.ast->type == AST::CAP);
-}
-
-static bool is_capture_or_fixlen(const AST *ast)
-{
-       return is_capture(ast) || fixlen(ast) != Tag::VARDIST;
-}
-
 static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
 {
        RE::alc_t &alc = spec.alc;
@@ -150,13 +139,13 @@ static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
                        return re_sym(alc, Range::ran(0, opts->encoding.nCodeUnits()));
                case AST::ALT: {
                        RE *t1 = NULL, *t2 = NULL, *x, *y;
-                       // see note [POSIX subexpression hierarchy]
-                       if (opts->posix_captures && has_tags(ast->alt.ast2)
-                               && !is_capture(ast->alt.ast1)) {
+                       if (opts->posix_captures && has_tags(ast)
+                               && ast->alt.ast1->type != AST::CAP) {
+                               // see note [POSIX subexpression hierarchy]
                                t1 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(Tag::FICTIVE1));
+                               tags.push_back(Tag(Tag::FICTIVE, false));
                                t2 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(Tag::FICTIVE2));
+                               tags.push_back(Tag(Tag::FICTIVE, false));
                        }
                        x = ast_to_re(spec, ast->alt.ast1, ncap);
                        x = re_cat(alc, t1, re_cat(alc, x, t2));
@@ -173,13 +162,14 @@ static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
                }
                case AST::CAT: {
                        RE *t1 = NULL, *t2 = NULL, *x, *y;
-                       // see note [POSIX subexpression hierarchy]
-                       if (opts->posix_captures && has_tags(ast->cat.ast2)
-                               && !is_capture_or_fixlen(ast->cat.ast1)) {
+                       const AST *a1 = ast->alt.ast1;
+                       if (opts->posix_captures && has_tags(ast)
+                               && a1->type != AST::CAP && fixlen(a1) == Tag::VARDIST) {
+                               // see note [POSIX subexpression hierarchy]
                                t1 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(Tag::FICTIVE1));
+                               tags.push_back(Tag(Tag::FICTIVE, false));
                                t2 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(Tag::FICTIVE2));
+                               tags.push_back(Tag(Tag::FICTIVE, false));
                        }
                        x = ast_to_re(spec, ast->cat.ast1, ncap);
                        x = re_cat(alc, t1, re_cat(alc, x, t2));
@@ -207,10 +197,10 @@ static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
                        if (x->type == AST::REF) x = x->ref.ast;
 
                        RE *t1 = re_tag(alc, tags.size(), false);
-                       tags.push_back(Tag(3 * ncap));
+                       tags.push_back(Tag(2 * ncap, false));
 
                        RE *t2 = re_tag(alc, tags.size(), false);
-                       tags.push_back(Tag(3 * ncap + 1));
+                       tags.push_back(Tag(2 * ncap + 1, false));
 
                        ++ncap;
                        return re_cat(alc, t1, re_cat(alc, ast_to_re(spec, x, ncap), t2));
@@ -230,32 +220,32 @@ static RE *ast_to_re(RESpec &spec, const AST *ast, size_t &ncap)
                                m = std::max(n, ast->iter.max);
                        const AST *x = ast->iter.ast;
 
-                       RE *t1 = NULL, *t2 = NULL, *t3 = NULL;
+                       RE *t1 = NULL, *t2 = NULL;
                        if (opts->posix_captures && x->type == AST::CAP) {
                                x = x->cap;
                                if (x->type == AST::REF) x = x->ref.ast;
 
                                t1 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(3 * ncap));
+                               tags.push_back(Tag(2 * ncap, m > 1));
 
                                t2 = re_tag(alc, tags.size(), false);
-                               tags.push_back(Tag(3 * ncap + 1));
-
-                               if (m > 1) {
-                                       t3 = re_tag(alc, tags.size(), false);
-                                       tags.push_back(Tag(3 * ncap + 2));
-                               }
+                               tags.push_back(Tag(2 * ncap + 1, false));
 
                                ++ncap;
                        }
 
                        RE *y = NULL;
-                       if (m > 0) {
+                       if (m == 0) {
+                               y = re_cat(alc, t1, t2);
+                       } else if (m == 1) {
+                               y = ast_to_re(spec, x, ncap);
+                               y = re_cat(alc, t1, re_cat(alc, y, t2));
+                       } else  {
                                y = ast_to_re(spec, x, ncap);
-                               y = re_cat(alc, t3, y);
+                               y = re_cat(alc, t1, y);
                                y = re_iter(alc, y, n1, m);
+                               y = re_cat(alc, y, t2);
                        }
-                       y = re_cat(alc, t1, re_cat(alc, y, t2));
                        if (n == 0) {
                                y = re_alt(alc, y, re_nil(alc));
                        }

diff --git a/re2c/src/re/default_tags.cc b/re2c/src/re/default_tags.cc
index f8e9b608ffc8d1ed5591b1c5fe30402b8d03daa1..ef69c06bb9246f632fc129b4a13ab18028738abe 100644 (file)
--- a/re2c/src/re/default_tags.cc
+++ b/re2c/src/re/default_tags.cc
@@ -2,6 +2,10 @@
 
 namespace re2c {
 
+// Fictive tags do not really need default counterparts:
+// maximization can work without them based on version numbers.
+// For now it does not seem like a useful optimization, but some day
+// in future it might change.
 static void insert_default_tags(RESpec &spec, RE *re, size_t *&tidx)
 {
        RE::alc_t &alc = spec.alc;

diff --git a/re2c/src/re/fixed_tags.cc b/re2c/src/re/fixed_tags.cc
index 941730254b09de193df513bf0db1790b45c77fc0..c19ad5106516bb8c1e79146293e3d954e4c738c8 100644 (file)
--- a/re2c/src/re/fixed_tags.cc
+++ b/re2c/src/re/fixed_tags.cc
@@ -17,16 +17,6 @@ namespace re2c {
  *
  * Tags with history also cannot be fixed.
  *
- * One special case is pre-orbit tags: tags that correspond to the opening
- * of capturing group under iteration. We don't need to know the value of
- * such tags: we only need the last iteration which is captured by the
- * orbit tag. Pre-orbit tags are used for disambiguation only (they have
- * higher priority than orbit and closing tags). So we make pre-orbit tags
- * fixed on orbit tags with zero offset: this has no affect on disambiguation,
- * but this way pre-orbit tags will always have the same value as their orbit
- * tags (even if uninitialized, because of the zero offset) and we'll reduce
- * the amount of tag variables.
- *
  * Another special case is fictive tags (those that exist only to impose
  * hierarchical laws of POSIX disambiguation). We treat them as fixed
  * in order to suppress code generation.
@@ -63,9 +53,6 @@ static void find_fixed_tags(RE *re, std::vector<Tag> &tags,
                        } else if (toplevel && dist != Tag::VARDIST && !history(tag)) {
                                tag.base = base;
                                tag.dist = dist;
-                       } else if (preorbit(tags, re->tag.idx)) {
-                               tag.base = re->tag.idx + 2;
-                               tag.dist = 0;
                        } else if (toplevel) {
                                base = re->tag.idx;
                                dist = 0;

diff --git a/re2c/src/re/tag.cc b/re2c/src/re/tag.cc
index 802d6d967c50037bba9c5a32c5d8c95d731f08d1..9e6800e9cf4e3386d85f18c971b829c6fa80687c 100644 (file)
--- a/re2c/src/re/tag.cc
+++ b/re2c/src/re/tag.cc
@@ -7,7 +7,6 @@ namespace re2c
 
 const size_t Tag::RIGHTMOST = std::numeric_limits<size_t>::max();
 const size_t Tag::VARDIST = std::numeric_limits<size_t>::max();
-const size_t Tag::FICTIVE1 = (std::numeric_limits<size_t>::max() / 3 - 1) * 3;
-const size_t Tag::FICTIVE2 = Tag::FICTIVE1 + 1;
+const size_t Tag::FICTIVE = Tag::RIGHTMOST - 1;
 
 } // namespace re2c

diff --git a/re2c/src/re/tag.h b/re2c/src/re/tag.h
index e801f4928fcb8c1246cb6a106526fc6a11fd1262..e389b83089847ff224ebc2ebb1fa43ae8d00e417 100644 (file)
--- a/re2c/src/re/tag.h
+++ b/re2c/src/re/tag.h
@@ -20,14 +20,14 @@ struct Tag
 {
        static const size_t RIGHTMOST;
        static const size_t VARDIST;
-       static const size_t FICTIVE1;
-       static const size_t FICTIVE2;
+       static const size_t FICTIVE;
 
        const std::string *name;
        size_t ncap;
        size_t base;
        size_t dist;
        bool history;
+       bool orbit;
 
        Tag(const std::string *n, bool h)
                : name(n)
@@ -35,13 +35,15 @@ struct Tag
                , base(Tag::RIGHTMOST)
                , dist(Tag::VARDIST)
                , history(h)
+               , orbit(false)
        {}
-       explicit Tag(size_t c)
+       Tag(size_t c, bool o)
                : name(NULL)
                , ncap(c)
                , base(Tag::RIGHTMOST)
                , dist(Tag::VARDIST)
                , history(false)
+               , orbit(o)
        {}
 };
 
@@ -52,7 +54,7 @@ inline bool fixed(const Tag &tag)
 
 inline bool fictive(const Tag &tag)
 {
-       return tag.ncap == Tag::FICTIVE1 || tag.ncap == Tag::FICTIVE2;
+       return tag.ncap == Tag::FICTIVE;
 }
 
 inline bool capture(const Tag &tag)
@@ -62,7 +64,7 @@ inline bool capture(const Tag &tag)
 
 inline bool orbit(const Tag &tag)
 {
-       return capture(tag) && tag.ncap % 3 == 2;
+       return tag.orbit;
 }
 
 inline bool trailing(const Tag &tag)
@@ -70,14 +72,6 @@ inline bool trailing(const Tag &tag)
        return !capture(tag) && tag.name == NULL;
 }
 
-inline bool preorbit(const std::vector<Tag> &tags, size_t idx)
-{
-       const size_t ncap = tags[idx].ncap;
-       return ncap % 3 == 0
-               && idx + 2 < tags.size()
-               && tags[idx + 2].ncap == ncap + 2;
-}
-
 inline bool history(const Tag &tag)
 {
        return tag.history;

diff --git a/re2c/src/skeleton/generate_code.cc b/re2c/src/skeleton/generate_code.cc
index c46c086176c7b7fdafa6451ca2000d7c74d1d87d..82c4687747456ec7878677bea4b0f16598819fb9 100644 (file)
--- a/re2c/src/skeleton/generate_code.cc
+++ b/re2c/src/skeleton/generate_code.cc
@@ -488,7 +488,7 @@ void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rid)
        size_t ntag = 3;
        for (size_t t = r.ltag; t < r.htag; ++t) {
                const Tag &tag = dfa.tags[t];
-               if (t != r.ttag && !orbit(tag) && !fictive(tag)) ++ntag;
+               if (t != r.ttag && !fictive(tag)) ++ntag;
        }
 
        o.wind(ind).ws("status = check_key_count_").wstring(name).ws("(keys_count, i, ")
@@ -497,7 +497,7 @@ void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rid)
 
        for (size_t t = r.ltag; t < r.htag; ++t) {
                const Tag &tag = dfa.tags[t];
-               if (t == r.ttag || orbit(tag) || fictive(tag)) continue;
+               if (t == r.ttag || fictive(tag)) continue;
                const std::string tname = tagname(tag),
                        list = history(tag) ? "list" : "";
                o.ws("\n").wind(ind + 1).ws(" || check_tag").wstring(list).ws("_").wstring(name)

diff --git a/re2c/src/skeleton/generate_data.cc b/re2c/src/skeleton/generate_data.cc
index 31f7ee5478b17fd399f603f29306d3071d0a7d30..a9ac9ef96a3a0d9ae561d9c33580ff801d409498 100644 (file)
--- a/re2c/src/skeleton/generate_data.cc
+++ b/re2c/src/skeleton/generate_data.cc
@@ -212,7 +212,7 @@ static void write_keys(const path_t &path, const Skeleton &skel,
                nkey += 3;
                for (size_t t = ltag; t < htag; ++t) {
                        const Tag &tag = skel.tags[t];
-                       if (t == trail || orbit(tag) || fictive(tag)) continue;
+                       if (t == trail || fictive(tag)) continue;
                        const size_t
                                base = fixed(tag) ? tag.base : t,
                                bver = static_cast<size_t>(skel.finvers[base]);
@@ -230,7 +230,7 @@ static void write_keys(const path_t &path, const Skeleton &skel,
 
                for (size_t t = ltag; t < htag; ++t) {
                        const Tag &tag = skel.tags[t];
-                       if (t == trail || orbit(tag) || fictive(tag)) continue;
+                       if (t == trail || fictive(tag)) continue;
 
                        const size_t
                                base = fixed(tag) ? tag.base : t,

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 837f872bccc8864b1d092d3d98748cde150a78bf..d458b0c9eeeec5c7ec8c0a336eea6d6a81799d15 100644 (file)
--- a/re2c/test/posix_captures/basic/01.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/01.i--flex-syntax.c
@@ -5,8 +5,8 @@
        if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
-               yyt2 = NULL;
-               yyt1 = yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = NULL;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -16,11 +16,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[5] = yyt4;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt4;
+               yypmatch[5] = yyt5;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
-               yypmatch[4] = yyt5;
                {}
        }
 yy3:
@@ -34,29 +34,29 @@ yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = YYCURSOR;
+       yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt2;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt5 = YYCURSOR;
+       yyt3 = yyt4 = yyt5 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt4;
-               yyt5 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -64,23 +64,24 @@ yy9:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt3;
-       yyt4 = yyt5;
-       yyt5 = yyt3;
+       yyt3 = yyt2;
+       yyt4 = yyt2;
+       yyt6 = yyt5;
+       yyt5 = yyt2;
        goto yy9;
 }
 

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 837f872bccc8864b1d092d3d98748cde150a78bf..d458b0c9eeeec5c7ec8c0a336eea6d6a81799d15 100644 (file)
--- a/re2c/test/posix_captures/basic/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/02.i--flex-syntax.c
@@ -5,8 +5,8 @@
        if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
-               yyt2 = NULL;
-               yyt1 = yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = NULL;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -16,11 +16,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[5] = yyt4;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt4;
+               yypmatch[5] = yyt5;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
-               yypmatch[4] = yyt5;
                {}
        }
 yy3:
@@ -34,29 +34,29 @@ yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = YYCURSOR;
+       yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt2;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt5 = YYCURSOR;
+       yyt3 = yyt4 = yyt5 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt4;
-               yyt5 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -64,23 +64,24 @@ yy9:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt3;
-       yyt4 = yyt5;
-       yyt5 = yyt3;
+       yyt3 = yyt2;
+       yyt4 = yyt2;
+       yyt6 = yyt5;
+       yyt5 = yyt2;
        goto yy9;
 }
 

diff --git a/re2c/test/posix_captures/basic/14.i--flex-syntax.c b/re2c/test/posix_captures/basic/14.i--flex-syntax.c
index 6e3a2f47a5101c5da55f96279bcd7a441fcad255..b3ba328f2bc3f83c1772fda47bb4d30e1c2bce07 100644 (file)
--- a/re2c/test/posix_captures/basic/14.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/14.i--flex-syntax.c
@@ -47,11 +47,11 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
+               yypmatch[4] = yyt4;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
-               yypmatch[4] = yyt4;
                {}
        }
 }

diff --git a/re2c/test/posix_captures/basic/19.i--flex-syntax.c b/re2c/test/posix_captures/basic/19.i--flex-syntax.c
index 9ce477e48ccdfbac214c83205904a863cee742e2..fea5bfc72b17cd359b36217ebd48917f8c924f12 100644 (file)
--- a/re2c/test/posix_captures/basic/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/19.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = yyt4 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -18,11 +18,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -38,11 +38,11 @@ yy4:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy5;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -53,7 +53,7 @@ yy5:
                goto yy6;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy6:
@@ -61,9 +61,9 @@ yy6:
        switch (yych) {
        case 'a':       goto yy7;
        default:
-               yyt3 = yyt2;
+               yyt2 = yyt3;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -72,12 +72,12 @@ yy7:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy8;
        default:
-               yyt3 = yyt4;
+               yyt2 = yyt4;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy8:
@@ -89,9 +89,9 @@ yy8:
                yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt4;
+               yyt2 = yyt4;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -102,7 +102,7 @@ yy9:
        case 'a':       goto yy7;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/basic/20.i--flex-syntax.c b/re2c/test/posix_captures/basic/20.i--flex-syntax.c
index b0c325eae4c03191bd54369935eb02782071ca4a..8370719ee0ac7f78da704ba271c06861f662d9d5 100644 (file)
--- a/re2c/test/posix_captures/basic/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/20.i--flex-syntax.c
@@ -22,11 +22,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt5;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/basic/23.i--flex-syntax.c b/re2c/test/posix_captures/basic/23.i--flex-syntax.c
index 4feb8ae80ce32b4f73cc7d6b43c387e0d6cdaa41..631ed7c55f555fc1224c918246089ed685e1014a 100644 (file)
--- a/re2c/test/posix_captures/basic/23.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/23.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,67 +18,67 @@ yy2:
                const size_t yynmatch = 31;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[4] = yyt3;
-               yypmatch[5] = yyt2;
-               yypmatch[6] = yyt3;
-               yypmatch[7] = yyt2;
-               yypmatch[8] = yyt3;
-               yypmatch[9] = yyt2;
-               yypmatch[10] = yyt3;
-               yypmatch[11] = yyt2;
-               yypmatch[12] = yyt3;
-               yypmatch[13] = yyt2;
-               yypmatch[14] = yyt3;
-               yypmatch[15] = yyt2;
-               yypmatch[16] = yyt3;
-               yypmatch[17] = yyt2;
-               yypmatch[18] = yyt3;
-               yypmatch[19] = yyt2;
-               yypmatch[20] = yyt3;
-               yypmatch[21] = yyt2;
-               yypmatch[22] = yyt3;
-               yypmatch[23] = yyt2;
-               yypmatch[24] = yyt3;
-               yypmatch[25] = yyt2;
-               yypmatch[26] = yyt3;
-               yypmatch[27] = yyt2;
-               yypmatch[28] = yyt3;
-               yypmatch[29] = yyt2;
-               yypmatch[30] = yyt3;
-               yypmatch[31] = yyt2;
-               yypmatch[32] = yyt3;
-               yypmatch[33] = yyt2;
-               yypmatch[34] = yyt3;
-               yypmatch[35] = yyt2;
-               yypmatch[36] = yyt3;
-               yypmatch[37] = yyt2;
-               yypmatch[38] = yyt3;
-               yypmatch[39] = yyt2;
-               yypmatch[40] = yyt3;
-               yypmatch[41] = yyt2;
-               yypmatch[42] = yyt3;
-               yypmatch[43] = yyt2;
-               yypmatch[44] = yyt3;
-               yypmatch[45] = yyt2;
-               yypmatch[46] = yyt3;
-               yypmatch[47] = yyt2;
-               yypmatch[48] = yyt3;
-               yypmatch[49] = yyt2;
-               yypmatch[50] = yyt3;
-               yypmatch[51] = yyt2;
-               yypmatch[52] = yyt3;
-               yypmatch[53] = yyt2;
-               yypmatch[54] = yyt3;
-               yypmatch[55] = yyt2;
-               yypmatch[56] = yyt3;
-               yypmatch[57] = yyt2;
-               yypmatch[58] = yyt3;
-               yypmatch[59] = yyt2;
-               yypmatch[60] = yyt3;
-               yypmatch[61] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt2;
+               yypmatch[5] = yyt3;
+               yypmatch[6] = yyt2;
+               yypmatch[7] = yyt3;
+               yypmatch[8] = yyt2;
+               yypmatch[9] = yyt3;
+               yypmatch[10] = yyt2;
+               yypmatch[11] = yyt3;
+               yypmatch[12] = yyt2;
+               yypmatch[13] = yyt3;
+               yypmatch[14] = yyt2;
+               yypmatch[15] = yyt3;
+               yypmatch[16] = yyt2;
+               yypmatch[17] = yyt3;
+               yypmatch[18] = yyt2;
+               yypmatch[19] = yyt3;
+               yypmatch[20] = yyt2;
+               yypmatch[21] = yyt3;
+               yypmatch[22] = yyt2;
+               yypmatch[23] = yyt3;
+               yypmatch[24] = yyt2;
+               yypmatch[25] = yyt3;
+               yypmatch[26] = yyt2;
+               yypmatch[27] = yyt3;
+               yypmatch[28] = yyt2;
+               yypmatch[29] = yyt3;
+               yypmatch[30] = yyt2;
+               yypmatch[31] = yyt3;
+               yypmatch[32] = yyt2;
+               yypmatch[33] = yyt3;
+               yypmatch[34] = yyt2;
+               yypmatch[35] = yyt3;
+               yypmatch[36] = yyt2;
+               yypmatch[37] = yyt3;
+               yypmatch[38] = yyt2;
+               yypmatch[39] = yyt3;
+               yypmatch[40] = yyt2;
+               yypmatch[41] = yyt3;
+               yypmatch[42] = yyt2;
+               yypmatch[43] = yyt3;
+               yypmatch[44] = yyt2;
+               yypmatch[45] = yyt3;
+               yypmatch[46] = yyt2;
+               yypmatch[47] = yyt3;
+               yypmatch[48] = yyt2;
+               yypmatch[49] = yyt3;
+               yypmatch[50] = yyt2;
+               yypmatch[51] = yyt3;
+               yypmatch[52] = yyt2;
+               yypmatch[53] = yyt3;
+               yypmatch[54] = yyt2;
+               yypmatch[55] = yyt3;
+               yypmatch[56] = yyt2;
+               yypmatch[57] = yyt3;
+               yypmatch[58] = yyt2;
+               yypmatch[59] = yyt3;
+               yypmatch[60] = yyt2;
+               yypmatch[61] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -87,10 +87,10 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'x':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/basic/24.i--flex-syntax.c b/re2c/test/posix_captures/basic/24.i--flex-syntax.c
index 1a5d4f7d397774c99b0ca193a5de54d5a7db82a6..fd0da058c47792a2f6178f2c6a5c9fdb28874c67 100644 (file)
--- a/re2c/test/posix_captures/basic/24.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/24.i--flex-syntax.c
@@ -22,9 +22,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/basic/36.i--flex-syntax.c b/re2c/test/posix_captures/basic/36.i--flex-syntax.c
index a0e369b43a670b5e9d2e369f113901887ac81f75..bd1768fec4958a35f63fe4f96aef7b01cf377bd7 100644 (file)
--- a/re2c/test/posix_captures/basic/36.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/36.i--flex-syntax.c
@@ -17,9 +17,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

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 dee1de1d2459cf10dda75d526c6675d94e3bfe9d..bc9a397edccca81b677336e1075b61ea97f572c0 100644 (file)
--- a/re2c/test/posix_captures/basic/37.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/37.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/basic/38.i--flex-syntax.c b/re2c/test/posix_captures/basic/38.i--flex-syntax.c
index c66d2ab02941116e555a8a682d54ada34d8a711a..a6ee0c5f50e126119935fede4fb6e9121727adc2 100644 (file)
--- a/re2c/test/posix_captures/basic/38.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/38.i--flex-syntax.c
@@ -6,10 +6,10 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy5;
        default:
                yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -20,9 +20,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -32,10 +32,10 @@ yy3:
        switch (yych) {
        case 'a':       goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -44,13 +44,13 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/basic/39.i--flex-syntax.c b/re2c/test/posix_captures/basic/39.i--flex-syntax.c
index e09de1ff022dbd9234742705d5773ee4ff94220e..1cfcd3d56be3ff95770221ae52d55c7105978540 100644 (file)
--- a/re2c/test/posix_captures/basic/39.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/39.i--flex-syntax.c
@@ -6,10 +6,10 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy5;
        default:
                yyt2 = yyt3 = NULL;
@@ -21,9 +21,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -33,10 +33,10 @@ yy3:
        switch (yych) {
        case 'a':       goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -45,13 +45,13 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = 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 7cf2e62b38449065ea90bfc034d5c55997a56cb0..5f93371b90a788cea85afa7c7e10027fc1dff501 100644 (file)
--- a/re2c/test/posix_captures/basic/40.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/40.i--flex-syntax.c
@@ -37,8 +37,8 @@ yy5:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/basic/42.i--flex-syntax.c b/re2c/test/posix_captures/basic/42.i--flex-syntax.c
index be44ca3472600f5795c11f8f119c21bc178c5faa..466e22078310a12e43874136d7d648bf5d29ec48 100644 (file)
--- a/re2c/test/posix_captures/basic/42.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/42.i--flex-syntax.c
@@ -48,9 +48,9 @@ yy6:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 }

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 1b16d685fb76de2df89eaab639e9e8d237ff1041..39def3c234c92ee0b94709f7c760d44d46e949a5 100644 (file)
--- a/re2c/test/posix_captures/basic/43.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/43.i--flex-syntax.c
@@ -96,9 +96,9 @@ yy11:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt3;
+               yypmatch[2] = yyt4;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt4;
                {}
        }
 }

diff --git a/re2c/test/posix_captures/basic/46.i--flex-syntax.c b/re2c/test/posix_captures/basic/46.i--flex-syntax.c
index add0f6fb9556a42df75659f6040cd8cc767c1c43..a24c960751593edb8ecf294191f0c0e73355bf6f 100644 (file)
--- a/re2c/test/posix_captures/basic/46.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/46.i--flex-syntax.c
@@ -6,10 +6,10 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy5;
        default:
                yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -20,11 +20,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[4] = yyt3;
-               yypmatch[5] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt2;
+               yypmatch[5] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -34,10 +34,10 @@ yy3:
        switch (yych) {
        case 'a':       goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -46,13 +46,13 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/basic/59.i--flex-syntax.c b/re2c/test/posix_captures/basic/59.i--flex-syntax.c
index 5339041add2731c1ab827ec895df584213be1a41..cea702aa9fc40184d6ca793f5df3f18313bfe1fd 100644 (file)
--- a/re2c/test/posix_captures/basic/59.i--flex-syntax.c
+++ b/re2c/test/posix_captures/basic/59.i--flex-syntax.c
@@ -63,9 +63,9 @@ yy10:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 }

diff --git a/re2c/test/posix_captures/categorize/01.i--flex-syntax.c b/re2c/test/posix_captures/categorize/01.i--flex-syntax.c
index 2cc89e7884055ef5342c0e5ce5702544fd8a0642..e52b8b8fce9818fbcf684cc83ce86a1666933884 100644 (file)
--- a/re2c/test/posix_captures/categorize/01.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/01.i--flex-syntax.c
@@ -24,11 +24,11 @@ yy2:
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
-               yypmatch[5] = yyt3;
+               yypmatch[4] = yyt3;
+               yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[0] = yyt1;
                yypmatch[1] = YYCURSOR;
-               yypmatch[4] = yyt4;
                yypmatch[7] = YYCURSOR;
                {}
        }
@@ -85,7 +85,7 @@ yy9:
                yyt2 = yyt5;
                goto yy2;
        } else {
-               yyt3 = yyt5 = YYCURSOR;
+               yyt4 = yyt5 = YYCURSOR;
                goto yy2;
        }
 yy10:
@@ -95,16 +95,16 @@ yy10:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt4 = yyt6;
+               yyt3 = yyt6;
                yyt6 = YYCURSOR;
                goto yy8;
        case 'b':
-               yyt4 = yyt6;
-               yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt4 = yyt5 = YYCURSOR;
                goto yy5;
        default:
-               yyt4 = yyt6;
-               yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt4 = yyt5 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/categorize/02.i--flex-syntax.c b/re2c/test/posix_captures/categorize/02.i--flex-syntax.c
index 51167dda4b81c4dcea66817d0243f4e0a50825a8..82233dab14694c40904dbed92a3b34ca3bd61446 100644 (file)
--- a/re2c/test/posix_captures/categorize/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/02.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt2 = yyt4 = YYCURSOR;
+               yyt1 = yyt2 = yyt3 = YYCURSOR;
                goto yy3;
        case 'b':
                yyt3 = yyt4 = NULL;
@@ -23,14 +23,14 @@ yy2:
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[4] = yyt1;
                yypmatch[5] = yyt2;
-               yypmatch[7] = yyt3;
+               yypmatch[6] = yyt3;
+               yypmatch[7] = yyt4;
                yypmatch[10] = yyt5;
                yypmatch[12] = yyt6;
                yypmatch[0] = yyt1;
                yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
                yypmatch[3] = yyt5;
-               yypmatch[6] = yyt4;
                yypmatch[8] = yyt5;
                yypmatch[9] = YYCURSOR;
                yypmatch[11] = yyt6;
@@ -43,7 +43,7 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy3;
        case 'b':       goto yy7;
        default:
@@ -70,13 +70,13 @@ yy7:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = yyt5 = yyt6 = YYCURSOR;
+               yyt4 = yyt5 = yyt6 = YYCURSOR;
                goto yy10;
        case 'b':
-               yyt3 = yyt5 = YYCURSOR;
+               yyt4 = yyt5 = YYCURSOR;
                goto yy5;
        default:
-               yyt3 = yyt5 = yyt6 = YYCURSOR;
+               yyt4 = yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
 yy8:
@@ -94,7 +94,7 @@ yy10:
        switch (yych) {
        case 'a':       goto yy8;
        case 'b':
-               yyt4 = yyt3;
+               yyt3 = yyt4;
                goto yy7;
        default:        goto yy2;
        }

diff --git a/re2c/test/posix_captures/categorize/03.i--flex-syntax.c b/re2c/test/posix_captures/categorize/03.i--flex-syntax.c
index b0bdb604456af7e49da3e308f6b60a433f4da8d5..01535c9975ffb9649d301810b8c8b1194a136520 100644 (file)
--- a/re2c/test/posix_captures/categorize/03.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/03.i--flex-syntax.c
@@ -15,9 +15,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt3;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:

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 0a468540cc0c551ec353c2a829172006deacb1ff..bcd84b7a0b706a9134008fdfd2a13ce255f75aac 100644 (file)
--- a/re2c/test/posix_captures/categorize/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/06.i--flex-syntax.c
@@ -17,8 +17,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/categorize/07.i--flex-syntax.c b/re2c/test/posix_captures/categorize/07.i--flex-syntax.c
index a0e369b43a670b5e9d2e369f113901887ac81f75..bd1768fec4958a35f63fe4f96aef7b01cf377bd7 100644 (file)
--- a/re2c/test/posix_captures/categorize/07.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/07.i--flex-syntax.c
@@ -17,9 +17,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/categorize/08.i--flex-syntax.c b/re2c/test/posix_captures/categorize/08.i--flex-syntax.c
index 101810c6a9667655d34385c3be7daf11e96d8b95..404506d0dff1978fc19447def22e9cb15de1a487 100644 (file)
--- a/re2c/test/posix_captures/categorize/08.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/08.i--flex-syntax.c
@@ -22,9 +22,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

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 310504fa0642a414946b5c9c512a844b534d01e8..0ad4975d14f3a3131b030d87754e0f0c8103450e 100644 (file)
--- a/re2c/test/posix_captures/categorize/09.i--flex-syntax.c
+++ b/re2c/test/posix_captures/categorize/09.i--flex-syntax.c
@@ -38,10 +38,10 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c b/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c
index 1c959e5c2bc4756bc9c3d3d59d600d8f9eb445aa..c2bb93c46a3ec5a9dca7b8d5dbed7305894ac63d 100644 (file)
--- a/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c
+++ b/re2c/test/posix_captures/exponential_epsilon_closure.i--posix-captures.c
@@ -10,11 +10,11 @@
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt1;
+               yypmatch[4] = yyt1;
                yypmatch[5] = yyt1;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
-               yypmatch[4] = yyt1;
                {}
        }
 }

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 b37bf28fb1b638a8e11fae04d1d895d67c48d7b5..c2dde026cd18d4395b6850f6b71f5f8721f7318c 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/08.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c
index 7f88bc61df060e338680452489028ca158c69d70..c965cc4b01884e0308e17c895dcd3c56c0bcd9e9 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/09.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        }
        yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -14,9 +14,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -24,10 +24,10 @@ yy3:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        goto yy3;
 }
 

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 f56d32a281bc5ffab56eec9e7b30016262de14b2..11319892f5b9ed90b7f05505f0ec0e9cab44e9ba 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/13.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 64107e4bfa3c2572588fbdc46fd269e92e8cb0a4..eb6d91cd72e199400e60ca0912928b01bcb9fa5c 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/15.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c
index bfb8b509668ead9d4f85e522bdee38bdbaf816d7..552af7baa9ae18f8c269e910544a8232f0f76d54 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/16.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        }
        yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -14,9 +14,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -24,17 +24,17 @@ yy3:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        goto yy3;
 }
 

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 0a468540cc0c551ec353c2a829172006deacb1ff..bcd84b7a0b706a9134008fdfd2a13ce255f75aac 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/20.i--flex-syntax.c
@@ -17,8 +17,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c
index 6639826619155984afde9e3e793f26895f01143c..5ba435fe3e740d621bc8607246487e422e1ef44e 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/25.i--flex-syntax.c
@@ -7,10 +7,10 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt2 = YYCURSOR;
+               yyt1 = yyt3 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt2 = YYCURSOR;
+               yyt1 = yyt3 = YYCURSOR;
                goto yy5;
        default:
                yyt2 = yyt3 = NULL;
@@ -22,9 +22,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -33,12 +33,12 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy3;
        case 'b':       goto yy7;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -56,7 +56,7 @@ yy6:
                yyt1 = YYCURSOR;
                goto yy2;
        } else {
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -66,15 +66,15 @@ yy7:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy5;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c
index 101810c6a9667655d34385c3be7daf11e96d8b95..404506d0dff1978fc19447def22e9cb15de1a487 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/29.i--flex-syntax.c
@@ -22,9 +22,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c
index 42816d1c175c484d6511629ee9594af8b9032e6a..1d6c8f8a75e12e2dbb064bea18485a5c82d82ca4 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/33.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -29,18 +29,18 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'b':       goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        switch (yych) {
        case 'a':       goto yy6;
        default:        goto yy2;
@@ -51,13 +51,13 @@ yy6:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt2;
+               yyt2 = yyt3;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

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 310504fa0642a414946b5c9c512a844b534d01e8..0ad4975d14f3a3131b030d87754e0f0c8103450e 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/36.i--flex-syntax.c
@@ -38,10 +38,10 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c b/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c
index d903340076838ca725cc807a1445f4bd835215ad..be8d015d351af8791ab2b18df3b0da9bf468a5e9 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/41.i--flex-syntax.c
@@ -7,10 +7,10 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy6;
        default:
                yyt2 = yyt3 = NULL;
@@ -22,9 +22,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -44,11 +44,11 @@ yy5:
                yyt1 = YYCURSOR;
                goto yy2;
        case 1: 
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy6:
@@ -67,10 +67,10 @@ yy8:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy12;
        case 'z':       goto yy8;
        default:        goto yy3;
@@ -82,10 +82,10 @@ yy10:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy14;
        case 'y':       goto yy10;
        default:        goto yy6;
@@ -117,8 +117,8 @@ yy16:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'y':       goto yy16;
        case 'z':       goto yy18;
@@ -131,10 +131,10 @@ yy18:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy12;
        case 'y':       goto yy16;
        case 'z':       goto yy18;
@@ -147,10 +147,10 @@ yy20:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy14;
        case 'y':       goto yy20;
        case 'z':       goto yy22;
@@ -163,8 +163,8 @@ yy22:
        yych = *YYCURSOR;
        switch (yych) {
        case 0x00:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        case 'y':       goto yy20;
        case 'z':       goto yy22;

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 9484750941d906add9e8a7e1a42f50dc20e4f1f7..781ec144d7030cdd8a0c301d6572e8e9d1cd2f58 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/43.i--flex-syntax.c
@@ -5,8 +5,8 @@
        if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
-               yyt2 = NULL;
-               yyt1 = yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = NULL;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -16,13 +16,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[2] = yyt1;
-               yypmatch[5] = yyt2;
-               yypmatch[7] = yyt4;
+               yypmatch[4] = yyt2;
+               yypmatch[5] = yyt3;
+               yypmatch[6] = yyt4;
+               yypmatch[7] = yyt5;
                yypmatch[0] = yyt1;
                yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
-               yypmatch[4] = yyt3;
-               yypmatch[6] = yyt5;
                {}
        }
 yy3:
@@ -36,29 +36,29 @@ yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = YYCURSOR;
+       yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt2;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
+               yyt2 = yyt6;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt5 = YYCURSOR;
+       yyt3 = yyt4 = yyt5 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt4;
-               yyt5 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -66,23 +66,24 @@ yy9:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
-               yyt4 = YYCURSOR;
+               yyt2 = yyt6;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt3;
-       yyt4 = yyt5;
-       yyt5 = yyt3;
+       yyt3 = yyt2;
+       yyt4 = yyt2;
+       yyt6 = yyt5;
+       yyt5 = yyt2;
        goto yy9;
 }
 

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 062f765a5322817246136b5d35c69568371ae19d..5b446634c8827fe2f57a9a374124d61def800b46 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/44.i--flex-syntax.c
@@ -5,8 +5,8 @@
        if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
-               yyt2 = NULL;
-               yyt1 = yyt3 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = NULL;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt7 = NULL;
@@ -16,19 +16,19 @@ yy2:
                const size_t yynmatch = 7;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[2] = yyt1;
-               yypmatch[5] = yyt2;
-               yypmatch[7] = yyt4;
+               yypmatch[4] = yyt2;
+               yypmatch[5] = yyt3;
+               yypmatch[6] = yyt4;
+               yypmatch[7] = yyt5;
                yypmatch[8] = yyt6;
+               yypmatch[10] = yyt7;
                yypmatch[11] = yyt7;
+               yypmatch[12] = yyt7;
                yypmatch[13] = yyt7;
                yypmatch[0] = yyt1;
                yypmatch[1] = YYCURSOR;
                yypmatch[3] = yyt6;
-               yypmatch[4] = yyt3;
-               yypmatch[6] = yyt5;
                yypmatch[9] = YYCURSOR;
-               yypmatch[10] = yyt7;
-               yypmatch[12] = yyt7;
                {}
        }
 yy3:
@@ -42,31 +42,31 @@ yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = yyt7 = NULL;
-               yyt2 = yyt6 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = YYCURSOR;
+       yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt2;
+               yyt2 = yyt5;
                yyt7 = NULL;
-               yyt4 = yyt6 = YYCURSOR;
+               yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
+               yyt2 = yyt6;
                yyt4 = yyt5 = yyt7 = NULL;
-               yyt2 = yyt6 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt5 = yyt6 = YYCURSOR;
+       yyt3 = yyt4 = yyt5 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt2 = yyt4;
-               yyt5 = yyt4;
+               yyt3 = yyt6;
+               yyt4 = yyt6;
                yyt7 = NULL;
-               yyt4 = yyt6 = YYCURSOR;
+               yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -74,25 +74,25 @@ yy9:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt6;
+               yyt2 = yyt5;
                yyt4 = yyt5 = yyt7 = NULL;
-               yyt2 = yyt6 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = YYCURSOR;
+       yyt2 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt4;
+               yyt2 = yyt6;
                yyt7 = NULL;
-               yyt4 = yyt6 = YYCURSOR;
+               yyt5 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt3;
-       yyt4 = yyt6;
-       yyt5 = yyt3;
-       yyt6 = yyt3;
+       yyt3 = yyt2;
+       yyt4 = yyt2;
+       yyt6 = yyt5;
+       yyt5 = yyt2;
        goto yy9;
 }
 

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 16a9287d0e2232014383aa6975532e3d813f1c32..9cab5025fadaafd644f800e5ccf9390125b553bf 100644 (file)
--- a/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c
+++ b/re2c/test/posix_captures/glennfowler/45.i--flex-syntax.c
@@ -5,8 +5,8 @@
        if ((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
        yych = *(YYMARKER = YYCURSOR);
        if (yych >= 0x01) {
-               yyt2 = yyt3 = NULL;
-               yyt1 = yyt4 = yyt6 = YYCURSOR;
+               yyt2 = yyt4 = NULL;
+               yyt1 = yyt3 = yyt5 = YYCURSOR;
                goto yy3;
        }
        yyt3 = yyt4 = yyt5 = yyt6 = NULL;
@@ -16,13 +16,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
-               yypmatch[5] = yyt3;
-               yypmatch[7] = yyt5;
+               yypmatch[4] = yyt3;
+               yypmatch[5] = yyt4;
+               yypmatch[6] = yyt5;
+               yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
-               yypmatch[4] = yyt4;
-               yypmatch[6] = yyt6;
                {}
        }
 yy3:
@@ -36,29 +36,29 @@ yy5:
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
                yyt5 = yyt6 = NULL;
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy2;
        }
-       yyt5 = YYCURSOR;
+       yyt6 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt4 = yyt2;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt2;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy2;
        }
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt4 = yyt5;
+               yyt3 = yyt6;
                yyt5 = yyt6 = NULL;
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy2;
        }
-       yyt2 = yyt3 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt5 = YYCURSOR;
        yych = *++YYCURSOR;
        if (yych <= 0x00) {
-               yyt3 = yyt5;
-               yyt6 = yyt5;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt4 = yyt6;
+               yyt5 = yyt6;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -66,24 +66,24 @@ yy9:
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt4 = yyt2;
+               yyt3 = yyt2;
                yyt5 = yyt6 = NULL;
-               yyt2 = yyt3 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy2;
        }
-       yyt4 = YYCURSOR;
+       yyt3 = YYCURSOR;
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych <= 0x00) {
-               yyt4 = yyt5;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt6;
+               yyt2 = yyt6 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4;
-       yyt5 = yyt2;
-       yyt6 = yyt4;
-       yyt2 = yyt4;
+       yyt4 = yyt3;
+       yyt5 = yyt3;
+       yyt6 = yyt2;
+       yyt2 = yyt3;
        goto yy9;
 }
 

diff --git a/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c b/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c
index 4bb3c1fda5d1e9181c968088c49c2c7836bba6af..3400ae9b6813652c9f95525c9142cfaf96e78172 100644 (file)
--- a/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c
+++ b/re2c/test/posix_captures/implicit_grouping2.i--posix-captures.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
@@ -39,10 +39,10 @@ yy4:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c b/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c
index 4bb3c1fda5d1e9181c968088c49c2c7836bba6af..3400ae9b6813652c9f95525c9142cfaf96e78172 100644 (file)
--- a/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c
+++ b/re2c/test/posix_captures/implicit_grouping3.i--posix-captures.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
@@ -39,10 +39,10 @@ yy4:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/leftmost1.i--posix-captures.c b/re2c/test/posix_captures/leftmost1.i--posix-captures.c
new file mode 100644 (file)
index 0000000..67d0465
--- /dev/null
+++ b/re2c/test/posix_captures/leftmost1.i--posix-captures.c
@@ -0,0 +1,45 @@
+/* Generated by re2c */
+
+{
+       YYCTYPE yych;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt1 = yyt3 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt3 = yyt4 = yyt5 = NULL;
+               yyt1 = yyt2 = YYCURSOR;
+               goto yy2;
+       }
+yy2:
+       {
+               const size_t yynmatch = 4;
+               const YYCTYPE *yypmatch[yynmatch * 2];
+               yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
+               yypmatch[3] = yyt2;
+               yypmatch[4] = yyt3;
+               yypmatch[5] = yyt4;
+               yypmatch[6] = yyt5;
+               yypmatch[7] = yyt5;
+               yypmatch[1] = YYCURSOR;
+               {}
+       }
+yy3:
+       ++YYCURSOR;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt3 = YYCURSOR;
+               goto yy3;
+       default:
+               yyt5 = NULL;
+               yyt2 = yyt4 = YYCURSOR;
+               goto yy2;
+       }
+}
+
+re2c: warning: line 2: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/leftmost1.i--posix-captures.re b/re2c/test/posix_captures/leftmost1.i--posix-captures.re
new file mode 100644 (file)
index 0000000..0242867
--- /dev/null
+++ b/re2c/test/posix_captures/leftmost1.i--posix-captures.re
@@ -0,0 +1,3 @@
+/*!re2c
+    (("a")* | ("a"*))* {}
+*/

diff --git a/re2c/test/posix_captures/leftmost2.i--posix-captures.c b/re2c/test/posix_captures/leftmost2.i--posix-captures.c
new file mode 100644 (file)
index 0000000..0fda244
--- /dev/null
+++ b/re2c/test/posix_captures/leftmost2.i--posix-captures.c
@@ -0,0 +1,46 @@
+/* Generated by re2c */
+
+{
+       YYCTYPE yych;
+       if (YYLIMIT <= YYCURSOR) YYFILL(1);
+       yych = *YYCURSOR;
+       switch (yych) {
+       case 'a':
+               yyt1 = YYCURSOR;
+               goto yy3;
+       case 'b':       goto yy5;
+       default:        goto yy2;
+       }
+yy2:
+       {
+               const size_t yynmatch = 1;
+               const YYCTYPE *yypmatch[yynmatch * 2];
+               yypmatch[0] = YYCURSOR;
+               yypmatch[1] = YYCURSOR;
+               {}
+       }
+yy3:
+       ++YYCURSOR;
+       yyt3 = NULL;
+       yyt2 = YYCURSOR;
+yy4:
+       {
+               const size_t yynmatch = 4;
+               const YYCTYPE *yypmatch[yynmatch * 2];
+               yypmatch[2] = yyt1;
+               yypmatch[3] = yyt2;
+               yypmatch[4] = yyt1;
+               yypmatch[5] = yyt2;
+               yypmatch[6] = yyt3;
+               yypmatch[7] = yyt3;
+               yypmatch[0] = YYCURSOR - 1;
+               yypmatch[1] = YYCURSOR;
+               {}
+       }
+yy5:
+       ++YYCURSOR;
+       yyt1 = yyt2 = yyt3 = NULL;
+       goto yy4;
+}
+
+re2c: warning: line 3: rule matches empty string [-Wmatch-empty-string]

diff --git a/re2c/test/posix_captures/leftmost2.i--posix-captures.re b/re2c/test/posix_captures/leftmost2.i--posix-captures.re
new file mode 100644 (file)
index 0000000..7303a2c
--- /dev/null
+++ b/re2c/test/posix_captures/leftmost2.i--posix-captures.re
@@ -0,0 +1,4 @@
+/*!re2c
+    (([a])) | [b] | [b] | ([b]) | [b] {}
+    "" {}
+*/

diff --git a/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c
index a0e369b43a670b5e9d2e369f113901887ac81f75..bd1768fec4958a35f63fe4f96aef7b01cf377bd7 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/01.i--flex-syntax.c
@@ -17,9 +17,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

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 dee1de1d2459cf10dda75d526c6675d94e3bfe9d..bc9a397edccca81b677336e1075b61ea97f572c0 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/02.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c
index 7a6bbb89a59d159f591c487105afcd786ee03bac..10e62ea5e529c61e14b5dd4d2edc472467fff2b7 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/03.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = 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 8e50e10d8690b45ccf3012bae5251e5f2ed6c98b..665dfcb44d1b482d38a373ab5512345ba8b45861 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/04.i--flex-syntax.c
@@ -31,8 +31,8 @@ yy5:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c
index a0e369b43a670b5e9d2e369f113901887ac81f75..bd1768fec4958a35f63fe4f96aef7b01cf377bd7 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/05.i--flex-syntax.c
@@ -17,9 +17,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

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 dee1de1d2459cf10dda75d526c6675d94e3bfe9d..bc9a397edccca81b677336e1075b61ea97f572c0 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/06.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c
index b80f90ead7aa58b27b9ffd276c2ac979bab56b5b..7360dcb441a1e11484508bddca11177a3b8ca3af 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/07.i--flex-syntax.c
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c
index ea8f74e44130bf5fa02409c0b86ab2b6040569ab..9fdccb215fe7cd43b7a8a8bd24221ff8308e6a05 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/08.i--flex-syntax.c
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c
index 5d69b0ed67f36f42c24370b4b2f542d2b8806675..8ff55ed7610bfe8c10628ab95446758385f2e042 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/09.i--flex-syntax.c
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c
index 5f97d6ca916cb0c6a3e2cfa8a760367a5830b66d..32e718052129856b57344676a2c81da7c2d565c4 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/10.i--flex-syntax.c
@@ -19,9 +19,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c
index 77ad3e77796c2ccf7c33e1da161b2d0766b9fd0e..fa114bf0bfa43e72cf49bd4b7367093e51343519 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/11.i--flex-syntax.c
@@ -6,10 +6,10 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        case 'z':
-               yyt1 = yyt3 = yyt5 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy5;
        default:
                yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -21,11 +21,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[5] = yyt4;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt4;
+               yypmatch[5] = yyt5;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
-               yypmatch[4] = yyt5;
                {}
        }
 yy3:
@@ -34,14 +34,14 @@ yy3:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'z':
-               yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy5;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -50,13 +50,13 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        case 'z':
-               yyt5 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c
index 9619fe95296b55ea2870982dbfb352ba2029b0f3..049feb0ac3c4706470b97f78a8d7b717e98c7a17 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/13.i--flex-syntax.c
@@ -41,9 +41,9 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[4] = YYCURSOR - 1;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c
index 9619fe95296b55ea2870982dbfb352ba2029b0f3..049feb0ac3c4706470b97f78a8d7b717e98c7a17 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/14.i--flex-syntax.c
@@ -41,9 +41,9 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[4] = YYCURSOR - 1;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c b/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c
index 9619fe95296b55ea2870982dbfb352ba2029b0f3..049feb0ac3c4706470b97f78a8d7b717e98c7a17 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/15.i--flex-syntax.c
@@ -41,9 +41,9 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt1;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[4] = YYCURSOR - 1;
                yypmatch[5] = YYCURSOR;
                {}

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 5b22f95463c181551d04bbc797dd93f4c6bdcc98..a6ad08abfaf9bc37aa5a27693d1a83ce452c55b6 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/16.i--flex-syntax.c
@@ -39,8 +39,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               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 5b22f95463c181551d04bbc797dd93f4c6bdcc98..a6ad08abfaf9bc37aa5a27693d1a83ce452c55b6 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/17.i--flex-syntax.c
@@ -39,8 +39,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               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 5b22f95463c181551d04bbc797dd93f4c6bdcc98..a6ad08abfaf9bc37aa5a27693d1a83ce452c55b6 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/18.i--flex-syntax.c
@@ -39,8 +39,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt1;
+               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 603e34af43c81b6a161cfcdd3e9b1e6e9418ca47..d051ee0b7a98adce3bf9488739d8357b985fa281 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/19.i--flex-syntax.c
@@ -41,8 +41,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = 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 603e34af43c81b6a161cfcdd3e9b1e6e9418ca47..d051ee0b7a98adce3bf9488739d8357b985fa281 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/20.i--flex-syntax.c
@@ -41,8 +41,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = 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 603e34af43c81b6a161cfcdd3e9b1e6e9418ca47..d051ee0b7a98adce3bf9488739d8357b985fa281 100644 (file)
--- a/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c
+++ b/re2c/test/posix_captures/nullsubexpr/21.i--flex-syntax.c
@@ -41,8 +41,8 @@ yy6:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = 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 00768a959f6ef932762c7e498385b86828be21f0..3508071947a2508650e18f81c36052902c00cc2c 100644 (file)
--- a/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c
+++ b/re2c/test/posix_captures/osxbsdcritical/03.i--flex-syntax.c
@@ -58,10 +58,10 @@ yy7:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 00768a959f6ef932762c7e498385b86828be21f0..3508071947a2508650e18f81c36052902c00cc2c 100644 (file)
--- a/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/osxbsdcritical/06.i--flex-syntax.c
@@ -58,10 +58,10 @@ yy7:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

diff --git a/re2c/test/posix_captures/other/01.i--flex-syntax.c b/re2c/test/posix_captures/other/01.i--flex-syntax.c
index 35f99d14b1b33d5461d09cfa4d3a6b51560e7ed3..c28fcf86da8ee735f376b53baee695477de8e6c4 100644 (file)
--- a/re2c/test/posix_captures/other/01.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/01.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
@@ -39,10 +39,10 @@ yy4:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/other/02.i--flex-syntax.c b/re2c/test/posix_captures/other/02.i--flex-syntax.c
index 35f99d14b1b33d5461d09cfa4d3a6b51560e7ed3..c28fcf86da8ee735f376b53baee695477de8e6c4 100644 (file)
--- a/re2c/test/posix_captures/other/02.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/02.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
@@ -39,10 +39,10 @@ yy4:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/other/07.i--flex-syntax.c b/re2c/test/posix_captures/other/07.i--flex-syntax.c
index 8e4c5fd851a600f4b3e4342bb7a1c631a81f0579..987292a9ec703af8c44cf7807150061153077add 100644 (file)
--- a/re2c/test/posix_captures/other/07.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/07.i--flex-syntax.c
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt2;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

diff --git a/re2c/test/posix_captures/other/08.i--flex-syntax.c b/re2c/test/posix_captures/other/08.i--flex-syntax.c
index 35f99d14b1b33d5461d09cfa4d3a6b51560e7ed3..c28fcf86da8ee735f376b53baee695477de8e6c4 100644 (file)
--- a/re2c/test/posix_captures/other/08.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/08.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,9 +18,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        switch (yych) {
        case 'a':       goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
@@ -39,10 +39,10 @@ yy4:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy3;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/other/09.i--flex-syntax.c b/re2c/test/posix_captures/other/09.i--flex-syntax.c
index 41449479d26ed4a3e817d7e24ae293ca43392221..4dff57ea12767ebc9214909078196b1c604f8cc1 100644 (file)
--- a/re2c/test/posix_captures/other/09.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/09.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *(YYMARKER = YYCURSOR);
        switch (yych) {
        case 'a':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -17,9 +17,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -39,14 +39,14 @@ yy5:
        switch (yych) {
        case 'a':       goto yy6;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy6:
        ++YYCURSOR;
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        switch (yych) {
        case 'a':       goto yy7;
        default:        goto yy2;
@@ -60,7 +60,7 @@ yy7:
                yyt4 = YYCURSOR;
                goto yy8;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy8:
@@ -70,8 +70,8 @@ yy8:
        switch (yych) {
        case 'a':       goto yy9;
        default:
-               yyt3 = yyt2;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt3;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -81,7 +81,7 @@ yy9:
        switch (yych) {
        case 'a':       goto yy10;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy10:
@@ -91,8 +91,8 @@ yy10:
        switch (yych) {
        case 'a':       goto yy5;
        default:
-               yyt3 = yyt4;
-               yyt2 = YYCURSOR;
+               yyt2 = yyt4;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

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 9cbde62caa576dee6905c9cb2689bcb6b2e54360..430d5b91d81d91352d11c2179a8b55a826541602 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 = yyt3 = yyt5 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -19,11 +19,11 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
-               yypmatch[5] = yyt4;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
+               yypmatch[4] = yyt4;
+               yypmatch[5] = yyt5;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
-               yypmatch[4] = yyt5;
                {}
        }
 yy3:
@@ -43,12 +43,12 @@ yy4:
                goto yy2;
        case 1: 
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        default:
-               yyt3 = yyt2;
+               yyt2 = yyt3;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -57,11 +57,11 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy6;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy6:
@@ -72,7 +72,7 @@ yy6:
        case 'a':       goto yy7;
        default:
                yyt2 = yyt3 = NULL;
-               yyt4 = YYCURSOR;
+               yyt5 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -82,11 +82,11 @@ yy7:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy8;
        default:
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy8:
@@ -104,12 +104,12 @@ yy9:
        yych = *YYCURSOR;
        switch (yych) {
        case 'a':
-               yyt3 = yyt5 = YYCURSOR;
+               yyt2 = yyt4 = YYCURSOR;
                goto yy3;
        default:
-               yyt3 = yyt2;
+               yyt2 = yyt3;
                yyt4 = yyt5 = NULL;
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 }

diff --git a/re2c/test/posix_captures/other/12.i--flex-syntax.c b/re2c/test/posix_captures/other/12.i--flex-syntax.c
index e768da1e6164279690391b3e5f993a4cf10635f4..691bb51441caee2ae79ae8b430d3dd32491385cd 100644 (file)
--- a/re2c/test/posix_captures/other/12.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/12.i--flex-syntax.c
@@ -28,9 +28,9 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                {}
        }
 yy3:

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 99af72a6dbccf0c3487c2f91f8526534db785278..165840b0f45ce8d04c2a7e80f33073a9a91f9812 100644 (file)
--- a/re2c/test/posix_captures/other/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/13.i--flex-syntax.c
@@ -35,8 +35,8 @@ yy5:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/other/14.i--flex-syntax.c b/re2c/test/posix_captures/other/14.i--flex-syntax.c
index bac8d622395e6f60e5598e29ef5f0543577a3b0c..6663cdc371c2a02d06c367f3c5bed37c10f281fe 100644 (file)
--- a/re2c/test/posix_captures/other/14.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/14.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt2 = yyt3 = NULL;
@@ -18,24 +18,24 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
        ++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        goto yy2;
 }
 

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 9602d8c4a8d6263c2273598b3177fdb9b3938a4e..0f7b57152e73cc20d9497df5d1bfa7f0f437ebb0 100644 (file)
--- a/re2c/test/posix_captures/other/15.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/15.i--flex-syntax.c
@@ -31,8 +31,8 @@ yy4:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 45fc3b1b9adc1e9b16e598a8a073109ffb0b6288..7ae1db2962481a92e7df79a26df9bc37e750b2c7 100644 (file)
--- a/re2c/test/posix_captures/other/16.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/16.i--flex-syntax.c
@@ -40,8 +40,8 @@ yy6:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt3;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

diff --git a/re2c/test/posix_captures/other/17.i--flex-syntax.c b/re2c/test/posix_captures/other/17.i--flex-syntax.c
index 39b65be5ef046fa53b234fe7b4d45241c5b44b6a..674a153a383a5ad26f54ca6d7ff6fbed884bda0f 100644 (file)
--- a/re2c/test/posix_captures/other/17.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/17.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:        goto yy2;
        }
@@ -22,10 +22,10 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy4;
        }
 yy4:
@@ -33,14 +33,14 @@ yy4:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy5:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        switch (yych) {
        case 'y':       goto yy6;
        default:        goto yy4;

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 989611f5ed7163af49d906da3fb988d8c5f91f3f..aa1415f2b591ed8728e06869ab0596b54bcd278f 100644 (file)
--- a/re2c/test/posix_captures/other/18.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/18.i--flex-syntax.c
@@ -44,8 +44,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               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 1e8acbf8a069c41fb51d4a240faf31fb475ecf10..3fcda5f58d3bbeb2984c2708c7e87dcb4acb5f8b 100644 (file)
--- a/re2c/test/posix_captures/other/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/19.i--flex-syntax.c
@@ -17,8 +17,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/other/20.i--flex-syntax.c b/re2c/test/posix_captures/other/20.i--flex-syntax.c
index 4d30a682993f92e4517e34446b714fa30498e95e..46cb5c2f399b1904ee2f1a7730e2439d32e28c59 100644 (file)
--- a/re2c/test/posix_captures/other/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/20.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -17,24 +17,24 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
        ++YYCURSOR;
-       yyt2 = 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 57fb270e9aff348d57c97263ad883d11daaf61a8..4ae68dbefda4aa0a76370c83d135c98a5789e4e7 100644 (file)
--- a/re2c/test/posix_captures/other/21.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/21.i--flex-syntax.c
@@ -14,8 +14,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 eee5a620c797eae876dae2190b27d153d87cc446..37008125588d09d6b1b0c1090325ca9ad203784d 100644 (file)
--- a/re2c/test/posix_captures/other/22.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/22.i--flex-syntax.c
@@ -31,8 +31,8 @@ yy4:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

diff --git a/re2c/test/posix_captures/other/23.i--flex-syntax.c b/re2c/test/posix_captures/other/23.i--flex-syntax.c
index 38f8b853524dcc2ea6094a48ffebe49e8a5f193a..fb5d274366477c22542a2bdfceab80f520595b85 100644 (file)
--- a/re2c/test/posix_captures/other/23.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/23.i--flex-syntax.c
@@ -6,7 +6,7 @@
        yych = *YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt2 = YYCURSOR;
                goto yy3;
        default:
                yyt1 = yyt2 = yyt3 = YYCURSOR;
@@ -17,24 +17,24 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'y':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy4;
        default:
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy2;
        }
 yy4:
        yych = *++YYCURSOR;
-       yyt2 = YYCURSOR;
+       yyt3 = YYCURSOR;
        switch (yych) {
        case 'y':       goto yy5;
        default:        goto yy2;

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 306f7f20f6acf82912a51136a8c18a78d4157a97..f3fb137c131704edb011893007e25cf6635527ac 100644 (file)
--- a/re2c/test/posix_captures/other/24.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/24.i--flex-syntax.c
@@ -17,8 +17,8 @@ yy2:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 6f5ff5a8e944aeb7776385de0da04a91477b71c1..05685dbd8bd5ea5e977441488b226f2c780c5d49 100644 (file)
--- a/re2c/test/posix_captures/other/25.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/25.i--flex-syntax.c
@@ -20,10 +20,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 62d11a75e142f718196085f42a6c01d171365ba1..75f6f0501656a9d2821dcc4852edba1ce9ff13cf 100644 (file)
--- a/re2c/test/posix_captures/other/26.i--flex-syntax.c
+++ b/re2c/test/posix_captures/other/26.i--flex-syntax.c
@@ -48,8 +48,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/05.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/05.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/06.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/06.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/07.i--flex-syntax.c b/re2c/test/posix_captures/repetition/07.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/07.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/07.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/12.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/12.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/13.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/13.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/14.i--flex-syntax.c b/re2c/test/posix_captures/repetition/14.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/14.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/14.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/19.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/19.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/20.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/20.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/21.i--flex-syntax.c b/re2c/test/posix_captures/repetition/21.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/21.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/21.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/26.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/26.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/27.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/27.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/28.i--flex-syntax.c b/re2c/test/posix_captures/repetition/28.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/28.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/28.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/33.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/33.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/34.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/34.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/35.i--flex-syntax.c b/re2c/test/posix_captures/repetition/35.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/35.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/35.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/40.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/40.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/41.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/41.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/42.i--flex-syntax.c b/re2c/test/posix_captures/repetition/42.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/42.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/42.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

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 4a54cd9650b0d7cdd2ff5eaf61ce9638b5b04558..c7306ffddd3aceb133d3a353b7143eb6fda13af2 100644 (file)
--- a/re2c/test/posix_captures/repetition/47.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/47.i--flex-syntax.c
@@ -37,12 +37,12 @@ yy6:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

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 2cfa55956f4295755f06c90cc8fd0f8172fe8f52..7a16595ca46e637c2dc7e8ff708c8470c14388b8 100644 (file)
--- a/re2c/test/posix_captures/repetition/48.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/48.i--flex-syntax.c
@@ -38,12 +38,12 @@ yy7:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[5] = yyt4;
                yypmatch[6] = yyt5;
                yypmatch[7] = yyt6;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = YYCURSOR;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/49.i--flex-syntax.c b/re2c/test/posix_captures/repetition/49.i--flex-syntax.c
index 0df588b967b55188a4e8d50d82d5fb81c1c69b87..0625dd2420095d6a34e9f5b8a6e277ad69ae44fe 100644 (file)
--- a/re2c/test/posix_captures/repetition/49.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/49.i--flex-syntax.c
@@ -5,7 +5,7 @@
        if (YYLIMIT <= YYCURSOR) YYFILL(1);
        yych = *YYCURSOR;
        if (yych >= 0x01) {
-               yyt1 = yyt3 = yyt4 = yyt6 = YYCURSOR;
+               yyt1 = yyt2 = yyt4 = yyt6 = YYCURSOR;
                goto yy3;
        }
        yyt2 = yyt3 = yyt4 = yyt5 = yyt6 = yyt7 = NULL;
@@ -15,13 +15,13 @@ yy2:
                const size_t yynmatch = 4;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[5] = yyt5;
                yypmatch[6] = yyt6;
                yypmatch[7] = yyt7;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy3:
@@ -30,7 +30,7 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt4 = yyt5 = NULL;
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy2;
        }
        ++YYCURSOR;
@@ -38,10 +38,10 @@ yy3:
        yych = *YYCURSOR;
        if (yych <= 0x00) {
                yyt6 = yyt7 = NULL;
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy2;
        }
-       yyt3 = yyt4 = yyt6 = YYCURSOR;
+       yyt2 = yyt4 = yyt6 = YYCURSOR;
        goto yy3;
 }
 

diff --git a/re2c/test/posix_captures/repetition/50.i--flex-syntax.c b/re2c/test/posix_captures/repetition/50.i--flex-syntax.c
index 2bed8abe36abd079c8c896df81f7c772c6b53c67..97f145adc8bf956e99f6fccfb544ca69d79009f7 100644 (file)
--- a/re2c/test/posix_captures/repetition/50.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/50.i--flex-syntax.c
@@ -23,7 +23,7 @@ yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt1 = yyt3 = YYCURSOR;
+               yyt1 = yyt4 = YYCURSOR;
                goto yy7;
        default:        goto yy6;
        }
@@ -42,7 +42,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
                yyt1 = YYCURSOR;
@@ -53,7 +53,7 @@ yy7:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 'Y':
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:        goto yy10;
        }
@@ -62,9 +62,9 @@ yy8:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
-               yypmatch[3] = yyt3;
+               yypmatch[2] = yyt3;
+               yypmatch[3] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt4;
                {}
        }
 yy9:
@@ -75,14 +75,14 @@ yy9:
 yy10:
        switch (yych) {
        case 0x00:
-               yyt4 = yyt1;
+               yyt3 = yyt1;
                goto yy8;
        case 'Y':
                yyt1 = yyt3;
-               yyt3 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt4 = yyt1;
+               yyt3 = yyt1;
                yyt1 = YYCURSOR;
                goto yy5;
        }

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 830b3043a645e3e8c3ce0885bc8322986208c1f6..c20362be2309390fc90b2a9b5129ce782b0a6544 100644 (file)
--- a/re2c/test/posix_captures/repetition/51.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/51.i--flex-syntax.c
@@ -62,8 +62,8 @@ yy8:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt3;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 2df4c80dcae6ecbad820a9710b4d233dcf493e83..5ca98da1dbd581f6a02b872c1361f822ff0bee64 100644 (file)
--- a/re2c/test/posix_captures/repetition/52.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/52.i--flex-syntax.c
@@ -60,8 +60,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 df0cd0937599c1de19f37e19c57ff5f18bdbcfde..4c3fd3970841fd7efb598332686b1993f254e242 100644 (file)
--- a/re2c/test/posix_captures/repetition/53.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/53.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 c5b1ecf773a72784fb752b0ec6005d92fbc36ae9..c856a213164d8c92da7c41bd73b4f3fa76a10c07 100644 (file)
--- a/re2c/test/posix_captures/repetition/54.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/54.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 52623acf9da4f8a2a0127762de287ef5c537b8db..5b78337281be274f5fee67e7416b3623a8fecf69 100644 (file)
--- a/re2c/test/posix_captures/repetition/55.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/55.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 086c55f9221cf32e5056149b64c5519a1ee5c91c..28024f4d9a28519e4b5459d1f46ff15b95b48ccb 100644 (file)
--- a/re2c/test/posix_captures/repetition/56.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/56.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 075483daa0d79dfd474ff494a0c0689735ec7df0..f1d649381bbf930ad796b8d3c9e2ab7e96699a8b 100644 (file)
--- a/re2c/test/posix_captures/repetition/57.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/57.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 e8082defc4b026926651a3c1f57e715c582dbfa0..af0fc57494b470929e9942051f997878917482a7 100644 (file)
--- a/re2c/test/posix_captures/repetition/58.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/58.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/59.i--flex-syntax.c b/re2c/test/posix_captures/repetition/59.i--flex-syntax.c
index 26b933d1a4917dbbd157cc91a4acadada80ad1dc..af82fd09d647c3c497b4b7a5549f900b40406214 100644 (file)
--- a/re2c/test/posix_captures/repetition/59.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/59.i--flex-syntax.c
@@ -27,7 +27,7 @@ yy3:
                yyt2 = yyt3 = YYCURSOR;
                goto yy6;
        default:
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy5;
        }
 yy4:
@@ -36,19 +36,19 @@ yy4:
        case 0:         goto yy2;
        case 1:         goto yy7;
        case 2: 
-               yyt3 = yyt4;
+               yyt2 = yyt4;
                goto yy7;
        case 3: 
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy7;
        case 4: 
-               yyt3 = yyt6;
+               yyt2 = yyt6;
                goto yy7;
        case 5: 
-               yyt3 = yyt7;
+               yyt2 = yyt7;
                goto yy7;
        default:
-               yyt3 = yyt8;
+               yyt2 = yyt8;
                goto yy7;
        }
 yy5:
@@ -56,7 +56,7 @@ yy5:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
                yyt4 = YYCURSOR;
@@ -68,7 +68,7 @@ yy6:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
                yyt4 = YYCURSOR;
@@ -79,9 +79,9 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                {}
        }
 yy8:
@@ -89,7 +89,7 @@ yy8:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
                yyt5 = YYCURSOR;
@@ -101,7 +101,7 @@ yy9:
        switch (yych) {
        case 0x00:      goto yy7;
        case 'Y':
-               yyt2 = yyt5 = YYCURSOR;
+               yyt3 = yyt5 = YYCURSOR;
                goto yy11;
        default:
                yyt5 = YYCURSOR;
@@ -112,7 +112,7 @@ yy10:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt6 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
                yyt6 = YYCURSOR;
@@ -123,10 +123,10 @@ yy11:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt3 = yyt4;
+               yyt2 = yyt4;
                goto yy7;
        case 'Y':
-               yyt2 = yyt6 = YYCURSOR;
+               yyt3 = yyt6 = YYCURSOR;
                goto yy13;
        default:
                yyt6 = YYCURSOR;
@@ -137,7 +137,7 @@ yy12:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
                yyt7 = YYCURSOR;
@@ -148,10 +148,10 @@ yy13:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy7;
        case 'Y':
-               yyt2 = yyt7 = YYCURSOR;
+               yyt3 = yyt7 = YYCURSOR;
                goto yy15;
        default:
                yyt7 = YYCURSOR;
@@ -162,7 +162,7 @@ yy14:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt8 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
                yyt8 = YYCURSOR;
@@ -173,10 +173,10 @@ yy15:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt3 = yyt6;
+               yyt2 = yyt6;
                goto yy7;
        case 'Y':
-               yyt2 = yyt8 = YYCURSOR;
+               yyt3 = yyt8 = YYCURSOR;
                goto yy17;
        default:
                yyt8 = YYCURSOR;
@@ -187,7 +187,7 @@ yy16:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt9 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
                yyt9 = YYCURSOR;
@@ -198,10 +198,10 @@ yy17:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt3 = yyt7;
+               yyt2 = yyt7;
                goto yy7;
        case 'Y':
-               yyt2 = yyt9 = YYCURSOR;
+               yyt3 = yyt9 = YYCURSOR;
                goto yy19;
        default:
                yyt9 = YYCURSOR;
@@ -212,7 +212,7 @@ yy18:
        switch (yych) {
        case 0x00:      goto yy4;
        case 'Y':
-               yyt2 = yyt10 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
                yyt10 = YYCURSOR;
@@ -223,10 +223,10 @@ yy19:
        yych = *(YYMARKER = ++YYCURSOR);
        switch (yych) {
        case 0x00:
-               yyt3 = yyt8;
+               yyt2 = yyt8;
                goto yy7;
        case 'Y':
-               yyt2 = yyt10 = YYCURSOR;
+               yyt3 = yyt10 = YYCURSOR;
                goto yy21;
        default:
                yyt10 = YYCURSOR;
@@ -236,7 +236,7 @@ yy20:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy22;
        default:        goto yy4;
        }
@@ -244,15 +244,15 @@ yy21:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'Y':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy22;
        default:
-               yyt3 = yyt9;
+               yyt2 = yyt9;
                goto yy7;
        }
 yy22:
        ++YYCURSOR;
-       yyt3 = yyt10;
+       yyt2 = yyt10;
        goto yy7;
 }
 

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 5527f680159778592fe3a07d98a286a537ac0e74..8909a072b5a2d5c364545a6415d27248f0c269aa 100644 (file)
--- a/re2c/test/posix_captures/repetition/60.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/60.i--flex-syntax.c
@@ -79,8 +79,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 a2145bb69254165204e50ea8d07a014b95baf481..66bfa8e55b298a804ada798148fef3eaadef219d 100644 (file)
--- a/re2c/test/posix_captures/repetition/61.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/61.i--flex-syntax.c
@@ -77,8 +77,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 b095ba5cb61e68b5373b1c559e3a6715455d0f58..8b58ed07b5825ee056fc7ea4eae040a652939e68 100644 (file)
--- a/re2c/test/posix_captures/repetition/62.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/62.i--flex-syntax.c
@@ -70,8 +70,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 ff1cdd472bdc3acce6843cdcce4362bc0e994a5a..bcd5ec2dbc99655cbd5e61b220b4a438f17bbc89 100644 (file)
--- a/re2c/test/posix_captures/repetition/63.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/63.i--flex-syntax.c
@@ -67,8 +67,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 854de8c4b65bbb417eb180f6f5ec4c607728968b..23473f979c70dc3ee07f0b7ba2dc99a5493d361d 100644 (file)
--- a/re2c/test/posix_captures/repetition/64.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/64.i--flex-syntax.c
@@ -64,8 +64,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 d9863e692d18ece83170a422576efc94c6556c59..dc9c449a5b5a660dc98d482232029112a1990112 100644 (file)
--- a/re2c/test/posix_captures/repetition/65.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/65.i--flex-syntax.c
@@ -61,8 +61,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 97259d5cd568df05b27090a553b2fcc9c355aef2..e66f163fae033a4801c54221ff0b146f5512e961 100644 (file)
--- a/re2c/test/posix_captures/repetition/66.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/66.i--flex-syntax.c
@@ -61,8 +61,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

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 91ce3a4ac82d3ad42efbe7eb501a5ea37f4a3266..94335cbfa48397db00aa24f27fe1545735dfe91a 100644 (file)
--- a/re2c/test/posix_captures/repetition/67.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/67.i--flex-syntax.c
@@ -59,8 +59,8 @@ yy7:
                const size_t yynmatch = 2;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[1] = YYCURSOR;
                yypmatch[2] = yyt2;
+               yypmatch[1] = YYCURSOR;
                yypmatch[3] = YYCURSOR - 1;
                {}
        }

diff --git a/re2c/test/posix_captures/repetition/68.i--flex-syntax.c b/re2c/test/posix_captures/repetition/68.i--flex-syntax.c
index 3a2f3d96bc1df98bc66ef9370f218084bc40f831..86c2e3aaa023b00bec8a947a05e1ad96184b2d24 100644 (file)
--- a/re2c/test/posix_captures/repetition/68.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/68.i--flex-syntax.c
@@ -16,7 +16,7 @@
                yyt1 = yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt5 = NULL;
+               yyt3 = yyt5 = NULL;
                yyt1 = yyt4 = YYCURSOR;
                goto yy9;
        default:
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}
        }
@@ -45,17 +45,17 @@ yy3:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy11;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -73,7 +73,7 @@ yy6:
                yyt1 = yyt4 = YYCURSOR;
                goto yy2;
        } else {
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -86,18 +86,18 @@ yy7:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -107,7 +107,7 @@ yy9:
        switch (yych) {
        case 'd':       goto yy9;
        default:
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy2;
        }
 yy11:
@@ -120,18 +120,18 @@ yy11:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy13;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy12:
@@ -158,10 +158,10 @@ yy13:
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt5 = yyt2;
+               yyt5 = yyt3;
                goto yy7;
        default:
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 }

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 6f1c730385a8b8417954bd078c41379fe8bf3a5d..95010548afbea7bbbeaeda475a47e23006b28048 100644 (file)
--- a/re2c/test/posix_captures/repetition/69.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/69.i--flex-syntax.c
@@ -52,9 +52,9 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}

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 83bad70c4c92c69a12d9057cbffa9c39ea1885d1..4ea73c14a0cd014961e27a0f6d115363b517c2e0 100644 (file)
--- a/re2c/test/posix_captures/repetition/70.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/70.i--flex-syntax.c
@@ -91,9 +91,9 @@ yy9:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 a117ad0fd962dfebb0be00f303b231029ca7de13..b6e5a039350e41c640db6f0c8cf749f82222f329 100644 (file)
--- a/re2c/test/posix_captures/repetition/71.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/71.i--flex-syntax.c
@@ -127,9 +127,9 @@ yy14:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 ae9e565914eef96874d1c567cc61edd5a7b5b4d2..0648ed31e98ff32d0a665cfa980003022257dd81 100644 (file)
--- a/re2c/test/posix_captures/repetition/72.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/72.i--flex-syntax.c
@@ -172,9 +172,9 @@ yy20:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/repetition/73.i--flex-syntax.c b/re2c/test/posix_captures/repetition/73.i--flex-syntax.c
index d00dfe8ea91b9036653f5639ed29f11ebcaa6182..208f6bc1891a89303a5d7a902d59495b427ff049 100644 (file)
--- a/re2c/test/posix_captures/repetition/73.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/73.i--flex-syntax.c
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt4;
                yypmatch[3] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}
        }

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 a1c31f1c2a9e6ebeb69e3a5d96e7c6aee24a9d1d..25e00387093e7dbe50d7b9e8d48c3f610894de52 100644 (file)
--- a/re2c/test/posix_captures/repetition/74.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/74.i--flex-syntax.c
@@ -39,9 +39,9 @@ yy4:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 38cb93c8ff516cc8bbfb35cb92d648518419128b..e045dfa958a5b64a996b2dfa514365e415ef7011 100644 (file)
--- a/re2c/test/posix_captures/repetition/75.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/75.i--flex-syntax.c
@@ -89,9 +89,9 @@ yy8:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 6d0ad75bc246b981cdd9731cca8c2b255394e453..9f984a37973a8ca60ece236b7d6880a9144b52f9 100644 (file)
--- a/re2c/test/posix_captures/repetition/76.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/76.i--flex-syntax.c
@@ -125,9 +125,9 @@ yy13:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 7c2b137d0827a7a82b84d81dede1a3615508ca68..367f78e05f0da7f9b3f1584069353b74bd5e9192 100644 (file)
--- a/re2c/test/posix_captures/repetition/77.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/77.i--flex-syntax.c
@@ -170,9 +170,9 @@ yy19:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/repetition/78.i--flex-syntax.c b/re2c/test/posix_captures/repetition/78.i--flex-syntax.c
index 3a2f3d96bc1df98bc66ef9370f218084bc40f831..86c2e3aaa023b00bec8a947a05e1ad96184b2d24 100644 (file)
--- a/re2c/test/posix_captures/repetition/78.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/78.i--flex-syntax.c
@@ -16,7 +16,7 @@
                yyt1 = yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt5 = NULL;
+               yyt3 = yyt5 = NULL;
                yyt1 = yyt4 = YYCURSOR;
                goto yy9;
        default:
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}
        }
@@ -45,17 +45,17 @@ yy3:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy11;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -73,7 +73,7 @@ yy6:
                yyt1 = yyt4 = YYCURSOR;
                goto yy2;
        } else {
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -86,18 +86,18 @@ yy7:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -107,7 +107,7 @@ yy9:
        switch (yych) {
        case 'd':       goto yy9;
        default:
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy2;
        }
 yy11:
@@ -120,18 +120,18 @@ yy11:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy13;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy12:
@@ -158,10 +158,10 @@ yy13:
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt5 = yyt2;
+               yyt5 = yyt3;
                goto yy7;
        default:
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 }

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 6f1c730385a8b8417954bd078c41379fe8bf3a5d..95010548afbea7bbbeaeda475a47e23006b28048 100644 (file)
--- a/re2c/test/posix_captures/repetition/79.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/79.i--flex-syntax.c
@@ -52,9 +52,9 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/repetition/80.i--flex-syntax.c b/re2c/test/posix_captures/repetition/80.i--flex-syntax.c
index 3a2f3d96bc1df98bc66ef9370f218084bc40f831..86c2e3aaa023b00bec8a947a05e1ad96184b2d24 100644 (file)
--- a/re2c/test/posix_captures/repetition/80.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/80.i--flex-syntax.c
@@ -16,7 +16,7 @@
                yyt1 = yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt5 = NULL;
+               yyt3 = yyt5 = NULL;
                yyt1 = yyt4 = YYCURSOR;
                goto yy9;
        default:
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}
        }
@@ -45,17 +45,17 @@ yy3:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy11;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -73,7 +73,7 @@ yy6:
                yyt1 = yyt4 = YYCURSOR;
                goto yy2;
        } else {
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -86,18 +86,18 @@ yy7:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -107,7 +107,7 @@ yy9:
        switch (yych) {
        case 'd':       goto yy9;
        default:
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy2;
        }
 yy11:
@@ -120,18 +120,18 @@ yy11:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy13;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy12:
@@ -158,10 +158,10 @@ yy13:
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt5 = yyt2;
+               yyt5 = yyt3;
                goto yy7;
        default:
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 }

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 6f1c730385a8b8417954bd078c41379fe8bf3a5d..95010548afbea7bbbeaeda475a47e23006b28048 100644 (file)
--- a/re2c/test/posix_captures/repetition/81.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/81.i--flex-syntax.c
@@ -52,9 +52,9 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}

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 83bad70c4c92c69a12d9057cbffa9c39ea1885d1..4ea73c14a0cd014961e27a0f6d115363b517c2e0 100644 (file)
--- a/re2c/test/posix_captures/repetition/82.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/82.i--flex-syntax.c
@@ -91,9 +91,9 @@ yy9:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 a117ad0fd962dfebb0be00f303b231029ca7de13..b6e5a039350e41c640db6f0c8cf749f82222f329 100644 (file)
--- a/re2c/test/posix_captures/repetition/83.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/83.i--flex-syntax.c
@@ -127,9 +127,9 @@ yy14:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 ae9e565914eef96874d1c567cc61edd5a7b5b4d2..0648ed31e98ff32d0a665cfa980003022257dd81 100644 (file)
--- a/re2c/test/posix_captures/repetition/84.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/84.i--flex-syntax.c
@@ -172,9 +172,9 @@ yy20:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt2;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/repetition/85.i--flex-syntax.c b/re2c/test/posix_captures/repetition/85.i--flex-syntax.c
index d00dfe8ea91b9036653f5639ed29f11ebcaa6182..208f6bc1891a89303a5d7a902d59495b427ff049 100644 (file)
--- a/re2c/test/posix_captures/repetition/85.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/85.i--flex-syntax.c
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
+               yypmatch[2] = yyt4;
                yypmatch[3] = yyt2;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}
        }

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 a1c31f1c2a9e6ebeb69e3a5d96e7c6aee24a9d1d..25e00387093e7dbe50d7b9e8d48c3f610894de52 100644 (file)
--- a/re2c/test/posix_captures/repetition/86.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/86.i--flex-syntax.c
@@ -39,9 +39,9 @@ yy4:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 38cb93c8ff516cc8bbfb35cb92d648518419128b..e045dfa958a5b64a996b2dfa514365e415ef7011 100644 (file)
--- a/re2c/test/posix_captures/repetition/87.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/87.i--flex-syntax.c
@@ -89,9 +89,9 @@ yy8:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 6d0ad75bc246b981cdd9731cca8c2b255394e453..9f984a37973a8ca60ece236b7d6880a9144b52f9 100644 (file)
--- a/re2c/test/posix_captures/repetition/88.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/88.i--flex-syntax.c
@@ -125,9 +125,9 @@ yy13:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

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 7c2b137d0827a7a82b84d81dede1a3615508ca68..367f78e05f0da7f9b3f1584069353b74bd5e9192 100644 (file)
--- a/re2c/test/posix_captures/repetition/89.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/89.i--flex-syntax.c
@@ -170,9 +170,9 @@ yy19:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt1;
                yypmatch[4] = yyt3;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt1;
                yypmatch[3] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/repetition/90.i--flex-syntax.c b/re2c/test/posix_captures/repetition/90.i--flex-syntax.c
index 3a2f3d96bc1df98bc66ef9370f218084bc40f831..86c2e3aaa023b00bec8a947a05e1ad96184b2d24 100644 (file)
--- a/re2c/test/posix_captures/repetition/90.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/90.i--flex-syntax.c
@@ -16,7 +16,7 @@
                yyt1 = yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt5 = NULL;
+               yyt3 = yyt5 = NULL;
                yyt1 = yyt4 = YYCURSOR;
                goto yy9;
        default:
@@ -29,10 +29,10 @@ yy2:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt1;
-               yypmatch[3] = yyt2;
+               yypmatch[2] = yyt2;
+               yypmatch[3] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[5] = YYCURSOR;
                {}
        }
@@ -45,17 +45,17 @@ yy3:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt2 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy11;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -73,7 +73,7 @@ yy6:
                yyt1 = yyt4 = YYCURSOR;
                goto yy2;
        } else {
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy7:
@@ -86,18 +86,18 @@ yy7:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy9:
@@ -107,7 +107,7 @@ yy9:
        switch (yych) {
        case 'd':       goto yy9;
        default:
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                goto yy2;
        }
 yy11:
@@ -120,18 +120,18 @@ yy11:
                yyt5 = YYCURSOR;
                goto yy3;
        case 'b':
-               yyt3 = yyt5;
+               yyt2 = yyt5;
                yyt5 = YYCURSOR;
                goto yy5;
        case 'c':
-               yyt3 = YYCURSOR;
+               yyt2 = YYCURSOR;
                goto yy13;
        case 'd':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy9;
        default:
-               yyt3 = yyt5;
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt5;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 yy12:
@@ -158,10 +158,10 @@ yy13:
                yyt5 = YYCURSOR;
                goto yy7;
        case 'd':
-               yyt5 = yyt2;
+               yyt5 = yyt3;
                goto yy7;
        default:
-               yyt2 = yyt4 = YYCURSOR;
+               yyt3 = yyt4 = YYCURSOR;
                goto yy2;
        }
 }

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 6f1c730385a8b8417954bd078c41379fe8bf3a5d..95010548afbea7bbbeaeda475a47e23006b28048 100644 (file)
--- a/re2c/test/posix_captures/repetition/91.i--flex-syntax.c
+++ b/re2c/test/posix_captures/repetition/91.i--flex-syntax.c
@@ -52,9 +52,9 @@ yy5:
                const size_t yynmatch = 3;
                const YYCTYPE *yypmatch[yynmatch * 2];
                yypmatch[0] = yyt2;
+               yypmatch[2] = yyt3;
                yypmatch[4] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[2] = yyt3;
                yypmatch[3] = yyt4;
                yypmatch[5] = YYCURSOR;
                {}

diff --git a/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c b/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c
index 1e4e8617480fbf5e23a2ea5803183c1a6a4311c0..d8467f2260691e2c4dad68e48ac84b7c2a016094 100644 (file)
--- a/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c
+++ b/re2c/test/posix_captures/uncomparable_bottoms.i--posix-captures.c
@@ -14,7 +14,7 @@
                goto yy3;
        case 'b':
                yyt2 = yyt5 = NULL;
-               yyt1 = yyt4 = YYCURSOR;
+               yyt1 = yyt3 = YYCURSOR;
                goto yy4;
        default:
                yyt2 = yyt3 = yyt4 = yyt5 = NULL;
@@ -28,16 +28,16 @@ yy2:
                yypmatch[0] = yyt1;
                yypmatch[2] = yyt5;
                yypmatch[3] = yyt2;
-               yypmatch[5] = yyt3;
+               yypmatch[4] = yyt3;
+               yypmatch[5] = yyt4;
                yypmatch[1] = YYCURSOR;
-               yypmatch[4] = yyt4;
                {}
        }
 yy3:
        yych = *++YYCURSOR;
        switch (yych) {
        case 'b':
-               yyt2 = yyt4 = YYCURSOR;
+               yyt2 = yyt3 = YYCURSOR;
                goto yy4;
        default:
                yyt3 = yyt4 = NULL;
@@ -51,7 +51,7 @@ yy4:
        switch (yych) {
        case 'b':       goto yy5;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy2;
        }
 yy5:
@@ -60,10 +60,10 @@ yy5:
        yych = *YYCURSOR;
        switch (yych) {
        case 'b':
-               yyt4 = YYCURSOR;
+               yyt3 = YYCURSOR;
                goto yy4;
        default:
-               yyt3 = YYCURSOR;
+               yyt4 = YYCURSOR;
                goto yy2;
        }
 }