Don't delay reading next character until dispatch.

Instead of sometimes generating code like this:

    ++YYCURSOR;
    switch ((yych = *YYCURSOR)) {

re2c now always generates

    yych = *++YYCURSOR;
    switch (yych) {

There's not much difference: it's hard to say which would be better
optimized by C/C++ compiler. Most likely they would be optimized
equally well; practical experiments with GCC -O2 resulted in bit-to-bit
identical binaries.

However, dropping the first form allows to cut off a lot of tricky code
in re2c itself (a whole layer of code spread across multiple files was
tracking whether next input character has been already read or not).

Changes to the test results are multiple, but trivial; they have been
verified with skeleton.

diff --git a/re2c/src/codegen/emit.h b/re2c/src/codegen/emit.h
index 2fdbdcf7f1b54df5920689f8a442c15c9d8b951c..382856d73532c6aa5ee5e29ee0f7fd2fa0b0972e 100644 (file)
--- a/re2c/src/codegen/emit.h
+++ b/re2c/src/codegen/emit.h
@@ -8,10 +8,10 @@ namespace re2c {
 
 typedef std::vector<std::string> code_lines_t;
 
-void emit_action(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s, const std::set<label_t> &used_labels);
-void gen_goto_plain(OutputFile &o, uint32_t ind, bool &readCh, const State *to, const DFA &dfa, tcid_t tcid);
-void gen_goto_case(OutputFile &o, uint32_t ind, bool &readCh, const State *to, const DFA &dfa, tcid_t tcid);
-void gen_goto_if(OutputFile &o, uint32_t ind, bool &readCh, const State *to, const DFA &dfa, tcid_t tcid);
+void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa, const State *s, const std::set<label_t> &used_labels);
+void gen_goto_plain(OutputFile &o, uint32_t ind, const State *to, const DFA &dfa, tcid_t tcid);
+void gen_goto_case(OutputFile &o, uint32_t ind, const State *to, const DFA &dfa, tcid_t tcid);
+void gen_goto_if(OutputFile &o, uint32_t ind, const State *to, const DFA &dfa, tcid_t tcid);
 void gen_settags(code_lines_t &code, const DFA &dfa, tcid_t tcid);
 std::string vartag_name(tagver_t ver);
 std::string vartag_expr(tagver_t ver);

diff --git a/re2c/src/codegen/emit_action.cc b/re2c/src/codegen/emit_action.cc
index f0b9fc63b5addee8f6a2c24d28ef16b6b0a8ec7c..2d748dbbf306b1de76706841924f0896bffd309c 100644 (file)
--- a/re2c/src/codegen/emit_action.cc
+++ b/re2c/src/codegen/emit_action.cc
@@ -21,37 +21,37 @@ namespace re2c
 
 class label_t;
 
-static void need(OutputFile &o, uint32_t ind, bool &readCh, size_t n, bool bSetMarker);
-static void emit_match(OutputFile &o, uint32_t ind, bool &readCh, const State *s);
-static void emit_initial(OutputFile &o, uint32_t ind, bool &readCh, const State *s, const std::set<label_t> &used_labels, bool save_yyaccept);
-static void emit_save(OutputFile &o, uint32_t ind, bool &readCh, const State *s, bool save_yyaccept);
-static void emit_accept_binary(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s, size_t l, size_t r);
-static void emit_accept(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s);
+static void need(OutputFile &o, uint32_t ind, size_t n, bool bSetMarker);
+static void emit_match(OutputFile &o, uint32_t ind, const State *s);
+static void emit_initial(OutputFile &o, uint32_t ind, const State *s, const std::set<label_t> &used_labels, bool save_yyaccept);
+static void emit_save(OutputFile &o, uint32_t ind, const State *s, bool save_yyaccept);
+static void emit_accept_binary(OutputFile &o, uint32_t ind, const DFA &dfa, const State *s, size_t l, size_t r);
+static void emit_accept(OutputFile &o, uint32_t ind, const DFA &dfa, const State *s);
 static void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx);
 static void genYYFill(OutputFile &o, size_t need);
 static void genSetCondition(OutputFile &o, uint32_t ind, const std::string &cond);
 static void genSetState(OutputFile &o, uint32_t ind, uint32_t fillIndex);
-static void gen_goto(code_lines_t &code, bool &readCh, const State *to, const DFA &dfa, tcid_t tcid);
+static void gen_goto(code_lines_t &code, const State *to, const DFA &dfa, tcid_t tcid);
 static void gen_fintags(OutputFile &o, uint32_t ind, const DFA &dfa, const Rule &rule);
 
-void emit_action(OutputFile &o, uint32_t ind, bool &readCh,
-       const DFA &dfa, const State *s, const std::set<label_t> &used_labels)
+void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa,
+       const State *s, const std::set<label_t> &used_labels)
 {
        const bool save_yyaccept = dfa.accepts.size() > 1;
        switch (s->action.type) {
                case Action::MATCH:
-                       emit_match(o, ind, readCh, s);
+                       emit_match(o, ind, s);
                        break;
                case Action::INITIAL:
-                       emit_initial(o, ind, readCh, s, used_labels, save_yyaccept);
+                       emit_initial(o, ind, s, used_labels, save_yyaccept);
                        break;
                case Action::SAVE:
-                       emit_save(o, ind, readCh, s, save_yyaccept);
+                       emit_save(o, ind, s, save_yyaccept);
                        break;
                case Action::MOVE:
                        break;
                case Action::ACCEPT:
-                       emit_accept(o, ind, readCh, dfa, s);
+                       emit_accept(o, ind, dfa, s);
                        break;
                case Action::RULE:
                        emit_rule(o, ind, dfa, s->action.info.rule);
@@ -59,34 +59,24 @@ void emit_action(OutputFile &o, uint32_t ind, bool &readCh,
        }
 }
 
-void emit_match(OutputFile &o, uint32_t ind, bool &readCh, const State *s)
+void emit_match(OutputFile &o, uint32_t ind, const State *s)
 {
-       const bool
-               end = s->go.nSpans == 1 && s->go.span[0].to->action.type == Action::RULE,
-               read_ahead = s->next && s->next->action.type != Action::RULE;
+       const bool end = s->go.nSpans == 1
+               && s->go.span[0].to->action.type == Action::RULE;
 
        if (s->fill != 0) {
                o.wstring(opts->input_api.stmt_skip(ind));
+               need(o, ind, s->fill, false);
        } else if (end) {
                // do not read next char if all transitions go to rule state
                o.wstring(opts->input_api.stmt_skip(ind));
-               readCh = false;
-       } else if (!read_ahead) {
-               // delay reading next char
-               o.wstring(opts->input_api.stmt_skip(ind));
-               readCh = true;
        } else {
                o.wstring(opts->input_api.stmt_skip_peek(ind));
-               readCh = false;
-       }
-
-       if (s->fill != 0) {
-               need(o, ind, readCh, s->fill, false);
        }
 }
 
-void emit_initial(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *s, const std::set<label_t> &used_labels, bool save_yyaccept)
+void emit_initial(OutputFile &o, uint32_t ind, const State *s,
+       const std::set<label_t> &used_labels, bool save_yyaccept)
 {
        const Initial &initial = *s->action.info.initial;
 
@@ -115,17 +105,16 @@ void emit_initial(OutputFile &o, uint32_t ind, bool &readCh,
        }
 
        if (s->fill != 0) {
-               need(o, ind, readCh, s->fill, initial.setMarker);
+               need(o, ind, s->fill, initial.setMarker);
        } else {
                if (initial.setMarker) {
                        o.wstring(opts->input_api.stmt_backup(ind));
                }
-               readCh = false;
        }
 }
 
-void emit_save(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *const s, bool save_yyaccept)
+void emit_save(OutputFile &o, uint32_t ind, const State *const s,
+       bool save_yyaccept)
 {
        if (save_yyaccept) {
                o.wind(ind).wstring(opts->yyaccept).ws(" = ")
@@ -134,32 +123,30 @@ void emit_save(OutputFile &o, uint32_t ind, bool &readCh,
 
        if (s->fill != 0) {
                o.wstring(opts->input_api.stmt_skip_backup(ind));
-               need(o, ind, readCh, s->fill, false);
+               need(o, ind, s->fill, false);
        } else {
                o.wstring(opts->input_api.stmt_skip_backup_peek(ind));
-               readCh = false;
        }
 }
 
-void emit_accept_binary(OutputFile &o, uint32_t ind, bool &readCh,
-       const DFA &dfa, const State *s, size_t l, size_t r)
+void emit_accept_binary(OutputFile &o, uint32_t ind, const DFA &dfa,
+       const State *s, size_t l, size_t r)
 {
        if (l < r) {
                const size_t m = (l + r) >> 1;
                o.wind(ind).ws("if (").wstring(opts->yyaccept)
                        .ws(r == l+1 ? " == " : " <= ").wu64(m).ws(") {\n");
-               emit_accept_binary (o, ++ind, readCh, dfa, s, l, m);
+               emit_accept_binary (o, ++ind, dfa, s, l, m);
                o.wind(--ind).ws("} else {\n");
-               emit_accept_binary (o, ++ind, readCh, dfa, s, m + 1, r);
+               emit_accept_binary (o, ++ind, dfa, s, m + 1, r);
                o.wind(--ind).ws("}\n");
        } else {
                const accept_t &acc = *s->action.info.accepts;
-               gen_goto_plain(o, ind, readCh, acc[l].first, dfa, acc[l].second);
+               gen_goto_plain(o, ind, acc[l].first, dfa, acc[l].second);
        }
 }
 
-void emit_accept(OutputFile &o, uint32_t ind, bool &readCh,
-       const DFA &dfa, const State *s)
+void emit_accept(OutputFile &o, uint32_t ind, const DFA &dfa, const State *s)
 {
        const accept_t &acc = *s->action.info.accepts;
        const size_t nacc = acc.size();
@@ -169,14 +156,10 @@ void emit_accept(OutputFile &o, uint32_t ind, bool &readCh,
        }
 
        o.wstring(opts->input_api.stmt_restore(ind));
-       if (readCh) {
-               o.wstring(opts->input_api.stmt_peek(ind));
-               readCh = false;
-       }
 
        // only one possible 'yyaccept' value: unconditional jump
        if (nacc == 1) {
-               gen_goto_plain(o, ind, readCh, acc[0].first, dfa, acc[0].second);
+               gen_goto_plain(o, ind, acc[0].first, dfa, acc[0].second);
                return;
        }
 
@@ -208,7 +191,7 @@ void emit_accept(OutputFile &o, uint32_t ind, bool &readCh,
 
        // nested ifs
        if (opts->sFlag || nacc == 2) {
-               emit_accept_binary(o, ind, readCh, dfa, s, 0, nacc - 1);
+               emit_accept_binary(o, ind, dfa, s, 0, nacc - 1);
                return;
        }
 
@@ -216,10 +199,10 @@ void emit_accept(OutputFile &o, uint32_t ind, bool &readCh,
        o.wind(ind).ws("switch (").wstring(opts->yyaccept).ws(") {\n");
        for (uint32_t i = 0; i < nacc - 1; ++i) {
                o.wind(ind).ws("case ").wu32(i).ws(": ");
-               gen_goto_case(o, ind, readCh, acc[i].first, dfa, acc[i].second);
+               gen_goto_case(o, ind, acc[i].first, dfa, acc[i].second);
        }
        o.wind(ind).ws("default:");
-       gen_goto_case(o, ind, readCh, acc[nacc - 1].first, dfa, acc[nacc - 1].second);
+       gen_goto_case(o, ind, acc[nacc - 1].first, dfa, acc[nacc - 1].second);
        o.wind(ind).ws("}\n");
 }
 
@@ -253,7 +236,7 @@ void emit_rule(OutputFile &o, uint32_t ind, const DFA &dfa, size_t rule_idx)
        }
 }
 
-void need(OutputFile &o, uint32_t ind, bool &readCh, size_t n, bool bSetMarker)
+void need(OutputFile &o, uint32_t ind, size_t n, bool bSetMarker)
 {
        uint32_t fillIndex = last_fill_index;
 
@@ -287,7 +270,6 @@ void need(OutputFile &o, uint32_t ind, bool &readCh, size_t n, bool bSetMarker)
                } else {
                        o.wstring(opts->input_api.stmt_peek(ind));
                }
-               readCh = false;
        }
 }
 
@@ -327,11 +309,11 @@ void genSetState(OutputFile &o, uint32_t ind, uint32_t fillIndex)
        o.ws("\n");
 }
 
-void gen_goto_case(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *to, const DFA &dfa, tcid_t tcid)
+void gen_goto_case(OutputFile &o, uint32_t ind, const State *to,
+       const DFA &dfa, tcid_t tcid)
 {
        code_lines_t code;
-       gen_goto(code, readCh, to, dfa, tcid);
+       gen_goto(code, to, dfa, tcid);
        const size_t lines = code.size();
 
        if (lines == 1) {
@@ -344,11 +326,11 @@ void gen_goto_case(OutputFile &o, uint32_t ind, bool &readCh,
        }
 }
 
-void gen_goto_if(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *to, const DFA &dfa, tcid_t tcid)
+void gen_goto_if(OutputFile &o, uint32_t ind, const State *to,
+       const DFA &dfa, tcid_t tcid)
 {
        code_lines_t code;
-       gen_goto(code, readCh, to, dfa, tcid);
+       gen_goto(code, to, dfa, tcid);
        const size_t lines = code.size();
 
        if (lines == 1) {
@@ -362,11 +344,11 @@ void gen_goto_if(OutputFile &o, uint32_t ind, bool &readCh,
        }
 }
 
-void gen_goto_plain(OutputFile &o, uint32_t ind, bool &readCh,
-       const State *to, const DFA &dfa, tcid_t tcid)
+void gen_goto_plain(OutputFile &o, uint32_t ind, const State *to,
+       const DFA &dfa, tcid_t tcid)
 {
        code_lines_t code;
-       gen_goto(code, readCh, to, dfa, tcid);
+       gen_goto(code, to, dfa, tcid);
        const size_t lines = code.size();
 
        for (size_t i = 0; i < lines; ++i) {
@@ -374,16 +356,9 @@ void gen_goto_plain(OutputFile &o, uint32_t ind, bool &readCh,
        }
 }
 
-void gen_goto(code_lines_t &code, bool &readCh, const State *to,
-       const DFA &dfa, tcid_t tcid)
+void gen_goto(code_lines_t &code, const State *to, const DFA &dfa,
+       tcid_t tcid)
 {
-       if (to == NULL) {
-               readCh = false;
-       }
-       if (readCh) {
-               code.push_back(opts->input_api.stmt_peek(0));
-               readCh = false;
-       }
        gen_settags(code, dfa, tcid);
        if (to) {
                code.push_back("goto " + opts->labelPrefix

diff --git a/re2c/src/codegen/emit_dfa.cc b/re2c/src/codegen/emit_dfa.cc
index c9d5cc673ed7c698db409936d61f3b95816e4169..70ef6e8fac4439917ca0fe0b852c9fb9c7b91f94 100644 (file)
--- a/re2c/src/codegen/emit_dfa.cc
+++ b/re2c/src/codegen/emit_dfa.cc
@@ -85,10 +85,9 @@ void DFA::emit_body(OutputFile &o, uint32_t& ind,
        }
 
        for (State * s = head; s; s = s->next) {
-               bool readCh = false;
                emit_state(o, ind, s, used_labels.count(s->label));
-               emit_action(o, ind, readCh, *this, s, used_labels);
-               s->go.emit(o, ind, *this, readCh);
+               emit_action(o, ind, *this, s, used_labels);
+               s->go.emit(o, ind, *this);
        }
 }
 
@@ -130,8 +129,7 @@ void DFA::emit_dot(
                                        .ws("\"]").ws("\n");
                        }
                }
-               bool readCh = false;
-               s->go.emit(o, 0, *this, readCh);
+               s->go.emit(o, 0, *this);
        }
        if (!opts->cFlag || last_cond) {
                o.ws("}\n");

diff --git a/re2c/src/codegen/go.h b/re2c/src/codegen/go.h
index 7c65f447e853c3f83f04f39da92bebc332cf2c3b..e00fa056f18fce0f8fe08536935bd7c6ecc29e31 100644 (file)
--- a/re2c/src/codegen/go.h
+++ b/re2c/src/codegen/go.h
@@ -46,7 +46,7 @@ struct Cases
        void add(uint32_t lb, uint32_t ub, State *to, tcid_t tags);
        Cases(const Span *spans, uint32_t nspans);
        ~Cases();
-       void emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh) const;
+       void emit(OutputFile &o, uint32_t ind, const DFA &dfa) const;
        void used_labels(std::set<label_t> &used);
        FORBID_COPY(Cases);
 };
@@ -65,7 +65,7 @@ struct Binary
        If * els;
        Binary (const Span * s, uint32_t n, const State * next);
        ~Binary ();
-       void emit (OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh);
+       void emit (OutputFile &o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 
        FORBID_COPY (Binary);
@@ -94,7 +94,7 @@ struct Linear
 
        Linear(const Span *s, uint32_t n, const State *next);
        ~Linear();
-       void emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh);
+       void emit(OutputFile &o, uint32_t ind, const DFA &dfa);
        void used_labels(std::set<label_t> &used);
        FORBID_COPY(Linear);
 };
@@ -113,7 +113,7 @@ struct If
        } info;
        If (type_t t, const Span * sp, uint32_t nsp, const State * next);
        ~If ();
-       void emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh);
+       void emit (OutputFile & o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 };
 
@@ -131,7 +131,7 @@ struct SwitchIf
        } info;
        SwitchIf (const Span * sp, uint32_t nsp, const State * next);
        ~SwitchIf ();
-       void emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh);
+       void emit (OutputFile & o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 };
 
@@ -143,7 +143,7 @@ struct GoBitmap
        SwitchIf * lgo;
        GoBitmap (const Span * span, uint32_t nSpans, const Span * hspan, uint32_t hSpans, const BitMap * bm, const State * bm_state, const State * next);
        ~GoBitmap ();
-       void emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh);
+       void emit (OutputFile & o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 
        FORBID_COPY (GoBitmap);
@@ -170,7 +170,7 @@ struct Cpgoto
        CpgotoTable * table;
        Cpgoto (const Span * span, uint32_t nSpans, const Span * hspan, uint32_t hSpans, const State * next);
        ~Cpgoto ();
-       void emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh);
+       void emit (OutputFile & o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 
        FORBID_COPY (Cpgoto);
@@ -211,7 +211,7 @@ struct Go
        Go ();
        ~Go ();
        void init (const State * from);
-       void emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh);
+       void emit (OutputFile & o, uint32_t ind, const DFA &dfa);
        void used_labels (std::set<label_t> & used);
 
        Go (const Go & g)

diff --git a/re2c/src/codegen/go_emit.cc b/re2c/src/codegen/go_emit.cc
index 5ba662c19f39d1ae5293ca77c077c053a706c592..9cc17c1bd240b62bf51ac498202b76d9073639d8 100644 (file)
--- a/re2c/src/codegen/go_emit.cc
+++ b/re2c/src/codegen/go_emit.cc
@@ -19,35 +19,21 @@
 namespace re2c
 {
 
-static void output_if (OutputFile & o, uint32_t ind, bool & readCh, const std::string & compare, uint32_t value);
-static std::string output_yych (bool & readCh);
-static std::string output_hgo (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh, SwitchIf * hgo);
+static void output_if (OutputFile & o, uint32_t ind, const std::string & compare, uint32_t value);
+static std::string output_hgo (OutputFile & o, uint32_t ind, const DFA &dfa, SwitchIf * hgo);
 
-std::string output_yych (bool & readCh)
+void output_if (OutputFile & o, uint32_t ind, const std::string & compare, uint32_t value)
 {
-       if (readCh)
-       {
-               readCh = false;
-               return "(" + opts->input_api.expr_peek_save () + ")";
-       }
-       else
-       {
-               return opts->yych;
-       }
-}
-
-void output_if (OutputFile & o, uint32_t ind, bool & readCh, const std::string & compare, uint32_t value)
-{
-       o.wind(ind).ws("if (").wstring(output_yych (readCh)).ws(" ").wstring(compare).ws(" ").wc_hex (value).ws(") ");
+       o.wind(ind).ws("if (").wstring(opts->yych).ws(" ").wstring(compare).ws(" ").wc_hex (value).ws(") ");
 }
 
-std::string output_hgo (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh, SwitchIf * hgo)
+std::string output_hgo (OutputFile & o, uint32_t ind, const DFA &dfa, SwitchIf * hgo)
 {
-       std::string yych = output_yych (readCh);
+       std::string yych = opts->yych;
        if (hgo != NULL)
        {
                o.wind(ind).ws("if (").wstring(yych).ws(" & ~0xFF) {\n");
-               hgo->emit (o, ind + 1, dfa, readCh);
+               hgo->emit (o, ind + 1, dfa);
                o.wind(ind).ws("} else ");
                yych = opts->yych;
        }
@@ -80,67 +66,67 @@ void Case::emit (OutputFile & o, uint32_t ind) const
        }
 }
 
-void Cases::emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh) const
+void Cases::emit(OutputFile &o, uint32_t ind, const DFA &dfa) const
 {
-       o.wind(ind).ws("switch (").wstring(output_yych(readCh)).ws(") {\n");
+       o.wind(ind).ws("switch (").wstring(opts->yych).ws(") {\n");
 
        for (uint32_t i = 1; i < cases_size; ++i) {
                const Case &c = cases[i];
                c.emit(o, ind);
-               gen_goto_case(o, ind, readCh, c.to, dfa, c.tags);
+               gen_goto_case(o, ind, c.to, dfa, c.tags);
        }
 
        // default case must be the last one
        const Case &c = cases[0];
        o.wind(ind).ws("default:");
-       gen_goto_case(o, ind, readCh, c.to, dfa, c.tags);
+       gen_goto_case(o, ind, c.to, dfa, c.tags);
 
        o.wind(ind).ws("}\n");
 }
 
-void Binary::emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh)
+void Binary::emit(OutputFile &o, uint32_t ind, const DFA &dfa)
 {
-       output_if(o, ind, readCh, cond->compare, cond->value);
+       output_if(o, ind, cond->compare, cond->value);
        o.ws("{\n");
-       thn->emit(o, ind + 1, dfa, readCh);
+       thn->emit(o, ind + 1, dfa);
        o.wind(ind).ws("} else {\n");
-       els->emit(o, ind + 1, dfa, readCh);
+       els->emit(o, ind + 1, dfa);
        o.wind(ind).ws("}\n");
 }
 
-void Linear::emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh)
+void Linear::emit(OutputFile &o, uint32_t ind, const DFA &dfa)
 {
        for (uint32_t i = 0; i < nbranches; ++i) {
                const Branch &b = branches[i];
                const Cond *cond = b.cond;
                if (cond) {
-                       output_if(o, ind, readCh, cond->compare, cond->value);
-                       gen_goto_if(o, ind, readCh, b.to, dfa, b.tags);
+                       output_if(o, ind, cond->compare, cond->value);
+                       gen_goto_if(o, ind, b.to, dfa, b.tags);
                } else {
-                       gen_goto_plain(o, ind, readCh, b.to, dfa, b.tags);
+                       gen_goto_plain(o, ind, b.to, dfa, b.tags);
                }
        }
 }
 
-void If::emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh)
+void If::emit(OutputFile &o, uint32_t ind, const DFA &dfa)
 {
        switch (type) {
-               case BINARY: info.binary->emit(o, ind, dfa, readCh); break;
-               case LINEAR: info.linear->emit(o, ind, dfa, readCh); break;
+               case BINARY: info.binary->emit(o, ind, dfa); break;
+               case LINEAR: info.linear->emit(o, ind, dfa); break;
        }
 }
 
-void SwitchIf::emit(OutputFile &o, uint32_t ind, const DFA &dfa, bool &readCh)
+void SwitchIf::emit(OutputFile &o, uint32_t ind, const DFA &dfa)
 {
        switch (type) {
-               case SWITCH: info.cases->emit(o, ind, dfa, readCh); break;
-               case IF:     info.ifs->emit(o, ind, dfa, readCh); break;
+               case SWITCH: info.cases->emit(o, ind, dfa); break;
+               case IF:     info.ifs->emit(o, ind, dfa); break;
        }
 }
 
-void GoBitmap::emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh)
+void GoBitmap::emit (OutputFile & o, uint32_t ind, const DFA &dfa)
 {
-       std::string yych = output_hgo (o, ind, dfa, readCh, hgo);
+       std::string yych = output_hgo (o, ind, dfa, hgo);
        o.ws("if (").wstring(opts->yybm).ws("[").wu32(bitmap->i).ws("+").wstring(yych).ws("] & ");
        if (opts->yybmHexTable)
        {
@@ -151,11 +137,11 @@ void GoBitmap::emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh
                o.wu32(bitmap->m);
        }
        o.ws(") {\n");
-       gen_goto_plain(o, ind + 1, readCh, bitmap_state, dfa, TCID0);
+       gen_goto_plain(o, ind + 1, bitmap_state, dfa, TCID0);
        o.wind(ind).ws("}\n");
        if (lgo != NULL)
        {
-               lgo->emit (o, ind, dfa, readCh);
+               lgo->emit (o, ind, dfa);
        }
 }
 
@@ -197,9 +183,9 @@ void CpgotoTable::emit (OutputFile & o, uint32_t ind)
        o.wind(--ind).ws("};\n");
 }
 
-void Cpgoto::emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh)
+void Cpgoto::emit (OutputFile & o, uint32_t ind, const DFA &dfa)
 {
-       std::string yych = output_hgo (o, ind, dfa, readCh, hgo);
+       std::string yych = output_hgo (o, ind, dfa, hgo);
        o.ws("{\n");
        table->emit (o, ++ind);
        o.wind(ind).ws("goto *").wstring(opts->yytarget).ws("[").wstring(yych).ws("];\n");
@@ -231,7 +217,7 @@ void Dot::emit(OutputFile &o, const DFA &dfa)
        }
 }
 
-void Go::emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh)
+void Go::emit (OutputFile & o, uint32_t ind, const DFA &dfa)
 {
        code_lines_t code;
        gen_settags(code, dfa, tags);
@@ -243,13 +229,13 @@ void Go::emit (OutputFile & o, uint32_t ind, const DFA &dfa, bool & readCh)
                case EMPTY:
                        break;
                case SWITCH_IF:
-                       info.switchif->emit (o, ind, dfa, readCh);
+                       info.switchif->emit (o, ind, dfa);
                        break;
                case BITMAP:
-                       info.bitmap->emit (o, ind, dfa, readCh);
+                       info.bitmap->emit (o, ind, dfa);
                        break;
                case CPGOTO:
-                       info.cpgoto->emit (o, ind, dfa, readCh);
+                       info.cpgoto->emit (o, ind, dfa);
                        break;
                case DOT:
                        info.dot->emit (o, dfa);

diff --git a/re2c/src/codegen/input_api.cc b/re2c/src/codegen/input_api.cc
index 8e5ec681e551664d8adba355a5c39d1b7260b3f8..2972ee620a86a081465b95844de547112a496bcf 100644 (file)
--- a/re2c/src/codegen/input_api.cc
+++ b/re2c/src/codegen/input_api.cc
@@ -40,14 +40,10 @@ std::string InputAPI::expr_peek () const
        return s;
 }
 
-std::string InputAPI::expr_peek_save () const
-{
-       return opts->yych + " = " + opts.yychConversion () + expr_peek ();
-}
-
 std::string InputAPI::stmt_peek (uint32_t ind) const
 {
-       return indent (ind) + expr_peek_save () + ";\n";
+       return indent(ind) + opts->yych + " = " + opts.yychConversion()
+               + expr_peek() + ";\n";
 }
 
 std::string InputAPI::stmt_skip (uint32_t ind) const

diff --git a/re2c/src/codegen/input_api.h b/re2c/src/codegen/input_api.h
index adce72d24f787ff73e14a8cf0fa6ad57276c8ac2..be8106db7de0481cbcdef03632d16b30ed0ac93f 100644 (file)
--- a/re2c/src/codegen/input_api.h
+++ b/re2c/src/codegen/input_api.h
@@ -27,7 +27,6 @@ public:
        type_t type () const;
        void set (type_t t);
        std::string expr_peek () const;
-       std::string expr_peek_save () const;
        std::string stmt_peek (uint32_t ind) const;
        std::string stmt_skip (uint32_t ind) const;
        std::string stmt_backup (uint32_t ind) const;

diff --git a/re2c/test/bug1054496.c b/re2c/test/bug1054496.c
index a6de4a28547de8d524ecae6e7795969781782187..e68846a939143be03dde5ea3fcfc6ddb3143fc19 100644 (file)
--- a/re2c/test/bug1054496.c
+++ b/re2c/test/bug1054496.c
@@ -99,8 +99,8 @@ yy6:
        default:        goto yy5;
        }
 yy7:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'A':
        case 'B':
        case 'C':

diff --git a/re2c/test/bug128.c b/re2c/test/bug128.c
index 9458bae8d89be5a287e1401e07b62d51651a034c..c01ae39ab76a741d3e7c8308f721dca6a54ed80f 100644 (file)
--- a/re2c/test/bug128.c
+++ b/re2c/test/bug128.c
@@ -21,8 +21,8 @@ yy3:
        {}
 #line 23 "bug128.c"
 yy4:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy7;
        case 'c':       goto yy8;
        default:        goto yy5;

diff --git a/re2c/test/bug1297658.c b/re2c/test/bug1297658.c
index 3bb6fab1b9b04adebfd14367e88d223e0f372cd6..3fbbbab38f0e6fe8ec55450362d8425841bcc6ba 100644 (file)
--- a/re2c/test/bug1297658.c
+++ b/re2c/test/bug1297658.c
@@ -86,8 +86,8 @@ yy4:
        }
 #line 88 "bug1297658.c"
 yy6:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'L':       goto yy9;
        case 'e':       goto yy10;
        default:        goto yy7;

diff --git a/re2c/test/bug1708378.ib.c b/re2c/test/bug1708378.ib.c
index 6ac1efe9bc9e296dd7e7819e0b0a47aff58df404..784d936b785e0fed1db5170353f7c7999b01fefa 100644 (file)
--- a/re2c/test/bug1708378.ib.c
+++ b/re2c/test/bug1708378.ib.c
@@ -3904,8 +3904,8 @@ yy891:
 yy892:
        {RET("__APPROVALFVGT");}
 yy893:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == ' ') goto yy1056;
+       yych = *++YYCURSOR;
+       if (yych == ' ') goto yy1056;
        {RET("TVD_APPROVED");}
 yy895:
        yych = *++YYCURSOR;

diff --git a/re2c/test/bug57_original.bi--case-insensitive.c b/re2c/test/bug57_original.bi--case-insensitive.c
index d95ca703725525ac4f26ae27f706a4d546cd8adc..e5416c0f94e3073bb60c7029ec5be55b3dccf56f 100644 (file)
--- a/re2c/test/bug57_original.bi--case-insensitive.c
+++ b/re2c/test/bug57_original.bi--case-insensitive.c
@@ -2438,8 +2438,8 @@ yy345:
        if (yych == 'D') goto yy346;
        if (yych != 'd') goto yy31;
 yy346:
-       ++p;
-       if ((yych = *p) == 'E') goto yy137;
+       yych = *++p;
+       if (yych == 'E') goto yy137;
        if (yych == 'e') goto yy137;
        goto yy31;
 }
@@ -7303,8 +7303,8 @@ yy765:
        if (yych == 't') goto yy698;
        goto yy554;
 yy766:
-       ++p;
-       if ((yych = *p) == 'T') goto yy718;
+       yych = *++p;
+       if (yych == 'T') goto yy718;
        if (yych == 't') goto yy718;
        goto yy554;
 }
@@ -8088,8 +8088,8 @@ yy849:
        }
        if (yych == '\n') goto yy843;
        if (yych != '#') goto yy848;
-       ++p;
-       if (yybm[0+(yych = *p)] & 128) {
+       yych = *++p;
+       if (yybm[0+yych] & 128) {
                goto yy845;
        }
        if (yych == '\n') goto yy843;
@@ -9362,8 +9362,8 @@ yy1006:
                }
        }
 yy1007:
-       ++p;
-       if ((yych = *p) <= ';') {
+       yych = *++p;
+       if (yych <= ';') {
                if (yych <= '/') goto yy958;
                if (yych <= '9') goto yy983;
                if (yych <= ':') goto yy958;

diff --git a/re2c/test/c.c b/re2c/test/c.c
index 8dd0b19d774bf52a3d4764e6f93e155b931ba58a..f5137ab6fb13b5e0bed2b09763abaa0b34151642 100644 (file)
--- a/re2c/test/c.c
+++ b/re2c/test/c.c
@@ -263,8 +263,8 @@ yy7:
            }
 #line 265 "c.c"
 yy9:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy81;
        default:        goto yy10;
        }
@@ -280,8 +280,8 @@ yy11:
        default:        goto yy84;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy89;
        default:        goto yy13;
        }
@@ -290,8 +290,8 @@ yy13:
        { RET('%'); }
 #line 292 "c.c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '&':       goto yy91;
        case '=':       goto yy93;
        default:        goto yy15;
@@ -318,8 +318,8 @@ yy19:
        { RET(')'); }
 #line 320 "c.c"
 yy21:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy99;
        default:        goto yy22;
        }
@@ -328,8 +328,8 @@ yy22:
        { RET('*'); }
 #line 330 "c.c"
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '+':       goto yy101;
        case '=':       goto yy103;
        default:        goto yy24;
@@ -344,8 +344,8 @@ yy25:
        { RET(','); }
 #line 346 "c.c"
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '-':       goto yy105;
        case '=':       goto yy107;
        case '>':       goto yy109;
@@ -377,8 +377,8 @@ yy30:
        { RET('.'); }
 #line 379 "c.c"
 yy31:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':       goto yy115;
        case '=':       goto yy117;
        default:        goto yy32;
@@ -436,8 +436,8 @@ yy39:
        { RET(';'); }
 #line 438 "c.c"
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '<':       goto yy123;
        case '=':       goto yy125;
        default:        goto yy42;
@@ -447,8 +447,8 @@ yy42:
        { RET('<'); }
 #line 449 "c.c"
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy127;
        default:        goto yy44;
        }
@@ -457,8 +457,8 @@ yy44:
        { RET('='); }
 #line 459 "c.c"
 yy45:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy129;
        case '>':       goto yy131;
        default:        goto yy46;
@@ -558,8 +558,8 @@ yy54:
        { RET(']'); }
 #line 560 "c.c"
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy133;
        default:        goto yy57;
        }
@@ -673,8 +673,8 @@ yy73:
        { RET('{'); }
 #line 675 "c.c"
 yy75:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy162;
        case '|':       goto yy164;
        default:        goto yy76;
@@ -935,8 +935,8 @@ yy122:
        default:        goto yy85;
        }
 yy123:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy176;
        default:        goto yy124;
        }
@@ -960,8 +960,8 @@ yy129:
        { RET(GEQ); }
 #line 962 "c.c"
 yy131:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy178;
        default:        goto yy132;
        }
@@ -1011,8 +1011,8 @@ yy140:
        default:        goto yy50;
        }
 yy141:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1119,8 +1119,8 @@ yy148:
        default:        goto yy50;
        }
 yy149:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1484,8 +1484,8 @@ yy190:
        default:        goto yy50;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1562,8 +1562,8 @@ yy193:
        default:        goto yy50;
        }
 yy194:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1724,8 +1724,8 @@ yy210:
        default:        goto yy50;
        }
 yy211:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1802,8 +1802,8 @@ yy213:
        default:        goto yy50;
        }
 yy214:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1874,8 +1874,8 @@ yy215:
        { RET(CASE); }
 #line 1876 "c.c"
 yy216:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1970,8 +1970,8 @@ yy221:
        default:        goto yy50;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2042,8 +2042,8 @@ yy223:
        { RET(ELSE); }
 #line 2044 "c.c"
 yy224:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2126,8 +2126,8 @@ yy227:
        default:        goto yy50;
        }
 yy228:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2198,8 +2198,8 @@ yy229:
        { RET(GOTO); }
 #line 2200 "c.c"
 yy230:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2336,8 +2336,8 @@ yy242:
        default:        goto yy50;
        }
 yy243:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2420,8 +2420,8 @@ yy246:
        default:        goto yy50;
        }
 yy247:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2492,8 +2492,8 @@ yy248:
        { RET(BREAK); }
 #line 2494 "c.c"
 yy249:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2588,8 +2588,8 @@ yy254:
        default:        goto yy50;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2672,8 +2672,8 @@ yy258:
        default:        goto yy50;
        }
 yy259:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2780,8 +2780,8 @@ yy266:
        default:        goto yy50;
        }
 yy267:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2864,8 +2864,8 @@ yy270:
        default:        goto yy50;
        }
 yy271:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2948,8 +2948,8 @@ yy274:
        default:        goto yy50;
        }
 yy275:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3020,8 +3020,8 @@ yy276:
        { RET(DOUBLE); }
 #line 3022 "c.c"
 yy277:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3098,8 +3098,8 @@ yy279:
        default:        goto yy50;
        }
 yy280:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3170,8 +3170,8 @@ yy281:
        { RET(RETURN); }
 #line 3172 "c.c"
 yy282:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3242,8 +3242,8 @@ yy283:
        { RET(SIGNED); }
 #line 3244 "c.c"
 yy284:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3314,8 +3314,8 @@ yy285:
        { RET(SIZEOF); }
 #line 3316 "c.c"
 yy286:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3386,8 +3386,8 @@ yy287:
        { RET(STATIC); }
 #line 3388 "c.c"
 yy288:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3458,8 +3458,8 @@ yy289:
        { RET(STRUCT); }
 #line 3460 "c.c"
 yy290:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3554,8 +3554,8 @@ yy295:
        default:        goto yy50;
        }
 yy296:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3632,8 +3632,8 @@ yy298:
        default:        goto yy50;
        }
 yy299:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3716,8 +3716,8 @@ yy302:
        default:        goto yy50;
        }
 yy303:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3788,8 +3788,8 @@ yy304:
        { RET(CONTINUE); }
 #line 3790 "c.c"
 yy305:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3860,8 +3860,8 @@ yy306:
        { RET(REGISTER); }
 #line 3862 "c.c"
 yy307:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3932,8 +3932,8 @@ yy308:
        { RET(UNSIGNED); }
 #line 3934 "c.c"
 yy309:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/calc_001.c b/re2c/test/calc_001.c
index 59732797950b90e1ad106bcfe1be036ad873c469..64c77e0f8b7030467622b226f838fd2ca20bb7d7 100644 (file)
--- a/re2c/test/calc_001.c
+++ b/re2c/test/calc_001.c
@@ -64,8 +64,8 @@ yy8:
                        { printf("-\n");        continue; }
 #line 66 "calc_001.c"
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/calc_001.dei.c b/re2c/test/calc_001.dei.c
index 3bf3045be07fd4f96f6e9d46bf695b4fc942c78c..9626822e86d5873cd5e3c361c61b4b43e2f11a2b 100644 (file)
--- a/re2c/test/calc_001.dei.c
+++ b/re2c/test/calc_001.dei.c
@@ -63,8 +63,8 @@ yy8:
                        { printf("-\n");        continue; }
 yy10:
                        YYDEBUG(10, *YYCURSOR);
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case 0xF0: /* 0 */
                        case 0xF1: /* 1 */
                        case 0xF2: /* 2 */

diff --git a/re2c/test/calc_001.ei.c b/re2c/test/calc_001.ei.c
index 010a5902ffbe9144d582a574d4cd2e8f47249636..516a1682b7667b805a732313ac94e8914a67eb40 100644 (file)
--- a/re2c/test/calc_001.ei.c
+++ b/re2c/test/calc_001.ei.c
@@ -53,8 +53,8 @@ yy8:
                        ++YYCURSOR;
                        { printf("-\n");        continue; }
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case 0xF0:
                        case 0xF1:
                        case 0xF2:

diff --git a/re2c/test/calc_002.c b/re2c/test/calc_002.c
index f298565c3e14cace705ee83c483337ca95339be5..f764521e8d40325480fde81bd86447213fbba2c1 100644 (file)
--- a/re2c/test/calc_002.c
+++ b/re2c/test/calc_002.c
@@ -72,8 +72,8 @@ yy8:
                        { printf("+\n");        continue; }
 #line 74 "calc_002.c"
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/calc_003.c b/re2c/test/calc_003.c
index d3067ae16551b5341ae225421963a9cccf7798f2..66e79b531b7bd8eebdc2e62bb840158b8c831df8 100644 (file)
--- a/re2c/test/calc_003.c
+++ b/re2c/test/calc_003.c
@@ -64,8 +64,8 @@ yy8:
                        { printf("+\n");        continue; }
 #line 66 "calc_003.c"
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/calc_004.c b/re2c/test/calc_004.c
index a984288f04dec176baad32b1c00d3509c0770fe7..1597220bb422a111ea588de66ee7297bcdbe39aa 100644 (file)
--- a/re2c/test/calc_004.c
+++ b/re2c/test/calc_004.c
@@ -76,8 +76,8 @@ yy8:
                        { printf("+\n");        continue; }
 #line 78 "calc_004.c"
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/calc_005.c b/re2c/test/calc_005.c
index 1739a9c09c1b791cd6ab5136d2050f9c2a12a73e..08e4fa4792f7be13dc1f15d9627268f84b52e437 100644 (file)
--- a/re2c/test/calc_005.c
+++ b/re2c/test/calc_005.c
@@ -120,8 +120,8 @@ yy9:
                        { res = stack_sub();            continue; }
 #line 122 "calc_005.c"
 yy11:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/calc_006.s.c b/re2c/test/calc_006.s.c
index ebcb8e4e9e9affdf77957d4d9441a1a2ce5516d2..202aa559119b589938c8c0cb0adee309ea856b62 100644 (file)
--- a/re2c/test/calc_006.s.c
+++ b/re2c/test/calc_006.s.c
@@ -121,8 +121,8 @@ yy11:
                        { res = stack_sub();            continue; }
 #line 123 "calc_006.s.c"
 yy13:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) <= '/') goto yy14;
+                       yych = *++YYCURSOR;
+                       if (yych <= '/') goto yy14;
                        if (yych <= '9') goto yy17;
 yy14:
 #line 109 "calc_006.s.re"

diff --git a/re2c/test/calc_007.b.c b/re2c/test/calc_007.b.c
index 8231966098ea010a8f1996b113f630940c3119a0..7d972ed6ddb2ec64439bc843e5627cb33e266228 100644 (file)
--- a/re2c/test/calc_007.b.c
+++ b/re2c/test/calc_007.b.c
@@ -152,8 +152,8 @@ yy11:
                        { res = stack_sub();            continue; }
 #line 154 "calc_007.b.c"
 yy13:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) <= '/') goto yy14;
+                       yych = *++YYCURSOR;
+                       if (yych <= '/') goto yy14;
                        if (yych <= '9') goto yy17;
 yy14:
 #line 82 "calc_007.b.re"

diff --git a/re2c/test/calc_008.b--skeleton.c b/re2c/test/calc_008.b--skeleton.c
index 0d9928ecb9b1550a2b2b6c61844fb90d209c758a..68a9e4a300136dc7452ec7270e4b3bec46918380 100644 (file)
--- a/re2c/test/calc_008.b--skeleton.c
+++ b/re2c/test/calc_008.b--skeleton.c
@@ -236,7 +236,8 @@ yy11:
         continue;
 yy13:
         YYSKIP ();
-        if ((yych = YYPEEK ()) <= '/') goto yy14;
+        yych = YYPEEK ();
+        if (yych <= '/') goto yy14;
         if (yych <= '9') goto yy17;
 yy14:
         status = check_key_count_line110(keys_count, i, 3)

diff --git a/re2c/test/calc_008.b.c b/re2c/test/calc_008.b.c
index 875935b164a1139a81ac1b32bf9226b9b5691340..06eb75c9089321a6a17adb0b588882ada360409f 100644 (file)
--- a/re2c/test/calc_008.b.c
+++ b/re2c/test/calc_008.b.c
@@ -148,8 +148,8 @@ scan11:
                        { res = stack_sub();            continue; }
 #line 150 "calc_008.b.c"
 scan13:
-                       ++p;
-                       if ((curr = (unsigned char)*p) <= '/') goto scan14;
+                       curr = (unsigned char)*++p;
+                       if (curr <= '/') goto scan14;
                        if (curr <= '9') goto scan17;
 scan14:
 #line 105 "calc_008.b.re"

diff --git a/re2c/test/class3.i8.c b/re2c/test/class3.i8.c
index fd2b173a5aa8c640f12cdacd22c4c3b19df671d1..4d6ba533b966fd74cbd1a76368b20a1f43202524 100644 (file)
--- a/re2c/test/class3.i8.c
+++ b/re2c/test/class3.i8.c
@@ -60,8 +60,8 @@ yy12:
        default:        goto yy10;
        }
 yy13:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy4;
        default:        goto yy10;
        }
@@ -1062,8 +1062,8 @@ yy33:
        default:        goto yy29;
        }
 yy34:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -1616,8 +1616,8 @@ yy51:
        default:        goto yy48;
        }
 yy52:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy39;
        default:        goto yy48;
        }
@@ -2332,8 +2332,8 @@ yy70:
        default:        goto yy66;
        }
 yy71:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -2888,8 +2888,8 @@ yy86:
        default:        goto yy84;
        }
 yy87:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy76;
        default:        goto yy84;
        }
@@ -3452,8 +3452,8 @@ yy103:
        default:        goto yy100;
        }
 yy104:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -3859,8 +3859,8 @@ yy119:
        default:        goto yy116;
        }
 yy120:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy109;
        default:        goto yy116;
        }
@@ -4722,8 +4722,8 @@ yy140:
        default:        goto yy136;
        }
 yy141:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -5276,8 +5276,8 @@ yy158:
        default:        goto yy155;
        }
 yy159:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy146;
        default:        goto yy155;
        }
@@ -5992,8 +5992,8 @@ yy177:
        default:        goto yy173;
        }
 yy178:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -6122,8 +6122,8 @@ yy191:
        default:        goto yy189;
        }
 yy192:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy183;
        default:        goto yy189;
        }
@@ -7124,8 +7124,8 @@ yy212:
        default:        goto yy208;
        }
 yy213:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -7761,8 +7761,8 @@ yy227:
        YYCURSOR = YYMARKER;
        goto yy217;
 yy228:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -8412,8 +8412,8 @@ yy248:
        YYCURSOR = YYMARKER;
        goto yy238;
 yy249:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -8912,8 +8912,8 @@ yy271:
        default:        goto yy269;
        }
 yy272:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -9587,8 +9587,8 @@ yy286:
        default:        goto yy285;
        }
 yy287:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -10028,8 +10028,8 @@ yy301:
        default:        goto yy300;
        }
 yy302:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -10545,8 +10545,8 @@ yy314:
        YYCURSOR = YYMARKER;
        goto yy308;
 yy315:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -10992,8 +10992,8 @@ yy329:
        default:        goto yy328;
        }
 yy330:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -11509,8 +11509,8 @@ yy342:
        YYCURSOR = YYMARKER;
        goto yy336;
 yy343:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -11954,8 +11954,8 @@ yy359:
        default:        goto yy357;
        }
 yy360:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -12629,8 +12629,8 @@ yy374:
        default:        goto yy373;
        }
 yy375:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -13138,8 +13138,8 @@ yy390:
        default:        goto yy388;
        }
 yy391:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy380;
        default:        goto yy388;
        }
@@ -13702,8 +13702,8 @@ yy407:
        default:        goto yy404;
        }
 yy408:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -13832,8 +13832,8 @@ yy421:
        default:        goto yy419;
        }
 yy422:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy413;
        default:        goto yy419;
        }
@@ -14834,8 +14834,8 @@ yy442:
        default:        goto yy438;
        }
 yy443:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -14964,8 +14964,8 @@ yy456:
        default:        goto yy454;
        }
 yy457:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy448;
        default:        goto yy454;
        }
@@ -15966,8 +15966,8 @@ yy477:
        default:        goto yy473;
        }
 yy478:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -16520,8 +16520,8 @@ yy495:
        default:        goto yy492;
        }
 yy496:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy483;
        default:        goto yy492;
        }
@@ -17236,8 +17236,8 @@ yy514:
        default:        goto yy510;
        }
 yy515:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -17643,8 +17643,8 @@ yy530:
        default:        goto yy527;
        }
 yy531:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy520;
        default:        goto yy527;
        }
@@ -18506,8 +18506,8 @@ yy551:
        default:        goto yy547;
        }
 yy552:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -19062,8 +19062,8 @@ yy567:
        default:        goto yy565;
        }
 yy568:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy557;
        default:        goto yy565;
        }
@@ -19626,8 +19626,8 @@ yy584:
        default:        goto yy581;
        }
 yy585:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -20033,8 +20033,8 @@ yy600:
        default:        goto yy597;
        }
 yy601:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy590;
        default:        goto yy597;
        }
@@ -20896,8 +20896,8 @@ yy621:
        default:        goto yy617;
        }
 yy622:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -21026,8 +21026,8 @@ yy635:
        default:        goto yy633;
        }
 yy636:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy627;
        default:        goto yy633;
        }
@@ -22028,8 +22028,8 @@ yy656:
        default:        goto yy652;
        }
 yy657:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -22158,8 +22158,8 @@ yy670:
        default:        goto yy668;
        }
 yy671:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy662;
        default:        goto yy668;
        }
@@ -23160,8 +23160,8 @@ yy691:
        default:        goto yy687;
        }
 yy692:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -23714,8 +23714,8 @@ yy709:
        default:        goto yy706;
        }
 yy710:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy697;
        default:        goto yy706;
        }
@@ -24430,8 +24430,8 @@ yy728:
        default:        goto yy724;
        }
 yy729:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -24986,8 +24986,8 @@ yy744:
        default:        goto yy742;
        }
 yy745:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy734;
        default:        goto yy742;
        }
@@ -25550,8 +25550,8 @@ yy761:
        default:        goto yy758;
        }
 yy762:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -25957,8 +25957,8 @@ yy777:
        default:        goto yy774;
        }
 yy778:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy767;
        default:        goto yy774;
        }
@@ -26820,8 +26820,8 @@ yy798:
        default:        goto yy794;
        }
 yy799:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -26950,8 +26950,8 @@ yy812:
        default:        goto yy810;
        }
 yy813:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy804;
        default:        goto yy810;
        }
@@ -27952,8 +27952,8 @@ yy833:
        default:        goto yy829;
        }
 yy834:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -28082,8 +28082,8 @@ yy847:
        default:        goto yy845;
        }
 yy848:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy839;
        default:        goto yy845;
        }
@@ -29084,8 +29084,8 @@ yy868:
        default:        goto yy864;
        }
 yy869:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -29214,8 +29214,8 @@ yy882:
        default:        goto yy880;
        }
 yy883:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy874;
        default:        goto yy880;
        }
@@ -30216,8 +30216,8 @@ yy903:
        default:        goto yy899;
        }
 yy904:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -30346,8 +30346,8 @@ yy917:
        default:        goto yy915;
        }
 yy918:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy909;
        default:        goto yy915;
        }
@@ -31348,8 +31348,8 @@ yy938:
        default:        goto yy934;
        }
 yy939:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -31478,8 +31478,8 @@ yy952:
        default:        goto yy950;
        }
 yy953:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy944;
        default:        goto yy950;
        }
@@ -32480,8 +32480,8 @@ yy973:
        default:        goto yy969;
        }
 yy974:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -32610,8 +32610,8 @@ yy987:
        default:        goto yy985;
        }
 yy988:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy979;
        default:        goto yy985;
        }
@@ -33612,8 +33612,8 @@ yy1008:
        default:        goto yy1004;
        }
 yy1009:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -33742,8 +33742,8 @@ yy1022:
        default:        goto yy1020;
        }
 yy1023:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1014;
        default:        goto yy1020;
        }
@@ -34744,8 +34744,8 @@ yy1043:
        default:        goto yy1039;
        }
 yy1044:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -34874,8 +34874,8 @@ yy1057:
        default:        goto yy1055;
        }
 yy1058:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1049;
        default:        goto yy1055;
        }
@@ -35876,8 +35876,8 @@ yy1078:
        default:        goto yy1074;
        }
 yy1079:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -36006,8 +36006,8 @@ yy1092:
        default:        goto yy1090;
        }
 yy1093:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1084;
        default:        goto yy1090;
        }
@@ -37008,8 +37008,8 @@ yy1113:
        default:        goto yy1109;
        }
 yy1114:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -37138,8 +37138,8 @@ yy1127:
        default:        goto yy1125;
        }
 yy1128:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1119;
        default:        goto yy1125;
        }
@@ -38140,8 +38140,8 @@ yy1148:
        default:        goto yy1144;
        }
 yy1149:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -38270,8 +38270,8 @@ yy1162:
        default:        goto yy1160;
        }
 yy1163:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1154;
        default:        goto yy1160;
        }
@@ -39272,8 +39272,8 @@ yy1183:
        default:        goto yy1179;
        }
 yy1184:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -39402,8 +39402,8 @@ yy1197:
        default:        goto yy1195;
        }
 yy1198:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1189;
        default:        goto yy1195;
        }
@@ -40404,8 +40404,8 @@ yy1218:
        default:        goto yy1214;
        }
 yy1219:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -40534,8 +40534,8 @@ yy1232:
        default:        goto yy1230;
        }
 yy1233:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1224;
        default:        goto yy1230;
        }
@@ -41536,8 +41536,8 @@ yy1253:
        default:        goto yy1249;
        }
 yy1254:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -41666,8 +41666,8 @@ yy1267:
        default:        goto yy1265;
        }
 yy1268:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1259;
        default:        goto yy1265;
        }
@@ -42668,8 +42668,8 @@ yy1288:
        default:        goto yy1284;
        }
 yy1289:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -42798,8 +42798,8 @@ yy1302:
        default:        goto yy1300;
        }
 yy1303:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1294;
        default:        goto yy1300;
        }
@@ -43800,8 +43800,8 @@ yy1323:
        default:        goto yy1319;
        }
 yy1324:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -43930,8 +43930,8 @@ yy1337:
        default:        goto yy1335;
        }
 yy1338:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1329;
        default:        goto yy1335;
        }
@@ -44932,8 +44932,8 @@ yy1358:
        default:        goto yy1354;
        }
 yy1359:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -45062,8 +45062,8 @@ yy1372:
        default:        goto yy1370;
        }
 yy1373:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1364;
        default:        goto yy1370;
        }
@@ -46064,8 +46064,8 @@ yy1393:
        default:        goto yy1389;
        }
 yy1394:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -46194,8 +46194,8 @@ yy1407:
        default:        goto yy1405;
        }
 yy1408:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1399;
        default:        goto yy1405;
        }
@@ -47196,8 +47196,8 @@ yy1428:
        default:        goto yy1424;
        }
 yy1429:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -47326,8 +47326,8 @@ yy1442:
        default:        goto yy1440;
        }
 yy1443:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1434;
        default:        goto yy1440;
        }
@@ -48328,8 +48328,8 @@ yy1463:
        default:        goto yy1459;
        }
 yy1464:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -48458,8 +48458,8 @@ yy1477:
        default:        goto yy1475;
        }
 yy1478:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1469;
        default:        goto yy1475;
        }
@@ -49460,8 +49460,8 @@ yy1498:
        default:        goto yy1494;
        }
 yy1499:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -49590,8 +49590,8 @@ yy1512:
        default:        goto yy1510;
        }
 yy1513:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1504;
        default:        goto yy1510;
        }
@@ -50592,8 +50592,8 @@ yy1533:
        default:        goto yy1529;
        }
 yy1534:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -50722,8 +50722,8 @@ yy1547:
        default:        goto yy1545;
        }
 yy1548:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1539;
        default:        goto yy1545;
        }
@@ -51724,8 +51724,8 @@ yy1568:
        default:        goto yy1564;
        }
 yy1569:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -51854,8 +51854,8 @@ yy1582:
        default:        goto yy1580;
        }
 yy1583:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1574;
        default:        goto yy1580;
        }
@@ -52856,8 +52856,8 @@ yy1603:
        default:        goto yy1599;
        }
 yy1604:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -52986,8 +52986,8 @@ yy1617:
        default:        goto yy1615;
        }
 yy1618:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1609;
        default:        goto yy1615;
        }
@@ -53988,8 +53988,8 @@ yy1638:
        default:        goto yy1634;
        }
 yy1639:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -54625,8 +54625,8 @@ yy1653:
        YYCURSOR = YYMARKER;
        goto yy1643;
 yy1654:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -54769,8 +54769,8 @@ yy1673:
        default:        goto yy1671;
        }
 yy1674:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1665;
        default:        goto yy1671;
        }
@@ -55771,8 +55771,8 @@ yy1694:
        default:        goto yy1690;
        }
 yy1695:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -55901,8 +55901,8 @@ yy1708:
        default:        goto yy1706;
        }
 yy1709:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1700;
        default:        goto yy1706;
        }
@@ -56903,8 +56903,8 @@ yy1729:
        default:        goto yy1725;
        }
 yy1730:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -57033,8 +57033,8 @@ yy1743:
        default:        goto yy1741;
        }
 yy1744:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1735;
        default:        goto yy1741;
        }
@@ -58035,8 +58035,8 @@ yy1764:
        default:        goto yy1760;
        }
 yy1765:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -58589,8 +58589,8 @@ yy1782:
        default:        goto yy1779;
        }
 yy1783:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1770;
        default:        goto yy1779;
        }
@@ -59305,8 +59305,8 @@ yy1801:
        default:        goto yy1797;
        }
 yy1802:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -59793,8 +59793,8 @@ yy1816:
        default:        goto yy1815;
        }
 yy1817:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -60310,8 +60310,8 @@ yy1829:
        YYCURSOR = YYMARKER;
        goto yy1823;
 yy1830:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -60906,8 +60906,8 @@ yy1844:
        YYCURSOR = YYMARKER;
        goto yy1834;
 yy1845:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -61474,8 +61474,8 @@ yy1868:
        default:        goto yy1865;
        }
 yy1869:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1856;
        default:        goto yy1865;
        }
@@ -62190,8 +62190,8 @@ yy1887:
        default:        goto yy1883;
        }
 yy1888:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -62597,8 +62597,8 @@ yy1903:
        default:        goto yy1900;
        }
 yy1904:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1893;
        default:        goto yy1900;
        }
@@ -63460,8 +63460,8 @@ yy1924:
        default:        goto yy1920;
        }
 yy1925:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -63867,8 +63867,8 @@ yy1940:
        default:        goto yy1937;
        }
 yy1941:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy1930;
        default:        goto yy1937;
        }
@@ -64730,8 +64730,8 @@ yy1961:
        default:        goto yy1957;
        }
 yy1962:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -65216,8 +65216,8 @@ yy1978:
        default:        goto yy1976;
        }
 yy1979:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -65891,8 +65891,8 @@ yy1993:
        default:        goto yy1992;
        }
 yy1994:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -66332,8 +66332,8 @@ yy2008:
        default:        goto yy2007;
        }
 yy2009:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -66849,8 +66849,8 @@ yy2021:
        YYCURSOR = YYMARKER;
        goto yy2015;
 yy2022:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -67296,8 +67296,8 @@ yy2036:
        default:        goto yy2035;
        }
 yy2037:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -67813,8 +67813,8 @@ yy2049:
        YYCURSOR = YYMARKER;
        goto yy2043;
 yy2050:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -67902,8 +67902,8 @@ yy2063:
        default:        goto yy2061;
        }
 yy2064:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2055;
        default:        goto yy2061;
        }
@@ -68904,8 +68904,8 @@ yy2084:
        default:        goto yy2080;
        }
 yy2085:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -69034,8 +69034,8 @@ yy2098:
        default:        goto yy2096;
        }
 yy2099:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2090;
        default:        goto yy2096;
        }
@@ -70036,8 +70036,8 @@ yy2119:
        default:        goto yy2115;
        }
 yy2120:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -70166,8 +70166,8 @@ yy2133:
        default:        goto yy2131;
        }
 yy2134:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2125;
        default:        goto yy2131;
        }
@@ -71168,8 +71168,8 @@ yy2154:
        default:        goto yy2150;
        }
 yy2155:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -71722,8 +71722,8 @@ yy2172:
        default:        goto yy2169;
        }
 yy2173:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2160;
        default:        goto yy2169;
        }
@@ -72438,8 +72438,8 @@ yy2191:
        default:        goto yy2187;
        }
 yy2192:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -73075,8 +73075,8 @@ yy2206:
        YYCURSOR = YYMARKER;
        goto yy2196;
 yy2207:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -73577,8 +73577,8 @@ yy2227:
        default:        goto yy2226;
        }
 yy2228:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -74094,8 +74094,8 @@ yy2240:
        YYCURSOR = YYMARKER;
        goto yy2234;
 yy2241:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -74607,8 +74607,8 @@ yy2258:
        default:        goto yy2255;
        }
 yy2259:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2246;
        default:        goto yy2255;
        }
@@ -75323,8 +75323,8 @@ yy2277:
        default:        goto yy2273;
        }
 yy2278:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -75879,8 +75879,8 @@ yy2293:
        default:        goto yy2291;
        }
 yy2294:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2283;
        default:        goto yy2291;
        }
@@ -76443,8 +76443,8 @@ yy2310:
        default:        goto yy2307;
        }
 yy2311:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -76999,8 +76999,8 @@ yy2326:
        default:        goto yy2324;
        }
 yy2327:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2316;
        default:        goto yy2324;
        }
@@ -77563,8 +77563,8 @@ yy2343:
        default:        goto yy2340;
        }
 yy2344:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -78049,8 +78049,8 @@ yy2360:
        default:        goto yy2358;
        }
 yy2361:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -78724,8 +78724,8 @@ yy2375:
        default:        goto yy2374;
        }
 yy2376:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -79314,8 +79314,8 @@ yy2390:
        YYCURSOR = YYMARKER;
        goto yy2380;
 yy2391:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -79814,8 +79814,8 @@ yy2413:
        default:        goto yy2411;
        }
 yy2414:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -80489,8 +80489,8 @@ yy2428:
        default:        goto yy2427;
        }
 yy2429:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -80572,8 +80572,8 @@ yy2442:
        default:        goto yy2440;
        }
 yy2443:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2434;
        default:        goto yy2440;
        }
@@ -81574,8 +81574,8 @@ yy2463:
        default:        goto yy2459;
        }
 yy2464:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -81704,8 +81704,8 @@ yy2477:
        default:        goto yy2475;
        }
 yy2478:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2469;
        default:        goto yy2475;
        }
@@ -82706,8 +82706,8 @@ yy2498:
        default:        goto yy2494;
        }
 yy2499:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -82836,8 +82836,8 @@ yy2512:
        default:        goto yy2510;
        }
 yy2513:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2504;
        default:        goto yy2510;
        }
@@ -83838,8 +83838,8 @@ yy2533:
        default:        goto yy2529;
        }
 yy2534:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -84245,8 +84245,8 @@ yy2549:
        default:        goto yy2546;
        }
 yy2550:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2539;
        default:        goto yy2546;
        }
@@ -85108,8 +85108,8 @@ yy2570:
        default:        goto yy2566;
        }
 yy2571:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -85596,8 +85596,8 @@ yy2585:
        default:        goto yy2584;
        }
 yy2586:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -86113,8 +86113,8 @@ yy2598:
        YYCURSOR = YYMARKER;
        goto yy2592;
 yy2599:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -86558,8 +86558,8 @@ yy2615:
        default:        goto yy2613;
        }
 yy2616:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -87233,8 +87233,8 @@ yy2630:
        default:        goto yy2629;
        }
 yy2631:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -87593,8 +87593,8 @@ yy2646:
        default:        goto yy2643;
        }
 yy2647:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2636;
        default:        goto yy2643;
        }
@@ -88456,8 +88456,8 @@ yy2667:
        default:        goto yy2663;
        }
 yy2668:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -89010,8 +89010,8 @@ yy2685:
        default:        goto yy2682;
        }
 yy2686:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2673;
        default:        goto yy2682;
        }
@@ -89726,8 +89726,8 @@ yy2704:
        default:        goto yy2700;
        }
 yy2705:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -90280,8 +90280,8 @@ yy2722:
        default:        goto yy2719;
        }
 yy2723:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2710;
        default:        goto yy2719;
        }
@@ -90996,8 +90996,8 @@ yy2741:
        default:        goto yy2737;
        }
 yy2742:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -91633,8 +91633,8 @@ yy2756:
        YYCURSOR = YYMARKER;
        goto yy2746;
 yy2757:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -92135,8 +92135,8 @@ yy2777:
        default:        goto yy2776;
        }
 yy2778:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -92652,8 +92652,8 @@ yy2790:
        YYCURSOR = YYMARKER;
        goto yy2784;
 yy2791:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -93099,8 +93099,8 @@ yy2805:
        default:        goto yy2804;
        }
 yy2806:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -93616,8 +93616,8 @@ yy2818:
        YYCURSOR = YYMARKER;
        goto yy2812;
 yy2819:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -93705,8 +93705,8 @@ yy2832:
        default:        goto yy2830;
        }
 yy2833:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2824;
        default:        goto yy2830;
        }
@@ -94707,8 +94707,8 @@ yy2853:
        default:        goto yy2849;
        }
 yy2854:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -94837,8 +94837,8 @@ yy2867:
        default:        goto yy2865;
        }
 yy2868:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2859;
        default:        goto yy2865;
        }
@@ -95839,8 +95839,8 @@ yy2888:
        default:        goto yy2884;
        }
 yy2889:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -95969,8 +95969,8 @@ yy2902:
        default:        goto yy2900;
        }
 yy2903:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2894;
        default:        goto yy2900;
        }
@@ -96971,8 +96971,8 @@ yy2923:
        default:        goto yy2919;
        }
 yy2924:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -97378,8 +97378,8 @@ yy2939:
        default:        goto yy2936;
        }
 yy2940:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy2929;
        default:        goto yy2936;
        }
@@ -98241,8 +98241,8 @@ yy2960:
        default:        goto yy2956;
        }
 yy2961:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -98727,8 +98727,8 @@ yy2977:
        default:        goto yy2975;
        }
 yy2978:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -99402,8 +99402,8 @@ yy2992:
        default:        goto yy2991;
        }
 yy2993:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -99843,8 +99843,8 @@ yy3007:
        default:        goto yy3006;
        }
 yy3008:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -100360,8 +100360,8 @@ yy3020:
        YYCURSOR = YYMARKER;
        goto yy3014;
 yy3021:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -100726,8 +100726,8 @@ yy3036:
        default:        goto yy3033;
        }
 yy3037:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3026;
        default:        goto yy3033;
        }
@@ -101589,8 +101589,8 @@ yy3057:
        default:        goto yy3053;
        }
 yy3058:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -102145,8 +102145,8 @@ yy3073:
        default:        goto yy3071;
        }
 yy3074:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3063;
        default:        goto yy3071;
        }
@@ -102709,8 +102709,8 @@ yy3090:
        default:        goto yy3087;
        }
 yy3091:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -103265,8 +103265,8 @@ yy3106:
        default:        goto yy3104;
        }
 yy3107:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3096;
        default:        goto yy3104;
        }
@@ -103829,8 +103829,8 @@ yy3123:
        default:        goto yy3120;
        }
 yy3124:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -104466,8 +104466,8 @@ yy3138:
        YYCURSOR = YYMARKER;
        goto yy3128;
 yy3139:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -104966,8 +104966,8 @@ yy3161:
        default:        goto yy3159;
        }
 yy3162:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -105641,8 +105641,8 @@ yy3176:
        default:        goto yy3175;
        }
 yy3177:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -106080,8 +106080,8 @@ yy3193:
        default:        goto yy3191;
        }
 yy3194:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -106755,8 +106755,8 @@ yy3208:
        default:        goto yy3207;
        }
 yy3209:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -106838,8 +106838,8 @@ yy3222:
        default:        goto yy3220;
        }
 yy3223:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3214;
        default:        goto yy3220;
        }
@@ -107840,8 +107840,8 @@ yy3243:
        default:        goto yy3239;
        }
 yy3244:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -107970,8 +107970,8 @@ yy3257:
        default:        goto yy3255;
        }
 yy3258:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3249;
        default:        goto yy3255;
        }
@@ -108972,8 +108972,8 @@ yy3278:
        default:        goto yy3274;
        }
 yy3279:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -109102,8 +109102,8 @@ yy3292:
        default:        goto yy3290;
        }
 yy3293:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3284;
        default:        goto yy3290;
        }
@@ -110104,8 +110104,8 @@ yy3313:
        default:        goto yy3309;
        }
 yy3314:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -110660,8 +110660,8 @@ yy3329:
        default:        goto yy3327;
        }
 yy3330:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3319;
        default:        goto yy3327;
        }
@@ -111224,8 +111224,8 @@ yy3346:
        default:        goto yy3343;
        }
 yy3347:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -111861,8 +111861,8 @@ yy3361:
        YYCURSOR = YYMARKER;
        goto yy3351;
 yy3362:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -112361,8 +112361,8 @@ yy3384:
        default:        goto yy3382;
        }
 yy3385:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -113036,8 +113036,8 @@ yy3399:
        default:        goto yy3398;
        }
 yy3400:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -113545,8 +113545,8 @@ yy3415:
        default:        goto yy3413;
        }
 yy3416:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3405;
        default:        goto yy3413;
        }
@@ -114109,8 +114109,8 @@ yy3432:
        default:        goto yy3429;
        }
 yy3433:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -114663,8 +114663,8 @@ yy3450:
        default:        goto yy3447;
        }
 yy3451:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3438;
        default:        goto yy3447;
        }
@@ -115379,8 +115379,8 @@ yy3469:
        default:        goto yy3465;
        }
 yy3470:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -115933,8 +115933,8 @@ yy3487:
        default:        goto yy3484;
        }
 yy3488:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3475;
        default:        goto yy3484;
        }
@@ -116649,8 +116649,8 @@ yy3506:
        default:        goto yy3502;
        }
 yy3507:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -117137,8 +117137,8 @@ yy3521:
        default:        goto yy3520;
        }
 yy3522:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -117654,8 +117654,8 @@ yy3534:
        YYCURSOR = YYMARKER;
        goto yy3528;
 yy3535:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -118250,8 +118250,8 @@ yy3549:
        YYCURSOR = YYMARKER;
        goto yy3539;
 yy3550:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -118901,8 +118901,8 @@ yy3570:
        YYCURSOR = YYMARKER;
        goto yy3560;
 yy3571:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -119045,8 +119045,8 @@ yy3590:
        default:        goto yy3588;
        }
 yy3591:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3582;
        default:        goto yy3588;
        }
@@ -120047,8 +120047,8 @@ yy3611:
        default:        goto yy3607;
        }
 yy3612:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -120177,8 +120177,8 @@ yy3625:
        default:        goto yy3623;
        }
 yy3626:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3617;
        default:        goto yy3623;
        }
@@ -121179,8 +121179,8 @@ yy3646:
        default:        goto yy3642;
        }
 yy3647:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -121309,8 +121309,8 @@ yy3660:
        default:        goto yy3658;
        }
 yy3661:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3652;
        default:        goto yy3658;
        }
@@ -122311,8 +122311,8 @@ yy3681:
        default:        goto yy3677;
        }
 yy3682:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -122867,8 +122867,8 @@ yy3697:
        default:        goto yy3695;
        }
 yy3698:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3687;
        default:        goto yy3695;
        }
@@ -123431,8 +123431,8 @@ yy3714:
        default:        goto yy3711;
        }
 yy3715:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -123917,8 +123917,8 @@ yy3731:
        default:        goto yy3729;
        }
 yy3732:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -124592,8 +124592,8 @@ yy3746:
        default:        goto yy3745;
        }
 yy3747:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -125182,8 +125182,8 @@ yy3761:
        YYCURSOR = YYMARKER;
        goto yy3751;
 yy3762:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -125752,8 +125752,8 @@ yy3783:
        default:        goto yy3781;
        }
 yy3784:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3773;
        default:        goto yy3781;
        }
@@ -126316,8 +126316,8 @@ yy3800:
        default:        goto yy3797;
        }
 yy3801:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -126723,8 +126723,8 @@ yy3816:
        default:        goto yy3813;
        }
 yy3817:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3806;
        default:        goto yy3813;
        }
@@ -127586,8 +127586,8 @@ yy3837:
        default:        goto yy3833;
        }
 yy3838:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -127993,8 +127993,8 @@ yy3853:
        default:        goto yy3850;
        }
 yy3854:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xBF:      goto yy3843;
        default:        goto yy3850;
        }
@@ -128856,8 +128856,8 @@ yy3874:
        default:        goto yy3870;
        }
 yy3875:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -129344,8 +129344,8 @@ yy3889:
        default:        goto yy3888;
        }
 yy3890:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -129861,8 +129861,8 @@ yy3902:
        YYCURSOR = YYMARKER;
        goto yy3896;
 yy3903:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -130306,8 +130306,8 @@ yy3919:
        default:        goto yy3917;
        }
 yy3920:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -130981,8 +130981,8 @@ yy3934:
        default:        goto yy3933;
        }
 yy3935:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/cmmap.c b/re2c/test/cmmap.c
index 1369c759e3746c7bd7d16955753a36b594681f23..0f93466b5c7fa6b3b20c38b1b2c735df80729cd8 100644 (file)
--- a/re2c/test/cmmap.c
+++ b/re2c/test/cmmap.c
@@ -246,8 +246,8 @@ yy7:
            }
 #line 248 "cmmap.c"
 yy9:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy81;
        default:        goto yy10;
        }
@@ -263,8 +263,8 @@ yy11:
        default:        goto yy84;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy89;
        default:        goto yy13;
        }
@@ -273,8 +273,8 @@ yy13:
        { RET('%'); }
 #line 275 "cmmap.c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '&':       goto yy91;
        case '=':       goto yy93;
        default:        goto yy15;
@@ -301,8 +301,8 @@ yy19:
        { RET(')'); }
 #line 303 "cmmap.c"
 yy21:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy99;
        default:        goto yy22;
        }
@@ -311,8 +311,8 @@ yy22:
        { RET('*'); }
 #line 313 "cmmap.c"
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '+':       goto yy101;
        case '=':       goto yy103;
        default:        goto yy24;
@@ -327,8 +327,8 @@ yy25:
        { RET(','); }
 #line 329 "cmmap.c"
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '-':       goto yy105;
        case '=':       goto yy107;
        case '>':       goto yy109;
@@ -360,8 +360,8 @@ yy30:
        { RET('.'); }
 #line 362 "cmmap.c"
 yy31:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':       goto yy115;
        case '=':       goto yy117;
        default:        goto yy32;
@@ -419,8 +419,8 @@ yy39:
        { RET(';'); }
 #line 421 "cmmap.c"
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '<':       goto yy123;
        case '=':       goto yy125;
        default:        goto yy42;
@@ -430,8 +430,8 @@ yy42:
        { RET('<'); }
 #line 432 "cmmap.c"
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy127;
        default:        goto yy44;
        }
@@ -440,8 +440,8 @@ yy44:
        { RET('='); }
 #line 442 "cmmap.c"
 yy45:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy129;
        case '>':       goto yy131;
        default:        goto yy46;
@@ -541,8 +541,8 @@ yy54:
        { RET(']'); }
 #line 543 "cmmap.c"
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy133;
        default:        goto yy57;
        }
@@ -656,8 +656,8 @@ yy73:
        { RET('{'); }
 #line 658 "cmmap.c"
 yy75:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy162;
        case '|':       goto yy164;
        default:        goto yy76;
@@ -918,8 +918,8 @@ yy122:
        default:        goto yy85;
        }
 yy123:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy176;
        default:        goto yy124;
        }
@@ -943,8 +943,8 @@ yy129:
        { RET(GEQ); }
 #line 945 "cmmap.c"
 yy131:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy178;
        default:        goto yy132;
        }
@@ -994,8 +994,8 @@ yy140:
        default:        goto yy50;
        }
 yy141:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1102,8 +1102,8 @@ yy148:
        default:        goto yy50;
        }
 yy149:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1467,8 +1467,8 @@ yy190:
        default:        goto yy50;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1545,8 +1545,8 @@ yy193:
        default:        goto yy50;
        }
 yy194:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1707,8 +1707,8 @@ yy210:
        default:        goto yy50;
        }
 yy211:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1785,8 +1785,8 @@ yy213:
        default:        goto yy50;
        }
 yy214:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1857,8 +1857,8 @@ yy215:
        { RET(CASE); }
 #line 1859 "cmmap.c"
 yy216:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1953,8 +1953,8 @@ yy221:
        default:        goto yy50;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2025,8 +2025,8 @@ yy223:
        { RET(ELSE); }
 #line 2027 "cmmap.c"
 yy224:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2109,8 +2109,8 @@ yy227:
        default:        goto yy50;
        }
 yy228:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2181,8 +2181,8 @@ yy229:
        { RET(GOTO); }
 #line 2183 "cmmap.c"
 yy230:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2319,8 +2319,8 @@ yy242:
        default:        goto yy50;
        }
 yy243:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2403,8 +2403,8 @@ yy246:
        default:        goto yy50;
        }
 yy247:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2475,8 +2475,8 @@ yy248:
        { RET(BREAK); }
 #line 2477 "cmmap.c"
 yy249:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2571,8 +2571,8 @@ yy254:
        default:        goto yy50;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2655,8 +2655,8 @@ yy258:
        default:        goto yy50;
        }
 yy259:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2763,8 +2763,8 @@ yy266:
        default:        goto yy50;
        }
 yy267:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2847,8 +2847,8 @@ yy270:
        default:        goto yy50;
        }
 yy271:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2931,8 +2931,8 @@ yy274:
        default:        goto yy50;
        }
 yy275:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3003,8 +3003,8 @@ yy276:
        { RET(DOUBLE); }
 #line 3005 "cmmap.c"
 yy277:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3081,8 +3081,8 @@ yy279:
        default:        goto yy50;
        }
 yy280:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3153,8 +3153,8 @@ yy281:
        { RET(RETURN); }
 #line 3155 "cmmap.c"
 yy282:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3225,8 +3225,8 @@ yy283:
        { RET(SIGNED); }
 #line 3227 "cmmap.c"
 yy284:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3297,8 +3297,8 @@ yy285:
        { RET(SIZEOF); }
 #line 3299 "cmmap.c"
 yy286:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3369,8 +3369,8 @@ yy287:
        { RET(STATIC); }
 #line 3371 "cmmap.c"
 yy288:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3441,8 +3441,8 @@ yy289:
        { RET(STRUCT); }
 #line 3443 "cmmap.c"
 yy290:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3537,8 +3537,8 @@ yy295:
        default:        goto yy50;
        }
 yy296:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3615,8 +3615,8 @@ yy298:
        default:        goto yy50;
        }
 yy299:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3699,8 +3699,8 @@ yy302:
        default:        goto yy50;
        }
 yy303:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3771,8 +3771,8 @@ yy304:
        { RET(CONTINUE); }
 #line 3773 "cmmap.c"
 yy305:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3843,8 +3843,8 @@ yy306:
        { RET(REGISTER); }
 #line 3845 "cmmap.c"
 yy307:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3915,8 +3915,8 @@ yy308:
        { RET(UNSIGNED); }
 #line 3917 "cmmap.c"
 yy309:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/cnokw.c b/re2c/test/cnokw.c
index b482fed210729f197e22e3ce5e9e84b038334627..6b99d29fa15466f4262284d06de4ed99c2b000cd 100644 (file)
--- a/re2c/test/cnokw.c
+++ b/re2c/test/cnokw.c
@@ -263,8 +263,8 @@ yy7:
            }
 #line 265 "cnokw.c"
 yy9:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy66;
        default:        goto yy10;
        }
@@ -280,8 +280,8 @@ yy11:
        default:        goto yy69;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy74;
        default:        goto yy13;
        }
@@ -290,8 +290,8 @@ yy13:
        { RET('%'); }
 #line 292 "cnokw.c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '&':       goto yy76;
        case '=':       goto yy78;
        default:        goto yy15;
@@ -318,8 +318,8 @@ yy19:
        { RET(')'); }
 #line 320 "cnokw.c"
 yy21:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy84;
        default:        goto yy22;
        }
@@ -328,8 +328,8 @@ yy22:
        { RET('*'); }
 #line 330 "cnokw.c"
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '+':       goto yy86;
        case '=':       goto yy88;
        default:        goto yy24;
@@ -344,8 +344,8 @@ yy25:
        { RET(','); }
 #line 346 "cnokw.c"
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '-':       goto yy90;
        case '=':       goto yy92;
        case '>':       goto yy94;
@@ -377,8 +377,8 @@ yy30:
        { RET('.'); }
 #line 379 "cnokw.c"
 yy31:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':       goto yy100;
        case '=':       goto yy102;
        default:        goto yy32;
@@ -436,8 +436,8 @@ yy39:
        { RET(';'); }
 #line 438 "cnokw.c"
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '<':       goto yy108;
        case '=':       goto yy110;
        default:        goto yy42;
@@ -447,8 +447,8 @@ yy42:
        { RET('<'); }
 #line 449 "cnokw.c"
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy112;
        default:        goto yy44;
        }
@@ -457,8 +457,8 @@ yy44:
        { RET('='); }
 #line 459 "cnokw.c"
 yy45:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy114;
        case '>':       goto yy116;
        default:        goto yy46;
@@ -557,8 +557,8 @@ yy54:
        { RET(']'); }
 #line 559 "cnokw.c"
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy118;
        default:        goto yy57;
        }
@@ -572,8 +572,8 @@ yy58:
        { RET('{'); }
 #line 574 "cnokw.c"
 yy60:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy120;
        case '|':       goto yy122;
        default:        goto yy61;
@@ -834,8 +834,8 @@ yy107:
        default:        goto yy70;
        }
 yy108:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy134;
        default:        goto yy109;
        }
@@ -859,8 +859,8 @@ yy114:
        { RET(GEQ); }
 #line 861 "cnokw.c"
 yy116:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy136;
        default:        goto yy117;
        }

diff --git a/re2c/test/code_points.8.c b/re2c/test/code_points.8.c
index a0a68e865121510040d9a6f802116ac35ce1db00..508b79389ac2019f37a5fbaeb3aac4de41751f5a 100644 (file)
--- a/re2c/test/code_points.8.c
+++ b/re2c/test/code_points.8.c
@@ -4808,8 +4808,8 @@ yy775:
        {}
 #line 4810 "code_points.8.c"
 yy777:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:
@@ -5244,8 +5244,8 @@ yy787:
        default:        goto yy780;
        }
 yy788:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/code_points.x.c b/re2c/test/code_points.x.c
index aeb91e794fe118161e57f1da0d8b2852a04b7a64..eede5c29bcd3f0892187458c6adf80c267cdd1a5 100644 (file)
--- a/re2c/test/code_points.x.c
+++ b/re2c/test/code_points.x.c
@@ -1192,8 +1192,8 @@ yy525:
        {}
 #line 1194 "code_points.x.c"
 yy526:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy525;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy525;
        if (yych <= 0xDFFF) goto yy524;
        goto yy525;
 }

diff --git a/re2c/test/condition_06.cs.c b/re2c/test/condition_06.cs.c
index c90abde6cc07255606caac495076e5c24ba00beb..4e8dfd1c2032f11a9c06134809dd149681ffa0f2 100644 (file)
--- a/re2c/test/condition_06.cs.c
+++ b/re2c/test/condition_06.cs.c
@@ -312,8 +312,8 @@ yy54:
                        }
 #line 314 "condition_06.cs.c"
 yy56:
-                       ++s->cur;
-                       if ((yych = *s->cur) == '\n') goto yy54;
+                       yych = *++s->cur;
+                       if (yych == '\n') goto yy54;
                        goto yy49;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_08.cbi.c b/re2c/test/condition_08.cbi.c
index ec6a446980f91d32d757ce16a0841c99a1722058..b4264232cb454c7ce470b1f6bc617a9292f30d4d 100644 (file)
--- a/re2c/test/condition_08.cbi.c
+++ b/re2c/test/condition_08.cbi.c
@@ -295,8 +295,8 @@ yy59:
                                goto yyc_Skiptoeol;
                        }
 yy61:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy59;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
                goto yy54;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_08.cbif.c b/re2c/test/condition_08.cbif.c
index 017009b68d1c3fbcf6f26165223e2b694aed2381..060856258b4b63ed33da5ae048739101b9d42890 100644 (file)
--- a/re2c/test/condition_08.cbif.c
+++ b/re2c/test/condition_08.cbif.c
@@ -310,8 +310,8 @@ yy59:
                                goto yyc_Skiptoeol;
                        }
 yy61:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy59;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy59;
                goto yy54;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_09.cbif.c b/re2c/test/condition_09.cbif.c
index ceafc6a8896df69213d791872b44c0f761ce8289..35777be321be117a66046963abc4c1aa7d013932 100644 (file)
--- a/re2c/test/condition_09.cbif.c
+++ b/re2c/test/condition_09.cbif.c
@@ -338,8 +338,8 @@ yy62:
                                goto yyc_Skiptoeol;
                        }
 yy64:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy62;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy62;
                goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_09.cgif.c b/re2c/test/condition_09.cgif.c
index a312343c6697ddef87e4b0eef990828f3b308730..6ae01e119e0dd68bc1e7b72f1cc6487973dba0bb 100644 (file)
--- a/re2c/test/condition_09.cgif.c
+++ b/re2c/test/condition_09.cgif.c
@@ -414,8 +414,8 @@ yy62:
                                goto yyc_Skiptoeol;
                        }
 yy64:
-                       ++s->cur;
-                       if ((s->yych = *s->cur) == '\n') goto yy62;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy62;
                        goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_10.cgif--skeleton.c b/re2c/test/condition_10.cgif--skeleton.c
index bcc8d1c05d169dd9ad5f739445a35e584f35579e..5923f36cfbc7f8c0d3af24efa1b649e15aada329 100644 (file)
--- a/re2c/test/condition_10.cgif--skeleton.c
+++ b/re2c/test/condition_10.cgif--skeleton.c
@@ -718,7 +718,8 @@ yy64:
         continue;
 yy66:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy64;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy64;
         goto yy59;
 
     }

diff --git a/re2c/test/condition_10.cgif.c b/re2c/test/condition_10.cgif.c
index 42a78b4587750870f6e5f8a89961a8e43b0b0dd0..a35d76a6b40ef95e6631d4af1d1e5ef5fc76eab0 100644 (file)
--- a/re2c/test/condition_10.cgif.c
+++ b/re2c/test/condition_10.cgif.c
@@ -372,8 +372,8 @@ yy62:
                        ++s->cur;
                        goto yyc_Skiptoeol;
 yy64:
-                       ++s->cur;
-                       if ((s->yych = *s->cur) == '\n') goto yy62;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy62;
                        goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_12.cgif.c b/re2c/test/condition_12.cgif.c
index 64158b251bcdf3aaea32ace47ea6f89dae731da5..5cd0c2f07600720128b7d3f501513c552f0b76ed 100644 (file)
--- a/re2c/test/condition_12.cgif.c
+++ b/re2c/test/condition_12.cgif.c
@@ -372,8 +372,8 @@ yy62:
                        ++s->cur;
                        goto yyc_Skiptoeol;
 yy64:
-                       ++s->cur;
-                       if ((s->yych = *s->cur) == '\n') goto yy62;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy62;
                        goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_14.cbif.c b/re2c/test/condition_14.cbif.c
index cc49f47daae58c9264648583fde60d4826860e29..7deb30a1d583781fe44dc66675e9be0b7ab8c3e6 100644 (file)
--- a/re2c/test/condition_14.cbif.c
+++ b/re2c/test/condition_14.cbif.c
@@ -296,8 +296,8 @@ yy62:
                ++s->cur;
                continue;
 yy64:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy62;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy62;
                goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_14.cgif.c b/re2c/test/condition_14.cgif.c
index bb5b33fe17b4f093f9f6ba15e7fb294c792828cb..0159922cde1bbb9e8ecae4b379202e1237c68d75 100644 (file)
--- a/re2c/test/condition_14.cgif.c
+++ b/re2c/test/condition_14.cgif.c
@@ -372,8 +372,8 @@ yy62:
                        ++s->cur;
                        continue;
 yy64:
-                       ++s->cur;
-                       if ((s->yych = *s->cur) == '\n') goto yy62;
+                       s->yych = *++s->cur;
+                       if (s->yych == '\n') goto yy62;
                        goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_14.cif.c b/re2c/test/condition_14.cif.c
index d2e7c8d9c1cfacee4d730cd69fdc765a8f4c1cce..fa5f8b87d5454201663ada08528f6f376dc6ed2a 100644 (file)
--- a/re2c/test/condition_14.cif.c
+++ b/re2c/test/condition_14.cif.c
@@ -317,8 +317,8 @@ yy62:
                ++s->cur;
                continue;
 yy64:
-               ++s->cur;
-               switch ((s->yych = *s->cur)) {
+               s->yych = *++s->cur;
+               switch (s->yych) {
                case '\n':      goto yy62;
                default:        goto yy57;
                }

diff --git a/re2c/test/condition_14.csif.c b/re2c/test/condition_14.csif.c
index cc49f47daae58c9264648583fde60d4826860e29..7deb30a1d583781fe44dc66675e9be0b7ab8c3e6 100644 (file)
--- a/re2c/test/condition_14.csif.c
+++ b/re2c/test/condition_14.csif.c
@@ -296,8 +296,8 @@ yy62:
                ++s->cur;
                continue;
 yy64:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy62;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy62;
                goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/condition_15.csif.c b/re2c/test/condition_15.csif.c
index 7002913fce2c4dea872c499f7dd1a9fc5380c48f..424ce3a380510f0337ec8f0fd3192b5028068595 100644 (file)
--- a/re2c/test/condition_15.csif.c
+++ b/re2c/test/condition_15.csif.c
@@ -310,8 +310,8 @@ yy62:
                ++s->cur;
                continue;
 yy64:
-               ++s->cur;
-               if ((s->yych = *s->cur) == '\n') goto yy62;
+               s->yych = *++s->cur;
+               if (s->yych == '\n') goto yy62;
                goto yy57;
 /* *********************************** */
 yyc_String:

diff --git a/re2c/test/config10.--skeleton.c b/re2c/test/config10.--skeleton.c
index ee2aa98944dc14b41c461b750ae4962b9cffa980..4813973ea78b50e9a7249045d0ec4b475f05b3a7 100644 (file)
Binary files a/re2c/test/config10.--skeleton.c and b/re2c/test/config10.--skeleton.c differ

diff --git a/re2c/test/config10.c b/re2c/test/config10.c
index 34a3575e4ecdae606d41381b63cde71d827e7bac..b90448d6882de9072bac451625836230d700aefd 100644 (file)
--- a/re2c/test/config10.c
+++ b/re2c/test/config10.c
@@ -146,8 +146,8 @@ xx12:
        { return KEYWORD; }
 #line 148 "config10.c"
 xx13:
-       ++s.cur;
-       switch ((curr = *s.cur)) {
+       curr = *++s.cur;
+       switch (curr) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/config6.c b/re2c/test/config6.c
index d8b6ee5e7c7e760a4fb51a9e277ff1060dbe71cd..446c577bf17927ba15e5632155ff6077649a794c 100644 (file)
--- a/re2c/test/config6.c
+++ b/re2c/test/config6.c
@@ -55,8 +55,8 @@ yy8:
                        { printf("-\n");        continue; }
 #line 57 "config6.c"
 yy10:
-                       ++YYCURSOR;
-                       switch ((yych = *YYCURSOR)) {
+                       yych = *++YYCURSOR;
+                       switch (yych) {
                        case '0':
                        case '1':
                        case '2':

diff --git a/re2c/test/config8.c b/re2c/test/config8.c
index 91377b272be6a9bbaf11ea3ff92b90829f5d93aa..b59bd451cdab6c35ddede2c2b3d7f074bfb1105b 100644 (file)
--- a/re2c/test/config8.c
+++ b/re2c/test/config8.c
@@ -146,8 +146,8 @@ xx12:
        { return KEYWORD; }
 #line 148 "config8.c"
 xx13:
-       ++s.cur;
-       switch ((curr = *s.cur)) {
+       curr = *++s.cur;
+       switch (curr) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/config9.b.c b/re2c/test/config9.b.c
index e08ae8002134398d1412ae9391420ee05fccd97a..93184ad7eb08fc4708125969d357134f4044ee27 100644 (file)
--- a/re2c/test/config9.b.c
+++ b/re2c/test/config9.b.c
@@ -141,8 +141,8 @@ xx12:
        { return KEYWORD; }
 #line 143 "config9.b.c"
 xx13:
-       ++s.cur;
-       if ((curr = (unsigned char)*s.cur) <= '/') goto xx14;
+       curr = (unsigned char)*++s.cur;
+       if (curr <= '/') goto xx14;
        if (curr <= '9') goto xx10;
 xx14:
        s.cur -= 1;

diff --git a/re2c/test/control_flow_fail.--skeleton.c b/re2c/test/control_flow_fail.--skeleton.c
index 78c9ebae3e515c6bf565e9e1fc626a1a67f2fe60..3ae2f0db9665e7700a5270d82568e6846c378b0e 100644 (file)
Binary files a/re2c/test/control_flow_fail.--skeleton.c and b/re2c/test/control_flow_fail.--skeleton.c differ

diff --git a/re2c/test/control_flow_fail.c b/re2c/test/control_flow_fail.c
index 6c507a265830ac869eac989721e88c9f8636bccb..af3f68e8dbdbbd634b280034259ff126cb0d2dba 100644 (file)
--- a/re2c/test/control_flow_fail.c
+++ b/re2c/test/control_flow_fail.c
@@ -12,8 +12,8 @@
        default:        goto yy3;
        }
 yy3:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy7;
        default:        goto yy4;
        }

diff --git a/re2c/test/control_flow_ok.--skeleton.c b/re2c/test/control_flow_ok.--skeleton.c
index ec58658226ed7af31175b30ddb156e172c662ebf..09272a0a6e3e121f706bdc5fc4a850fc8aa86154 100644 (file)
Binary files a/re2c/test/control_flow_ok.--skeleton.c and b/re2c/test/control_flow_ok.--skeleton.c differ

diff --git a/re2c/test/control_flow_ok.c b/re2c/test/control_flow_ok.c
index 7b7d24dffc74a97baf74db9bcc9db3bf519ad12a..035aaf43dce97f6c7d75f5fae9c20e84a2db7262 100644 (file)
--- a/re2c/test/control_flow_ok.c
+++ b/re2c/test/control_flow_ok.c
@@ -7,8 +7,8 @@
        if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
        yych = *YYCURSOR;
        yych = *++YYCURSOR;
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy5;
        default:        goto yy4;
        }

diff --git a/re2c/test/ctx.--skeleton.c b/re2c/test/ctx.--skeleton.c
index c12f3910f4270d5ce43c2582a134926ba396ffbd..ec6ecd25626b2fec35de06733a52e66e1558ddad 100644 (file)
Binary files a/re2c/test/ctx.--skeleton.c and b/re2c/test/ctx.--skeleton.c differ

diff --git a/re2c/test/ctx.b.c b/re2c/test/ctx.b.c
index 8466ab74113adabee822f1fd84dabdcc8e3e84ae..ac113c7831d9534442a33a6926149a35c8b56edf 100644 (file)
--- a/re2c/test/ctx.b.c
+++ b/re2c/test/ctx.b.c
@@ -145,8 +145,8 @@ yy12:
        { return KEYWORD; }
 #line 147 "ctx.b.c"
 yy13:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy14;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy14;
        if (yych <= '9') goto yy10;
 yy14:
        YYCURSOR -= 1;

diff --git a/re2c/test/ctx.c b/re2c/test/ctx.c
index fba78fe5692b96b6d0d12f4aa17f7282861c3ec8..bcd0d8a025ad707123734e27a983d42b76286427 100644 (file)
--- a/re2c/test/ctx.c
+++ b/re2c/test/ctx.c
@@ -150,8 +150,8 @@ yy12:
        { return KEYWORD; }
 #line 152 "ctx.c"
 yy13:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/ctx.s.c b/re2c/test/ctx.s.c
index 4a8707f798c92dbd8cb10021319da2c204b4d0cb..0d062d1ae439fd6f86df412da00edced1907afa4 100644 (file)
--- a/re2c/test/ctx.s.c
+++ b/re2c/test/ctx.s.c
@@ -112,8 +112,8 @@ yy12:
        { return KEYWORD; }
 #line 114 "ctx.s.c"
 yy13:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy14;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy14;
        if (yych <= '9') goto yy10;
 yy14:
        YYCURSOR -= 1;

diff --git a/re2c/test/cunroll.c b/re2c/test/cunroll.c
index 383bbcb228450c71f9ee88ebc632aff96ddf76aa..9d7c76bec2f2a61926ff6b6395d0dcc4fbd26395 100644 (file)
--- a/re2c/test/cunroll.c
+++ b/re2c/test/cunroll.c
@@ -263,8 +263,8 @@ yy7:
            }
 #line 265 "cunroll.c"
 yy9:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy65;
        default:        goto yy10;
        }
@@ -280,8 +280,8 @@ yy11:
        default:        goto yy68;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy73;
        default:        goto yy13;
        }
@@ -290,8 +290,8 @@ yy13:
        { RET('%'); }
 #line 292 "cunroll.c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '&':       goto yy75;
        case '=':       goto yy77;
        default:        goto yy15;
@@ -318,8 +318,8 @@ yy19:
        { RET(')'); }
 #line 320 "cunroll.c"
 yy21:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy83;
        default:        goto yy22;
        }
@@ -328,8 +328,8 @@ yy22:
        { RET('*'); }
 #line 330 "cunroll.c"
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '+':       goto yy85;
        case '=':       goto yy87;
        default:        goto yy24;
@@ -344,8 +344,8 @@ yy25:
        { RET(','); }
 #line 346 "cunroll.c"
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '-':       goto yy89;
        case '=':       goto yy91;
        case '>':       goto yy93;
@@ -377,8 +377,8 @@ yy30:
        { RET('.'); }
 #line 379 "cunroll.c"
 yy31:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':       goto yy99;
        case '=':       goto yy101;
        default:        goto yy32;
@@ -436,8 +436,8 @@ yy39:
        { RET(';'); }
 #line 438 "cunroll.c"
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '<':       goto yy107;
        case '=':       goto yy109;
        default:        goto yy42;
@@ -447,8 +447,8 @@ yy42:
        { RET('<'); }
 #line 449 "cunroll.c"
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy111;
        default:        goto yy44;
        }
@@ -457,8 +457,8 @@ yy44:
        { RET('='); }
 #line 459 "cunroll.c"
 yy45:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy113;
        case '>':       goto yy115;
        default:        goto yy46;
@@ -473,8 +473,8 @@ yy47:
        { RET('?'); }
 #line 475 "cunroll.c"
 yy49:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -555,8 +555,8 @@ yy53:
        { RET(']'); }
 #line 557 "cunroll.c"
 yy55:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy119;
        default:        goto yy56;
        }
@@ -570,8 +570,8 @@ yy57:
        { RET('{'); }
 #line 572 "cunroll.c"
 yy59:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy121;
        case '|':       goto yy123;
        default:        goto yy60;
@@ -832,8 +832,8 @@ yy106:
        default:        goto yy69;
        }
 yy107:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy135;
        default:        goto yy108;
        }
@@ -857,8 +857,8 @@ yy113:
        { RET(GEQ); }
 #line 859 "cunroll.c"
 yy115:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy137;
        default:        goto yy116;
        }
@@ -867,8 +867,8 @@ yy116:
        { RET(RSHIFT); }
 #line 869 "cunroll.c"
 yy117:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1099,8 +1099,8 @@ yy137:
        { RET(RSHIFTEQ); }
 #line 1101 "cunroll.c"
 yy139:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1171,8 +1171,8 @@ yy140:
        { RET(ID); }
 #line 1173 "cunroll.c"
 yy141:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1243,8 +1243,8 @@ yy142:
        { RET(ID); }
 #line 1245 "cunroll.c"
 yy143:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1315,8 +1315,8 @@ yy144:
        { RET(ID); }
 #line 1317 "cunroll.c"
 yy145:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1387,8 +1387,8 @@ yy146:
        { RET(ID); }
 #line 1389 "cunroll.c"
 yy147:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1459,8 +1459,8 @@ yy148:
        { RET(ID); }
 #line 1461 "cunroll.c"
 yy149:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1622,8 +1622,8 @@ comment:
        default:        goto yy156;
        }
 yy156:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy157;
        default:        goto yy163;
@@ -1633,8 +1633,8 @@ yy157:
        { goto comment; }
 #line 1635 "cunroll.c"
 yy158:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy159;
        default:        goto yy163;
@@ -1648,8 +1648,8 @@ yy159:
            }
 #line 1650 "cunroll.c"
 yy160:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '/':       goto yy165;
        default:        goto yy161;
        }
@@ -1661,8 +1661,8 @@ yy162:
        ++YYCURSOR;
        goto yy161;
 yy163:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy164;
        default:        goto yy167;
@@ -1677,8 +1677,8 @@ yy165:
        { goto std; }
 #line 1679 "cunroll.c"
 yy167:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy168;
        default:        goto yy169;
@@ -1688,8 +1688,8 @@ yy168:
        { goto comment; }
 #line 1690 "cunroll.c"
 yy169:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy170;
        default:        goto yy171;
@@ -1699,8 +1699,8 @@ yy170:
        { goto comment; }
 #line 1701 "cunroll.c"
 yy171:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy172;
        default:        goto yy173;
@@ -1710,8 +1710,8 @@ yy172:
        { goto comment; }
 #line 1712 "cunroll.c"
 yy173:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy174;
        default:        goto yy175;
@@ -1721,8 +1721,8 @@ yy174:
        { goto comment; }
 #line 1723 "cunroll.c"
 yy175:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':
        case '/':       goto yy176;
        default:        goto yy177;

diff --git a/re2c/test/default_full.8--encoding-policy(fail).c b/re2c/test/default_full.8--encoding-policy(fail).c
index b952814050d5198f98491931c522788399d79e9b..aa04109442d5ff7754c390d3cf23379c4fdbb0ff 100644 (file)
--- a/re2c/test/default_full.8--encoding-policy(fail).c
+++ b/re2c/test/default_full.8--encoding-policy(fail).c
@@ -627,8 +627,8 @@ yy14:
        YYCURSOR = YYMARKER;
        goto yy5;
 yy15:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/default_full.8--encoding-policy(substitute).c b/re2c/test/default_full.8--encoding-policy(substitute).c
index 2b4815d47d8c778f46f2d01405dba9ca532b09b6..d6fd4b6f203cca8424cb59410d4be2e9a77da473 100644 (file)
--- a/re2c/test/default_full.8--encoding-policy(substitute).c
+++ b/re2c/test/default_full.8--encoding-policy(substitute).c
@@ -627,8 +627,8 @@ yy14:
        YYCURSOR = YYMARKER;
        goto yy5;
 yy15:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/default_full.8.c b/re2c/test/default_full.8.c
index b3236da02df67a74df9dfa33ad6e3cb644e256e9..5a9543e652992daa0876edac8fafb026138ae25d 100644 (file)
--- a/re2c/test/default_full.8.c
+++ b/re2c/test/default_full.8.c
@@ -590,8 +590,8 @@ yy13:
        YYCURSOR = YYMARKER;
        goto yy5;
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/default_full.x--encoding-policy(fail).c b/re2c/test/default_full.x--encoding-policy(fail).c
index 0452e5d4fb3d6eacea178968bf9903968f660134..ac78989e99c884287c6592d65aa3b78b74a9a894 100644 (file)
--- a/re2c/test/default_full.x--encoding-policy(fail).c
+++ b/re2c/test/default_full.x--encoding-policy(fail).c
@@ -15,8 +15,8 @@ yy2:
        { return FULL; }
 #line 17 "default_full.x--encoding-policy(fail).c"
 yy4:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy5;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy5;
        if (yych <= 0xDFFF) goto yy2;
 yy5:
 #line 2 "default_full.x--encoding-policy(fail).re"

diff --git a/re2c/test/default_full.x--encoding-policy(substitute).c b/re2c/test/default_full.x--encoding-policy(substitute).c
index fd75ad2e35ce26a81505a7d6b275c761ef063719..b355026554589a79754ab691bc05971f12a2fe8a 100644 (file)
--- a/re2c/test/default_full.x--encoding-policy(substitute).c
+++ b/re2c/test/default_full.x--encoding-policy(substitute).c
@@ -15,8 +15,8 @@ yy2:
        { return FULL; }
 #line 17 "default_full.x--encoding-policy(substitute).c"
 yy4:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy5;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy5;
        if (yych <= 0xDFFF) goto yy2;
 yy5:
 #line 2 "default_full.x--encoding-policy(substitute).re"

diff --git a/re2c/test/default_full.x.c b/re2c/test/default_full.x.c
index ced17d108a0fc5199f244f2cccd9f4c0ea2d2622..dd8f16686e9bd587c1fcd33b17f02b37bf8641c8 100644 (file)
--- a/re2c/test/default_full.x.c
+++ b/re2c/test/default_full.x.c
@@ -15,8 +15,8 @@ yy3:
        { return FULL; }
 #line 17 "default_full.x.c"
 yy4:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDFFF) goto yy2;
        goto yy3;
 }

diff --git a/re2c/test/input_custom_mjson.--input(custom).c b/re2c/test/input_custom_mjson.--input(custom).c
index 6a5e5f37964bfdd65425097b68f85812e7bdd361..5d250123eae0455150f409e0a423420483baed15 100644 (file)
--- a/re2c/test/input_custom_mjson.--input(custom).c
+++ b/re2c/test/input_custom_mjson.--input(custom).c
@@ -670,7 +670,8 @@ yy14:
             }
 yy15:
             YYSKIP ();
-            switch ((yych = YYPEEK ())) {
+            yych = YYPEEK ();
+            switch (yych) {
             case '.':
             case '0':
             case '1':
@@ -743,7 +744,7 @@ yy16:
                 token = TOK_DEC_NUMBER;
                 goto done;
             }
-#line 747 "input_custom_mjson.--input(custom).c"
+#line 748 "input_custom_mjson.--input(custom).c"
 yy17:
             YYSKIP ();
             yych = YYPEEK ();
@@ -821,7 +822,7 @@ yy19:
                 token = TOK_COLON;
                 goto done;
             }
-#line 825 "input_custom_mjson.--input(custom).c"
+#line 826 "input_custom_mjson.--input(custom).c"
 yy21:
             YYSKIP ();
 #line 552 "input_custom_mjson.--input(custom).re"
@@ -829,7 +830,7 @@ yy21:
                 token = TOK_EQUAL;
                 goto done;
             }
-#line 833 "input_custom_mjson.--input(custom).c"
+#line 834 "input_custom_mjson.--input(custom).c"
 yy23:
             YYSKIP ();
             yych = YYPEEK ();
@@ -906,7 +907,7 @@ yy25:
                 token = TOK_IDENTIFIER;
                 goto done;
             }
-#line 910 "input_custom_mjson.--input(custom).c"
+#line 911 "input_custom_mjson.--input(custom).c"
 yy26:
             YYSKIP ();
 #line 537 "input_custom_mjson.--input(custom).re"
@@ -914,7 +915,7 @@ yy26:
                 token = TOK_LEFT_BRACKET;
                 goto done;
             }
-#line 918 "input_custom_mjson.--input(custom).c"
+#line 919 "input_custom_mjson.--input(custom).c"
 yy28:
             YYSKIP ();
 #line 542 "input_custom_mjson.--input(custom).re"
@@ -922,7 +923,7 @@ yy28:
                 token = TOK_RIGHT_BRACKET;
                 goto done;
             }
-#line 926 "input_custom_mjson.--input(custom).c"
+#line 927 "input_custom_mjson.--input(custom).c"
 yy30:
             YYSKIP ();
             yych = YYPEEK ();
@@ -951,7 +952,7 @@ yy33:
                 token = TOK_LEFT_CURLY_BRACKET;
                 goto done;
             }
-#line 955 "input_custom_mjson.--input(custom).c"
+#line 956 "input_custom_mjson.--input(custom).c"
 yy35:
             YYSKIP ();
 #line 532 "input_custom_mjson.--input(custom).re"
@@ -959,7 +960,7 @@ yy35:
                 token = TOK_RIGHT_CURLY_BRACKET;
                 goto done;
             }
-#line 963 "input_custom_mjson.--input(custom).c"
+#line 964 "input_custom_mjson.--input(custom).c"
 yy37:
             YYSKIP ();
             yych = YYPEEK ();
@@ -986,7 +987,7 @@ yy40:
                 token = TOK_NOESC_STRING;
                 goto done;
             }
-#line 990 "input_custom_mjson.--input(custom).c"
+#line 991 "input_custom_mjson.--input(custom).c"
 yy42:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1086,7 +1087,7 @@ yy49:
                 token = TOK_FLOAT_NUMBER;
                 goto done;
             }
-#line 1090 "input_custom_mjson.--input(custom).c"
+#line 1091 "input_custom_mjson.--input(custom).c"
 yy50:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1180,7 +1181,7 @@ yy56:
                 token = TOK_OCT_NUMBER;
                 goto done;
             }
-#line 1184 "input_custom_mjson.--input(custom).c"
+#line 1185 "input_custom_mjson.--input(custom).c"
 yy57:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1257,7 +1258,7 @@ yy59:
                 context->token = TOK_INVALID;
                 return;
             }
-#line 1261 "input_custom_mjson.--input(custom).c"
+#line 1262 "input_custom_mjson.--input(custom).c"
 yy60:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1527,7 +1528,7 @@ yy74:
             {
                 continue; 
             }
-#line 1531 "input_custom_mjson.--input(custom).c"
+#line 1532 "input_custom_mjson.--input(custom).c"
 yy76:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1689,7 +1690,7 @@ yy81:
                 token = TOK_HEX_NUMBER;
                 goto done;
             }
-#line 1693 "input_custom_mjson.--input(custom).c"
+#line 1694 "input_custom_mjson.--input(custom).c"
 yy82:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1718,7 +1719,7 @@ yy85:
                 token = TOK_STRING;
                 goto done;
             }
-#line 1722 "input_custom_mjson.--input(custom).c"
+#line 1723 "input_custom_mjson.--input(custom).c"
 yy87:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1779,7 +1780,7 @@ yy93:
             {
                 continue; 
             }
-#line 1783 "input_custom_mjson.--input(custom).c"
+#line 1784 "input_custom_mjson.--input(custom).c"
 yy94:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1789,7 +1790,8 @@ yy94:
             }
 yy95:
             YYSKIP ();
-            switch ((yych = YYPEEK ())) {
+            yych = YYPEEK ();
+            switch (yych) {
             case '0':
             case '1':
             case '2':
@@ -1861,10 +1863,11 @@ yy96:
                 token = TOK_NULL;
                 goto done;
             }
-#line 1865 "input_custom_mjson.--input(custom).c"
+#line 1867 "input_custom_mjson.--input(custom).c"
 yy97:
             YYSKIP ();
-            switch ((yych = YYPEEK ())) {
+            yych = YYPEEK ();
+            switch (yych) {
             case '0':
             case '1':
             case '2':
@@ -1936,7 +1939,7 @@ yy98:
                 token = TOK_TRUE;
                 goto done;
             }
-#line 1940 "input_custom_mjson.--input(custom).c"
+#line 1943 "input_custom_mjson.--input(custom).c"
 yy99:
             YYSKIP ();
             yych = YYPEEK ();
@@ -1977,7 +1980,8 @@ yy100:
             }
 yy101:
             YYSKIP ();
-            switch ((yych = YYPEEK ())) {
+            yych = YYPEEK ();
+            switch (yych) {
             case '0':
             case '1':
             case '2':
@@ -2049,7 +2053,7 @@ yy102:
                 token = TOK_FALSE;
                 goto done;
             }
-#line 2053 "input_custom_mjson.--input(custom).c"
+#line 2057 "input_custom_mjson.--input(custom).c"
 yy103:
             YYSKIP ();
             yych = YYPEEK ();
@@ -2199,7 +2203,7 @@ static int parse_string(mjson_parser_t *context, uint32_t id)
         s = c;
 
 
-#line 2203 "input_custom_mjson.--input(custom).c"
+#line 2207 "input_custom_mjson.--input(custom).c"
         {
             YYCTYPE yych;
             yych = YYPEEK ();
@@ -2216,7 +2220,7 @@ yy107:
             { 
                 assert(!"reachable");
             }
-#line 2220 "input_custom_mjson.--input(custom).c"
+#line 2224 "input_custom_mjson.--input(custom).c"
 yy108:
             YYSKIP ();
             yych = YYPEEK ();
@@ -2237,7 +2241,7 @@ yy110:
 
                 continue;
             }
-#line 2241 "input_custom_mjson.--input(custom).c"
+#line 2245 "input_custom_mjson.--input(custom).c"
 yy111:
             YYSKIP ();
 #line 801 "input_custom_mjson.--input(custom).re"
@@ -2249,7 +2253,7 @@ yy111:
 
                 return 1;
             }
-#line 2253 "input_custom_mjson.--input(custom).c"
+#line 2257 "input_custom_mjson.--input(custom).c"
 yy113:
             YYSKIP ();
             YYBACKUP ();
@@ -2299,7 +2303,7 @@ yy114:
                 
                 continue;
             }
-#line 2303 "input_custom_mjson.--input(custom).c"
+#line 2307 "input_custom_mjson.--input(custom).c"
 yy116:
             YYSKIP ();
             yych = YYPEEK ();
@@ -2431,7 +2435,7 @@ yy121:
 
                 continue;
             }
-#line 2435 "input_custom_mjson.--input(custom).c"
+#line 2439 "input_custom_mjson.--input(custom).c"
         }
 #line 813 "input_custom_mjson.--input(custom).re"
 

diff --git a/re2c/test/input_custom_mjson.--skeleton--input(custom).c b/re2c/test/input_custom_mjson.--skeleton--input(custom).c
index a21304a04f1d6ec8595ffbc5e15763e12b32d4ab..909ab5331c33398399027bbc7d81a9f42f433fe0 100644 (file)
--- a/re2c/test/input_custom_mjson.--skeleton--input(custom).c
+++ b/re2c/test/input_custom_mjson.--skeleton--input(custom).c
@@ -324,7 +324,8 @@ yy14:
         }
 yy15:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '.':
         case '0':
         case '1':
@@ -1417,7 +1418,8 @@ yy94:
         }
 yy95:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -1489,7 +1491,8 @@ yy96:
         continue;
 yy97:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -1601,7 +1604,8 @@ yy100:
         }
 yy101:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':

diff --git a/re2c/test/modula.c b/re2c/test/modula.c
index ec20ce3203c7179b794c175b030bc42f5bb1d3da..a0d5572c185566f49a47d477d6d310f7c84a0200 100644 (file)
--- a/re2c/test/modula.c
+++ b/re2c/test/modula.c
@@ -218,8 +218,8 @@ yy14:
        default:        goto yy88;
        }
 yy15:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '*':       goto yy89;
        default:        goto yy16;
        }
@@ -253,8 +253,8 @@ yy25:
        {RETURN(14);}
 #line 255 "modula.c"
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '.':       goto yy91;
        default:        goto yy28;
        }
@@ -324,8 +324,8 @@ yy34:
        default:        goto yy33;
        }
 yy36:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy103;
        default:        goto yy37;
        }
@@ -339,8 +339,8 @@ yy38:
        {RETURN(20);}
 #line 341 "modula.c"
 yy40:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy105;
        case '>':       goto yy107;
        default:        goto yy41;
@@ -355,8 +355,8 @@ yy42:
        {RETURN(24);}
 #line 357 "modula.c"
 yy44:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '=':       goto yy109;
        default:        goto yy45;
        }
@@ -365,8 +365,8 @@ yy45:
        {RETURN(25);}
 #line 367 "modula.c"
 yy46:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'N':       goto yy111;
        case 'R':       goto yy112;
        default:        goto yy54;
@@ -779,8 +779,8 @@ yy113:
        default:        goto yy54;
        }
 yy114:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -874,8 +874,8 @@ yy119:
        default:        goto yy54;
        }
 yy120:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -976,8 +976,8 @@ yy126:
        default:        goto yy54;
        }
 yy127:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1053,8 +1053,8 @@ yy129:
        default:        goto yy54;
        }
 yy130:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1142,8 +1142,8 @@ yy134:
        default:        goto yy54;
        }
 yy135:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1213,8 +1213,8 @@ yy136:
        {RETURN(58);}
 #line 1215 "modula.c"
 yy137:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1322,8 +1322,8 @@ yy144:
        default:        goto yy54;
        }
 yy145:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1466,8 +1466,8 @@ yy156:
        default:        goto yy84;
        }
 yy157:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1567,8 +1567,8 @@ yy163:
        default:        goto yy54;
        }
 yy164:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1645,8 +1645,8 @@ yy166:
        default:        goto yy54;
        }
 yy167:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1728,8 +1728,8 @@ yy170:
        default:        goto yy54;
        }
 yy171:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1818,8 +1818,8 @@ yy175:
        default:        goto yy54;
        }
 yy176:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1889,8 +1889,8 @@ yy177:
        {RETURN(55);}
 #line 1891 "modula.c"
 yy178:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1996,8 +1996,8 @@ yy185:
        default:        goto yy54;
        }
 yy186:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2085,8 +2085,8 @@ yy190:
        default:        goto yy54;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2212,8 +2212,8 @@ yy199:
        default:        goto yy54;
        }
 yy200:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2295,8 +2295,8 @@ yy203:
        default:        goto yy54;
        }
 yy204:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2372,8 +2372,8 @@ yy206:
        default:        goto yy54;
        }
 yy207:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2449,8 +2449,8 @@ yy209:
        default:        goto yy54;
        }
 yy210:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2532,8 +2532,8 @@ yy213:
        default:        goto yy54;
        }
 yy214:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2645,8 +2645,8 @@ yy222:
        default:        goto yy54;
        }
 yy223:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2716,8 +2716,8 @@ yy224:
        {RETURN(67);}
 #line 2718 "modula.c"
 yy225:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2799,8 +2799,8 @@ yy228:
        default:        goto yy54;
        }
 yy229:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2870,8 +2870,8 @@ yy230:
        {RETURN(73);}
 #line 2872 "modula.c"
 yy231:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -2941,8 +2941,8 @@ yy232:
        {RETURN(35);}
 #line 2943 "modula.c"
 yy233:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3012,8 +3012,8 @@ yy234:
        {RETURN(36);}
 #line 3014 "modula.c"
 yy235:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3089,8 +3089,8 @@ yy237:
        default:        goto yy54;
        }
 yy238:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3220,8 +3220,8 @@ yy249:
        default:        goto yy54;
        }
 yy250:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3291,8 +3291,8 @@ yy251:
        {RETURN(70);}
 #line 3293 "modula.c"
 yy252:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3368,8 +3368,8 @@ yy254:
        default:        goto yy54;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3445,8 +3445,8 @@ yy257:
        default:        goto yy54;
        }
 yy258:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3516,8 +3516,8 @@ yy259:
        {RETURN(52);}
 #line 3518 "modula.c"
 yy260:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3605,8 +3605,8 @@ yy264:
        default:        goto yy54;
        }
 yy265:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3676,8 +3676,8 @@ yy266:
        {RETURN(63);}
 #line 3678 "modula.c"
 yy267:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3747,8 +3747,8 @@ yy268:
        {RETURN(64);}
 #line 3749 "modula.c"
 yy269:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3830,8 +3830,8 @@ yy272:
        default:        goto yy54;
        }
 yy273:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -3949,8 +3949,8 @@ yy282:
        default:        goto yy54;
        }
 yy283:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -4020,8 +4020,8 @@ yy284:
        {RETURN(61);}
 #line 4022 "modula.c"
 yy285:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -4091,8 +4091,8 @@ yy286:
        {RETURN(62);}
 #line 4093 "modula.c"
 yy287:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -4186,8 +4186,8 @@ yy292:
        default:        goto yy54;
        }
 yy293:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/parse_date.b.c b/re2c/test/parse_date.b.c
index aeae880f41a7157f91cce1dcc34d61bccb69cdcf..5ae16e8f7093e79eb04d858a2c36ecf404cde35d 100644 (file)
--- a/re2c/test/parse_date.b.c
+++ b/re2c/test/parse_date.b.c
@@ -1227,8 +1227,8 @@ yy16:
        if (yych <= '9') goto yy99;
        goto yy5;
 yy17:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych <= 'F') {
                        if (yych == ')') goto yy102;
                        if (yych >= 'A') goto yy103;
@@ -3554,8 +3554,8 @@ yy127:
        if (yych <= '9') goto yy126;
        goto yy18;
 yy128:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy282;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy282;
        if (yych <= '9') goto yy283;
        goto yy282;
 yy129:
@@ -5184,8 +5184,8 @@ yy220:
        if (yych <= '/') goto yy53;
        if (yych >= ':') goto yy53;
 yy222:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy223;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy223;
        if (yych <= '9') goto yy369;
 yy223:
 #line 1073 "parse_date.b.re"
@@ -5429,8 +5429,8 @@ yy249:
        if (yych == 'M') goto yy250;
        if (yych != 'm') goto yy53;
 yy250:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '.') goto yy388;
+       yych = *++YYCURSOR;
+       if (yych == '.') goto yy388;
 yy251:
 #line 929 "parse_date.b.re"
        {
@@ -5499,8 +5499,8 @@ yy254:
                goto yy18;
        }
 yy255:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -5966,8 +5966,8 @@ yy273:
                }
        }
 yy274:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'D') {
+       yych = *++YYCURSOR;
+       if (yych <= 'D') {
                if (yych <= ')') {
                        if (yych >= ')') goto yy102;
                } else {
@@ -6656,8 +6656,8 @@ yy302:
                }
        }
 yy303:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -7744,8 +7744,8 @@ yy361:
                }
        }
 yy362:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy520;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy520;
        if (yych == 's') goto yy520;
 yy363:
 #line 1379 "parse_date.b.re"
@@ -8770,8 +8770,8 @@ yy441:
                }
        }
 yy442:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == ')') goto yy102;
+       yych = *++YYCURSOR;
+       if (yych == ')') goto yy102;
 yy443:
 #line 871 "parse_date.b.re"
        {
@@ -9637,8 +9637,8 @@ yy503:
                }
        }
 yy504:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy674;
        } else {
                if (yych == 'W') goto yy505;
@@ -10659,8 +10659,8 @@ yy636:
        if (yych <= '9') goto yy753;
        goto yy192;
 yy637:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy638;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy638;
        if (yych <= '9') goto yy753;
 yy638:
 #line 1087 "parse_date.b.re"
@@ -11903,8 +11903,8 @@ yy789:
        if (yych == 't') goto yy782;
        goto yy505;
 yy790:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy791;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy791;
        if (yych <= '7') goto yy869;
 yy791:
 #line 1219 "parse_date.b.re"
@@ -11988,8 +11988,8 @@ yy801:
        ++YYCURSOR;
        goto yy586;
 yy802:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy879;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy879;
        if (yych == 's') goto yy879;
 yy803:
 #line 1323 "parse_date.b.re"
@@ -12752,8 +12752,8 @@ yy874:
        if (yych <= '1') goto yy927;
        goto yy53;
 yy875:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy876;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy876;
        if (yych <= '9') goto yy929;
 yy876:
 #line 1238 "parse_date.b.re"
@@ -13839,8 +13839,8 @@ yy1018:
        if (yych <= '5') goto yy1024;
        goto yy53;
 yy1019:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '9') goto yy1022;
 yy1020:
 #line 1163 "parse_date.b.re"
@@ -13977,8 +13977,8 @@ yy1040:
                goto yy1020;
        }
 yy1042:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1043;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1043;
        if (yych <= '9') goto yy1045;
        if (yych <= ':') goto yy1047;
 yy1043:
@@ -14061,8 +14061,8 @@ yy1052:
        if (yych <= '9') goto yy1022;
        if (yych >= ';') goto yy1020;
 yy1053:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '5') goto yy1019;
        if (yych <= '9') goto yy1022;
        goto yy1020;

diff --git a/re2c/test/parse_date.c b/re2c/test/parse_date.c
index 3f39db8934c426310325418115a647883aa3123f..89675589ec7e4983b88be38238d8bb5d9eae5bfe 100644 (file)
--- a/re2c/test/parse_date.c
+++ b/re2c/test/parse_date.c
@@ -1267,8 +1267,8 @@ yy16:
        default:        goto yy5;
        }
 yy17:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case ')':       goto yy102;
        case 'A':
        case 'B':
@@ -5512,8 +5512,8 @@ yy127:
        default:        goto yy18;
        }
 yy128:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -8755,8 +8755,8 @@ yy220:
        default:        goto yy53;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -9086,8 +9086,8 @@ yy249:
        default:        goto yy53;
        }
 yy250:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '.':       goto yy388;
        default:        goto yy251;
        }
@@ -9214,8 +9214,8 @@ yy254:
        default:        goto yy18;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case ')':       goto yy102;
        case 'A':
        case 'B':
@@ -10442,8 +10442,8 @@ yy273:
        default:        goto yy18;
        }
 yy274:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case ')':       goto yy102;
        case 'A':
        case 'B':
@@ -12164,8 +12164,8 @@ yy302:
        default:        goto yy18;
        }
 yy303:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case ')':       goto yy102;
        case 'A':
        case 'B':
@@ -14601,8 +14601,8 @@ yy361:
        default:        goto yy74;
        }
 yy362:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'S':
        case 's':       goto yy520;
        default:        goto yy363;
@@ -16097,8 +16097,8 @@ yy441:
        default:        goto yy18;
        }
 yy442:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case ')':       goto yy102;
        default:        goto yy443;
        }
@@ -17276,8 +17276,8 @@ yy503:
        default:        goto yy53;
        }
 yy504:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'I':       goto yy674;
        case 'V':
        case 'X':       goto yy675;
@@ -18631,8 +18631,8 @@ yy636:
        default:        goto yy192;
        }
 yy637:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -20261,8 +20261,8 @@ yy789:
        default:        goto yy505;
        }
 yy790:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -20390,8 +20390,8 @@ yy801:
        ++YYCURSOR;
        goto yy586;
 yy802:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'S':
        case 's':       goto yy879;
        default:        goto yy803;
@@ -21320,8 +21320,8 @@ yy874:
        default:        goto yy53;
        }
 yy875:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -23425,8 +23425,8 @@ yy1018:
        default:        goto yy53;
        }
 yy1019:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -23674,8 +23674,8 @@ yy1040:
        default:        goto yy1020;
        }
 yy1042:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -23838,8 +23838,8 @@ yy1052:
        default:        goto yy1020;
        }
 yy1053:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/parse_date.db.c b/re2c/test/parse_date.db.c
index c179fadb49f31813699ff178c02e41f219cb734a..39fff1fcde1ec6ffab7f70e21e1715dae62bc4b6 100644 (file)
--- a/re2c/test/parse_date.db.c
+++ b/re2c/test/parse_date.db.c
@@ -1209,8 +1209,8 @@ yy16:
        goto yy5;
 yy17:
        YYDEBUG(17, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych <= 'F') {
                        if (yych == ')') goto yy102;
                        if (yych >= 'A') goto yy103;
@@ -5774,8 +5774,8 @@ yy227:
        }
 yy229:
        YYDEBUG(229, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy230;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy230;
        if (yych <= '9') goto yy378;
 yy230:
        YYDEBUG(230, *YYCURSOR);
@@ -6152,8 +6152,8 @@ yy260:
        }
 yy261:
        YYDEBUG(261, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy411;
@@ -6705,8 +6705,8 @@ yy279:
        }
 yy280:
        YYDEBUG(280, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'D') {
+       yych = *++YYCURSOR;
+       if (yych <= 'D') {
                if (yych <= ')') {
                        if (yych >= ')') goto yy102;
                } else {
@@ -7525,8 +7525,8 @@ yy309:
        }
 yy310:
        YYDEBUG(310, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy411;
@@ -8722,8 +8722,8 @@ yy370:
        }
 yy371:
        YYDEBUG(371, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy535;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy535;
        if (yych == 's') goto yy535;
 yy372:
        YYDEBUG(372, *YYCURSOR);
@@ -10179,8 +10179,8 @@ yy455:
        }
 yy456:
        YYDEBUG(456, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy568;
@@ -10944,8 +10944,8 @@ yy487:
        }
 yy488:
        YYDEBUG(488, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy489;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy489;
        if (yych <= '9') goto yy650;
 yy489:
        YYDEBUG(489, *YYCURSOR);
@@ -11304,8 +11304,8 @@ yy518:
        }
 yy519:
        YYDEBUG(519, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy694;
        } else {
                if (yych == 'W') goto yy520;
@@ -13317,8 +13317,8 @@ yy638:
        goto yy366;
 yy639:
        YYDEBUG(639, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy725;
@@ -16647,8 +16647,8 @@ yy859:
        goto yy520;
 yy860:
        YYDEBUG(860, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy861;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy861;
        if (yych <= '7') goto yy992;
 yy861:
        YYDEBUG(861, *YYCURSOR);
@@ -17072,8 +17072,8 @@ yy914:
        }
 yy915:
        YYDEBUG(915, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy1002;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy1002;
        if (yych == 's') goto yy1002;
 yy916:
        YYDEBUG(916, *YYCURSOR);
@@ -18038,8 +18038,8 @@ yy997:
        goto yy53;
 yy998:
        YYDEBUG(998, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy999;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy999;
        if (yych <= '9') goto yy1054;
 yy999:
        YYDEBUG(999, *YYCURSOR);
@@ -19328,8 +19328,8 @@ yy1143:
        goto yy53;
 yy1144:
        YYDEBUG(1144, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1145;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1145;
        if (yych <= '9') goto yy1147;
 yy1145:
        YYDEBUG(1145, *YYCURSOR);
@@ -19535,8 +19535,8 @@ yy1169:
        }
 yy1171:
        YYDEBUG(1171, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1172;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1172;
        if (yych <= '9') goto yy1174;
        if (yych <= ':') goto yy1176;
 yy1172:
@@ -19632,8 +19632,8 @@ yy1181:
        if (yych >= ';') goto yy1145;
 yy1182:
        YYDEBUG(1182, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1145;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1145;
        if (yych <= '5') goto yy1144;
        if (yych <= '9') goto yy1147;
        goto yy1145;

diff --git a/re2c/test/parse_date.g.c b/re2c/test/parse_date.g.c
index b45d52a3bc02f0e7aad9ea2c86e3661ac23f7c1b..108088efc2885e3a6bb13222618bafcedf5cd0c2 100644 (file)
--- a/re2c/test/parse_date.g.c
+++ b/re2c/test/parse_date.g.c
@@ -1077,7 +1077,7 @@ yy16:
        if (yych <= '9') goto yy99;
        goto yy5;
 yy17:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        {
                static void *yytarget[256] = {
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
@@ -1113,7 +1113,7 @@ yy17:
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18
                };
-               goto *yytarget[(yych = *YYCURSOR)];
+               goto *yytarget[yych];
        }
 yy18:
 #line 1340 "parse_date.g.re"
@@ -3377,8 +3377,8 @@ yy127:
        if (yych <= '9') goto yy126;
        goto yy18;
 yy128:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy282;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy282;
        if (yych <= '9') goto yy283;
        goto yy282;
 yy129:
@@ -5027,8 +5027,8 @@ yy220:
        if (yych <= '/') goto yy53;
        if (yych >= ':') goto yy53;
 yy222:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy223;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy223;
        if (yych <= '9') goto yy369;
 yy223:
 #line 1073 "parse_date.g.re"
@@ -5290,8 +5290,8 @@ yy249:
        if (yych == 'M') goto yy250;
        if (yych != 'm') goto yy53;
 yy250:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '.') goto yy388;
+       yych = *++YYCURSOR;
+       if (yych == '.') goto yy388;
 yy251:
 #line 929 "parse_date.g.re"
        {
@@ -5368,8 +5368,8 @@ yy254:
                goto yy18;
        }
 yy255:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -5882,8 +5882,8 @@ yy273:
                }
        }
 yy274:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'D') {
+       yych = *++YYCURSOR;
+       if (yych <= 'D') {
                if (yych <= ')') {
                        if (yych >= ')') goto yy102;
                } else {
@@ -6621,8 +6621,8 @@ yy302:
                }
        }
 yy303:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -7703,8 +7703,8 @@ yy361:
                }
        }
 yy362:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy520;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy520;
        if (yych == 's') goto yy520;
 yy363:
 #line 1379 "parse_date.g.re"
@@ -8741,8 +8741,8 @@ yy441:
                }
        }
 yy442:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == ')') goto yy102;
+       yych = *++YYCURSOR;
+       if (yych == ')') goto yy102;
 yy443:
 #line 871 "parse_date.g.re"
        {
@@ -9619,8 +9619,8 @@ yy503:
                }
        }
 yy504:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy674;
        } else {
                if (yych == 'W') goto yy505;
@@ -10655,8 +10655,8 @@ yy636:
        if (yych <= '9') goto yy753;
        goto yy192;
 yy637:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy638;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy638;
        if (yych <= '9') goto yy753;
 yy638:
 #line 1087 "parse_date.g.re"
@@ -11934,8 +11934,8 @@ yy789:
        if (yych == 't') goto yy782;
        goto yy505;
 yy790:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy791;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy791;
        if (yych <= '7') goto yy869;
 yy791:
 #line 1219 "parse_date.g.re"
@@ -12019,8 +12019,8 @@ yy801:
        ++YYCURSOR;
        goto yy586;
 yy802:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy879;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy879;
        if (yych == 's') goto yy879;
 yy803:
 #line 1323 "parse_date.g.re"
@@ -12797,8 +12797,8 @@ yy874:
        if (yych <= '1') goto yy927;
        goto yy53;
 yy875:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy876;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy876;
        if (yych <= '9') goto yy929;
 yy876:
 #line 1238 "parse_date.g.re"
@@ -13899,8 +13899,8 @@ yy1018:
        if (yych <= '5') goto yy1024;
        goto yy53;
 yy1019:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '9') goto yy1022;
 yy1020:
 #line 1163 "parse_date.g.re"
@@ -14037,8 +14037,8 @@ yy1040:
                goto yy1020;
        }
 yy1042:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1043;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1043;
        if (yych <= '9') goto yy1045;
        if (yych <= ':') goto yy1047;
 yy1043:
@@ -14121,8 +14121,8 @@ yy1052:
        if (yych <= '9') goto yy1022;
        if (yych >= ';') goto yy1020;
 yy1053:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '5') goto yy1019;
        if (yych <= '9') goto yy1022;
        goto yy1020;

diff --git a/re2c/test/parse_date.s.c b/re2c/test/parse_date.s.c
index 04289979b0ebe784aff6aa33be5cf3fa25726c87..77a9cdb7c3a42391380efeebf50b306e7b9ca612 100644 (file)
--- a/re2c/test/parse_date.s.c
+++ b/re2c/test/parse_date.s.c
@@ -1192,8 +1192,8 @@ yy16:
        if (yych <= '9') goto yy99;
        goto yy5;
 yy17:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych <= 'F') {
                        if (yych == ')') goto yy102;
                        if (yych >= 'A') goto yy103;
@@ -3536,8 +3536,8 @@ yy127:
        if (yych <= '9') goto yy126;
        goto yy18;
 yy128:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy282;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy282;
        if (yych <= '9') goto yy283;
        goto yy282;
 yy129:
@@ -5148,8 +5148,8 @@ yy220:
        if (yych <= '/') goto yy53;
        if (yych >= ':') goto yy53;
 yy222:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy223;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy223;
        if (yych <= '9') goto yy369;
 yy223:
 #line 1073 "parse_date.s.re"
@@ -5393,8 +5393,8 @@ yy249:
        if (yych == 'M') goto yy250;
        if (yych != 'm') goto yy53;
 yy250:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '.') goto yy388;
+       yych = *++YYCURSOR;
+       if (yych == '.') goto yy388;
 yy251:
 #line 929 "parse_date.s.re"
        {
@@ -5463,8 +5463,8 @@ yy254:
                goto yy18;
        }
 yy255:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -5930,8 +5930,8 @@ yy273:
                }
        }
 yy274:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'D') {
+       yych = *++YYCURSOR;
+       if (yych <= 'D') {
                if (yych <= ')') {
                        if (yych >= ')') goto yy102;
                } else {
@@ -6648,8 +6648,8 @@ yy302:
                }
        }
 yy303:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy102;
        } else {
                if (yych <= 'Z') goto yy400;
@@ -7736,8 +7736,8 @@ yy361:
                }
        }
 yy362:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy520;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy520;
        if (yych == 's') goto yy520;
 yy363:
 #line 1379 "parse_date.s.re"
@@ -8761,8 +8761,8 @@ yy441:
                }
        }
 yy442:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == ')') goto yy102;
+       yych = *++YYCURSOR;
+       if (yych == ')') goto yy102;
 yy443:
 #line 871 "parse_date.s.re"
        {
@@ -9628,8 +9628,8 @@ yy503:
                }
        }
 yy504:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy674;
        } else {
                if (yych == 'W') goto yy505;
@@ -10653,8 +10653,8 @@ yy636:
        if (yych <= '9') goto yy753;
        goto yy192;
 yy637:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy638;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy638;
        if (yych <= '9') goto yy753;
 yy638:
 #line 1087 "parse_date.s.re"
@@ -11869,8 +11869,8 @@ yy789:
        if (yych == 't') goto yy782;
        goto yy505;
 yy790:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy791;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy791;
        if (yych <= '7') goto yy869;
 yy791:
 #line 1219 "parse_date.s.re"
@@ -11954,8 +11954,8 @@ yy801:
        ++YYCURSOR;
        goto yy586;
 yy802:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy879;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy879;
        if (yych == 's') goto yy879;
 yy803:
 #line 1323 "parse_date.s.re"
@@ -12725,8 +12725,8 @@ yy874:
        if (yych <= '1') goto yy927;
        goto yy53;
 yy875:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy876;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy876;
        if (yych <= '9') goto yy929;
 yy876:
 #line 1238 "parse_date.s.re"
@@ -13812,8 +13812,8 @@ yy1018:
        if (yych <= '5') goto yy1024;
        goto yy53;
 yy1019:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '9') goto yy1022;
 yy1020:
 #line 1163 "parse_date.s.re"
@@ -13950,8 +13950,8 @@ yy1040:
                goto yy1020;
        }
 yy1042:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1043;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1043;
        if (yych <= '9') goto yy1045;
        if (yych <= ':') goto yy1047;
 yy1043:
@@ -14034,8 +14034,8 @@ yy1052:
        if (yych <= '9') goto yy1022;
        if (yych >= ';') goto yy1020;
 yy1053:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1020;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1020;
        if (yych <= '5') goto yy1019;
        if (yych <= '9') goto yy1022;
        goto yy1020;

diff --git a/re2c/test/parse_date_1_78.db.c b/re2c/test/parse_date_1_78.db.c
index 7d6d7ec7cafcd4ed8c47e666392a9c2a6ea79758..504d42df757335eb90194c3be02927a9b17bb3e1 100644 (file)
--- a/re2c/test/parse_date_1_78.db.c
+++ b/re2c/test/parse_date_1_78.db.c
@@ -1301,8 +1301,8 @@ yy16:
        goto yy5;
 yy17:
        YYDEBUG(17, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych <= 'F') {
                        if (yych == ')') goto yy105;
                        if (yych >= 'A') goto yy106;
@@ -6050,8 +6050,8 @@ yy233:
        }
 yy235:
        YYDEBUG(235, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy236;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy236;
        if (yych <= '9') goto yy399;
 yy236:
        YYDEBUG(236, *YYCURSOR);
@@ -6428,8 +6428,8 @@ yy266:
        }
 yy267:
        YYDEBUG(267, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy105;
        } else {
                if (yych <= 'Z') goto yy433;
@@ -6992,8 +6992,8 @@ yy286:
        }
 yy287:
        YYDEBUG(287, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'D') {
+       yych = *++YYCURSOR;
+       if (yych <= 'D') {
                if (yych <= ')') {
                        if (yych >= ')') goto yy105;
                } else {
@@ -7918,8 +7918,8 @@ yy321:
        }
 yy322:
        YYDEBUG(322, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy105;
        } else {
                if (yych <= 'Z') goto yy433;
@@ -9376,8 +9376,8 @@ yy391:
        }
 yy392:
        YYDEBUG(392, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy575;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy575;
        if (yych == 's') goto yy575;
 yy393:
        YYDEBUG(393, *YYCURSOR);
@@ -10939,8 +10939,8 @@ yy487:
        }
 yy488:
        YYDEBUG(488, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy105;
        } else {
                if (yych <= 'Z') goto yy611;
@@ -12244,8 +12244,8 @@ yy558:
        }
 yy559:
        YYDEBUG(559, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy743;
        } else {
                if (yych == 'W') goto yy560;
@@ -13957,8 +13957,8 @@ yy680:
        goto yy387;
 yy681:
        YYDEBUG(681, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy105;
        } else {
                if (yych <= 'Z') goto yy777;
@@ -17955,8 +17955,8 @@ yy1008:
        goto yy54;
 yy1009:
        YYDEBUG(1009, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1010;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1010;
        if (yych <= '9') goto yy1070;
 yy1010:
        YYDEBUG(1010, *YYCURSOR);
@@ -18160,8 +18160,8 @@ yy1018:
        }
 yy1019:
        YYDEBUG(1019, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy1086;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy1086;
        if (yych == 's') goto yy1086;
 yy1020:
        YYDEBUG(1020, *YYCURSOR);
@@ -19826,8 +19826,8 @@ yy1188:
        goto yy54;
 yy1189:
        YYDEBUG(1189, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1190;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1190;
        if (yych <= '9') goto yy1192;
 yy1190:
        YYDEBUG(1190, *YYCURSOR);
@@ -20046,8 +20046,8 @@ yy1215:
        }
 yy1217:
        YYDEBUG(1217, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1218;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1218;
        if (yych <= '9') goto yy1220;
        if (yych <= ':') goto yy1224;
 yy1218:
@@ -20172,8 +20172,8 @@ yy1232:
        goto yy1190;
 yy1233:
        YYDEBUG(1233, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '+') goto yy1222;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy1222;
        if (yych == '-') goto yy1222;
        goto yy54;
 }

diff --git a/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c b/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c
index 7fb5b4816187e3f31f9a6dc81979e54e3e4a764d..d93c66de1e39a7ee75924d801066884a3134dc35 100644 (file)
--- a/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c
+++ b/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c
@@ -1139,8 +1139,8 @@ yy5:
                        goto yy4;
                }
                YYDEBUG(6, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy12;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy12;
                YYDEBUG(7, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -2359,8 +2359,8 @@ yy126:
 }
 yy129:
                YYDEBUG(129, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy191;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy191;
 yy130:
                YYDEBUG(130, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -2722,8 +2722,8 @@ yy155:
                goto yy130;
 yy156:
                YYDEBUG(156, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == 'N') goto yy258;
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy258;
                goto yy159;
 yy157:
                YYDEBUG(157, *YYCURSOR);
@@ -3008,8 +3008,8 @@ yy189:
 }
 yy191:
                YYDEBUG(191, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy313;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy313;
 yy192:
                YYDEBUG(192, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -3077,8 +3077,8 @@ yy196:
 }
 yy198:
                YYDEBUG(198, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy315;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy315;
                if (yych == '\r') goto yy316;
 yy199:
                YYDEBUG(199, *YYCURSOR);
@@ -3419,8 +3419,8 @@ yy247:
                goto yy192;
 yy248:
                YYDEBUG(248, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy342;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy342;
                YYDEBUG(249, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -3444,8 +3444,8 @@ yy252:
 }
 yy254:
                YYDEBUG(254, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy344;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy344;
                YYDEBUG(255, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -3453,8 +3453,8 @@ yy254:
 }
 yy256:
                YYDEBUG(256, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy346;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy346;
                if (yych == '\r') goto yy347;
 yy257:
                YYDEBUG(257, *YYCURSOR);
@@ -3473,8 +3473,8 @@ yy258:
                goto yy159;
 yy259:
                YYDEBUG(259, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(260, *YYCURSOR);
@@ -3547,8 +3547,8 @@ yy266:
                goto yy159;
 yy267:
                YYDEBUG(267, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(268, *YYCURSOR);
@@ -3601,8 +3601,8 @@ yy275:
                goto yy159;
 yy276:
                YYDEBUG(276, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(277, *YYCURSOR);
@@ -3668,8 +3668,8 @@ yy288:
                goto yy159;
 yy289:
                YYDEBUG(289, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(290, *YYCURSOR);
@@ -4038,8 +4038,8 @@ yy347:
                goto yy257;
 yy348:
                YYDEBUG(348, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(349, *YYCURSOR);
@@ -4049,8 +4049,8 @@ yy348:
 }
 yy350:
                YYDEBUG(350, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(351, *YYCURSOR);
@@ -4163,8 +4163,8 @@ yy371:
                goto yy159;
 yy372:
                YYDEBUG(372, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(373, *YYCURSOR);
@@ -4249,7 +4249,7 @@ yy381:
                goto yy159;
 yy382:
                YYDEBUG(382, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383,
@@ -4285,7 +4285,7 @@ yy382:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy383:
                YYDEBUG(383, *YYCURSOR);
@@ -4345,8 +4345,8 @@ yy393:
                goto yy159;
 yy394:
                YYDEBUG(394, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(395, *YYCURSOR);
@@ -4402,8 +4402,8 @@ yy404:
                goto yy159;
 yy405:
                YYDEBUG(405, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(406, *YYCURSOR);
@@ -4418,8 +4418,8 @@ yy407:
                goto yy159;
 yy408:
                YYDEBUG(408, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(409, *YYCURSOR);
@@ -4429,8 +4429,8 @@ yy408:
 }
 yy410:
                YYDEBUG(410, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(411, *YYCURSOR);
@@ -4642,8 +4642,8 @@ yy443:
                goto yy159;
 yy444:
                YYDEBUG(444, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(445, *YYCURSOR);
@@ -4688,8 +4688,8 @@ yy452:
                goto yy159;
 yy453:
                YYDEBUG(453, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(454, *YYCURSOR);
@@ -4699,7 +4699,7 @@ yy453:
 }
 yy455:
                YYDEBUG(455, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456,
@@ -4735,7 +4735,7 @@ yy455:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy456:
                YYDEBUG(456, *YYCURSOR);
@@ -4775,8 +4775,8 @@ yy462:
                goto yy159;
 yy463:
                YYDEBUG(463, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(464, *YYCURSOR);
@@ -4786,8 +4786,8 @@ yy463:
 }
 yy465:
                YYDEBUG(465, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(466, *YYCURSOR);
@@ -4822,8 +4822,8 @@ yy471:
                goto yy159;
 yy472:
                YYDEBUG(472, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(473, *YYCURSOR);
@@ -4859,8 +4859,8 @@ yy478:
                goto yy159;
 yy479:
                YYDEBUG(479, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(480, *YYCURSOR);
@@ -5220,8 +5220,8 @@ yy527:
                goto yy159;
 yy528:
                YYDEBUG(528, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(529, *YYCURSOR);
@@ -5231,8 +5231,8 @@ yy528:
 }
 yy530:
                YYDEBUG(530, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(531, *YYCURSOR);
@@ -5247,8 +5247,8 @@ yy532:
                goto yy159;
 yy533:
                YYDEBUG(533, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(534, *YYCURSOR);
@@ -5258,8 +5258,8 @@ yy533:
 }
 yy535:
                YYDEBUG(535, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(536, *YYCURSOR);
@@ -5269,8 +5269,8 @@ yy535:
 }
 yy537:
                YYDEBUG(537, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(538, *YYCURSOR);
@@ -5280,8 +5280,8 @@ yy537:
 }
 yy539:
                YYDEBUG(539, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(540, *YYCURSOR);
@@ -5311,8 +5311,8 @@ yy544:
                goto yy159;
 yy545:
                YYDEBUG(545, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(546, *YYCURSOR);
@@ -5332,8 +5332,8 @@ yy548:
                goto yy159;
 yy549:
                YYDEBUG(549, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(550, *YYCURSOR);
@@ -5358,7 +5358,7 @@ yy553:
                goto yy159;
 yy554:
                YYDEBUG(554, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555,
@@ -5394,7 +5394,7 @@ yy554:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy555:
                YYDEBUG(555, *YYCURSOR);
@@ -5444,8 +5444,8 @@ yy563:
                goto yy159;
 yy564:
                YYDEBUG(564, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(565, *YYCURSOR);
@@ -5460,8 +5460,8 @@ yy566:
                goto yy159;
 yy567:
                YYDEBUG(567, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(568, *YYCURSOR);
@@ -5506,8 +5506,8 @@ yy575:
                goto yy159;
 yy576:
                YYDEBUG(576, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(577, *YYCURSOR);
@@ -5517,8 +5517,8 @@ yy576:
 }
 yy578:
                YYDEBUG(578, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(579, *YYCURSOR);
@@ -5528,8 +5528,8 @@ yy578:
 }
 yy580:
                YYDEBUG(580, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(581, *YYCURSOR);
@@ -5539,8 +5539,8 @@ yy580:
 }
 yy582:
                YYDEBUG(582, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(583, *YYCURSOR);
@@ -5550,8 +5550,8 @@ yy582:
 }
 yy584:
                YYDEBUG(584, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(585, *YYCURSOR);
@@ -5729,8 +5729,8 @@ yy617:
                goto yy159;
 yy618:
                YYDEBUG(618, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(619, *YYCURSOR);
@@ -5745,7 +5745,7 @@ yy620:
                goto yy159;
 yy621:
                YYDEBUG(621, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622,
@@ -5781,7 +5781,7 @@ yy621:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy622:
                YYDEBUG(622, *YYCURSOR);
@@ -5821,8 +5821,8 @@ yy628:
                goto yy159;
 yy629:
                YYDEBUG(629, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(630, *YYCURSOR);
@@ -5872,8 +5872,8 @@ yy638:
                goto yy159;
 yy639:
                YYDEBUG(639, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(640, *YYCURSOR);
@@ -5888,8 +5888,8 @@ yy641:
                goto yy159;
 yy642:
                YYDEBUG(642, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(643, *YYCURSOR);
@@ -5899,8 +5899,8 @@ yy642:
 }
 yy644:
                YYDEBUG(644, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(645, *YYCURSOR);
@@ -5910,8 +5910,8 @@ yy644:
 }
 yy646:
                YYDEBUG(646, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(647, *YYCURSOR);
@@ -5985,8 +5985,8 @@ yy659:
                goto yy159;
 yy660:
                YYDEBUG(660, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(661, *YYCURSOR);
@@ -6069,8 +6069,8 @@ yy671:
                goto yy159;
 yy672:
                YYDEBUG(672, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(673, *YYCURSOR);
@@ -6080,8 +6080,8 @@ yy672:
 }
 yy674:
                YYDEBUG(674, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(675, *YYCURSOR);
@@ -6111,8 +6111,8 @@ yy679:
                goto yy159;
 yy680:
                YYDEBUG(680, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(681, *YYCURSOR);
@@ -6122,8 +6122,8 @@ yy680:
 }
 yy682:
                YYDEBUG(682, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(683, *YYCURSOR);
@@ -6133,8 +6133,8 @@ yy682:
 }
 yy684:
                YYDEBUG(684, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(685, *YYCURSOR);
@@ -6154,7 +6154,7 @@ yy687:
                goto yy159;
 yy688:
                YYDEBUG(688, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689,
@@ -6190,7 +6190,7 @@ yy688:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy689:
                YYDEBUG(689, *YYCURSOR);
@@ -6220,8 +6220,8 @@ yy693:
                goto yy159;
 yy694:
                YYDEBUG(694, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(695, *YYCURSOR);
@@ -6236,7 +6236,7 @@ yy696:
                goto yy159;
 yy697:
                YYDEBUG(697, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698,
@@ -6272,7 +6272,7 @@ yy697:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy698:
                YYDEBUG(698, *YYCURSOR);
@@ -6346,8 +6346,8 @@ yy705:
                goto yy159;
 yy706:
                YYDEBUG(706, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(707, *YYCURSOR);
@@ -6370,8 +6370,8 @@ yy708:
                goto yy159;
 yy709:
                YYDEBUG(709, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(710, *YYCURSOR);
@@ -6403,8 +6403,8 @@ yy714:
                goto yy159;
 yy715:
                YYDEBUG(715, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(716, *YYCURSOR);
@@ -6414,8 +6414,8 @@ yy715:
 }
 yy717:
                YYDEBUG(717, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(718, *YYCURSOR);
@@ -6425,8 +6425,8 @@ yy717:
 }
 yy719:
                YYDEBUG(719, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(720, *YYCURSOR);
@@ -6451,8 +6451,8 @@ yy723:
                goto yy159;
 yy724:
                YYDEBUG(724, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(725, *YYCURSOR);
@@ -6462,8 +6462,8 @@ yy724:
 }
 yy726:
                YYDEBUG(726, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(727, *YYCURSOR);
@@ -6513,8 +6513,8 @@ yy735:
                goto yy159;
 yy736:
                YYDEBUG(736, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(737, *YYCURSOR);
@@ -6562,8 +6562,8 @@ yy740:
                goto yy159;
 yy741:
                YYDEBUG(741, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(742, *YYCURSOR);
@@ -6604,8 +6604,8 @@ yy745:
                goto yy159;
 yy746:
                YYDEBUG(746, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(747, *YYCURSOR);
@@ -6630,8 +6630,8 @@ yy750:
                goto yy159;
 yy751:
                YYDEBUG(751, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(752, *YYCURSOR);
@@ -6641,8 +6641,8 @@ yy751:
 }
 yy753:
                YYDEBUG(753, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(754, *YYCURSOR);
@@ -6652,8 +6652,8 @@ yy753:
 }
 yy755:
                YYDEBUG(755, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(756, *YYCURSOR);
@@ -6663,8 +6663,8 @@ yy755:
 }
 yy757:
                YYDEBUG(757, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(758, *YYCURSOR);
@@ -6684,8 +6684,8 @@ yy760:
                goto yy159;
 yy761:
                YYDEBUG(761, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(762, *YYCURSOR);
@@ -6722,8 +6722,8 @@ yy764:
                goto yy159;
 yy765:
                YYDEBUG(765, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(766, *YYCURSOR);
@@ -6733,8 +6733,8 @@ yy765:
 }
 yy767:
                YYDEBUG(767, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(768, *YYCURSOR);
@@ -6744,8 +6744,8 @@ yy767:
 }
 yy769:
                YYDEBUG(769, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(770, *YYCURSOR);
@@ -6760,8 +6760,8 @@ yy771:
                goto yy159;
 yy772:
                YYDEBUG(772, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(773, *YYCURSOR);
@@ -6801,8 +6801,8 @@ yy779:
                goto yy159;
 yy780:
                YYDEBUG(780, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(781, *YYCURSOR);
@@ -6834,8 +6834,8 @@ yy783:
                goto yy159;
 yy784:
                YYDEBUG(784, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(785, *YYCURSOR);
@@ -6845,8 +6845,8 @@ yy784:
 }
 yy786:
                YYDEBUG(786, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(787, *YYCURSOR);
@@ -6856,8 +6856,8 @@ yy786:
 }
 yy788:
                YYDEBUG(788, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(789, *YYCURSOR);
@@ -6879,8 +6879,8 @@ yy790:
                yych = *++YYCURSOR;
                if (yych != 'r') goto yy159;
                YYDEBUG(792, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(793, *YYCURSOR);

diff --git a/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c b/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c
index 895185a6933969b9c05f874b5caf45fda3227a43..28a02bc9737393d10630aaf62301e11d139d6d54 100644 (file)
--- a/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c
+++ b/re2c/test/php20140822_zend_language_scanner_crlf.igcd--flex-syntax.c
@@ -1139,8 +1139,8 @@ yy5:
                        goto yy4;
                }
                YYDEBUG(6, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy12;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy12;
                YYDEBUG(7, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {\r
@@ -2359,8 +2359,8 @@ yy126:
 }
 yy129:
                YYDEBUG(129, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy191;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy191;
 yy130:
                YYDEBUG(130, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -2722,8 +2722,8 @@ yy155:
                goto yy130;
 yy156:
                YYDEBUG(156, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == 'N') goto yy258;
+               yych = *++YYCURSOR;
+               if (yych == 'N') goto yy258;
                goto yy159;
 yy157:
                YYDEBUG(157, *YYCURSOR);
@@ -3008,8 +3008,8 @@ yy189:
 }
 yy191:
                YYDEBUG(191, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy313;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy313;
 yy192:
                YYDEBUG(192, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -3077,8 +3077,8 @@ yy196:
 }
 yy198:
                YYDEBUG(198, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy315;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy315;
                if (yych == '\r') goto yy316;
 yy199:
                YYDEBUG(199, *YYCURSOR);
@@ -3419,8 +3419,8 @@ yy247:
                goto yy192;
 yy248:
                YYDEBUG(248, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy342;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy342;
                YYDEBUG(249, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {\r
@@ -3444,8 +3444,8 @@ yy252:
 }
 yy254:
                YYDEBUG(254, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy344;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy344;
                YYDEBUG(255, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {\r
@@ -3453,8 +3453,8 @@ yy254:
 }
 yy256:
                YYDEBUG(256, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy346;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy346;
                if (yych == '\r') goto yy347;
 yy257:
                YYDEBUG(257, *YYCURSOR);
@@ -3473,8 +3473,8 @@ yy258:
                goto yy159;
 yy259:
                YYDEBUG(259, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(260, *YYCURSOR);
@@ -3547,8 +3547,8 @@ yy266:
                goto yy159;
 yy267:
                YYDEBUG(267, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(268, *YYCURSOR);
@@ -3601,8 +3601,8 @@ yy275:
                goto yy159;
 yy276:
                YYDEBUG(276, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(277, *YYCURSOR);
@@ -3668,8 +3668,8 @@ yy288:
                goto yy159;
 yy289:
                YYDEBUG(289, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(290, *YYCURSOR);
@@ -4038,8 +4038,8 @@ yy347:
                goto yy257;
 yy348:
                YYDEBUG(348, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(349, *YYCURSOR);
@@ -4049,8 +4049,8 @@ yy348:
 }
 yy350:
                YYDEBUG(350, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(351, *YYCURSOR);
@@ -4163,8 +4163,8 @@ yy371:
                goto yy159;
 yy372:
                YYDEBUG(372, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(373, *YYCURSOR);
@@ -4249,7 +4249,7 @@ yy381:
                goto yy159;
 yy382:
                YYDEBUG(382, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383, &&yy383,
@@ -4285,7 +4285,7 @@ yy382:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy383:
                YYDEBUG(383, *YYCURSOR);
@@ -4345,8 +4345,8 @@ yy393:
                goto yy159;
 yy394:
                YYDEBUG(394, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(395, *YYCURSOR);
@@ -4402,8 +4402,8 @@ yy404:
                goto yy159;
 yy405:
                YYDEBUG(405, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(406, *YYCURSOR);
@@ -4418,8 +4418,8 @@ yy407:
                goto yy159;
 yy408:
                YYDEBUG(408, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(409, *YYCURSOR);
@@ -4429,8 +4429,8 @@ yy408:
 }
 yy410:
                YYDEBUG(410, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(411, *YYCURSOR);
@@ -4642,8 +4642,8 @@ yy443:
                goto yy159;
 yy444:
                YYDEBUG(444, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(445, *YYCURSOR);
@@ -4688,8 +4688,8 @@ yy452:
                goto yy159;
 yy453:
                YYDEBUG(453, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(454, *YYCURSOR);
@@ -4699,7 +4699,7 @@ yy453:
 }
 yy455:
                YYDEBUG(455, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456, &&yy456,
@@ -4735,7 +4735,7 @@ yy455:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy456:
                YYDEBUG(456, *YYCURSOR);
@@ -4775,8 +4775,8 @@ yy462:
                goto yy159;
 yy463:
                YYDEBUG(463, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(464, *YYCURSOR);
@@ -4786,8 +4786,8 @@ yy463:
 }
 yy465:
                YYDEBUG(465, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(466, *YYCURSOR);
@@ -4822,8 +4822,8 @@ yy471:
                goto yy159;
 yy472:
                YYDEBUG(472, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(473, *YYCURSOR);
@@ -4859,8 +4859,8 @@ yy478:
                goto yy159;
 yy479:
                YYDEBUG(479, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(480, *YYCURSOR);
@@ -5220,8 +5220,8 @@ yy527:
                goto yy159;
 yy528:
                YYDEBUG(528, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(529, *YYCURSOR);
@@ -5231,8 +5231,8 @@ yy528:
 }
 yy530:
                YYDEBUG(530, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(531, *YYCURSOR);
@@ -5247,8 +5247,8 @@ yy532:
                goto yy159;
 yy533:
                YYDEBUG(533, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(534, *YYCURSOR);
@@ -5258,8 +5258,8 @@ yy533:
 }
 yy535:
                YYDEBUG(535, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(536, *YYCURSOR);
@@ -5269,8 +5269,8 @@ yy535:
 }
 yy537:
                YYDEBUG(537, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(538, *YYCURSOR);
@@ -5280,8 +5280,8 @@ yy537:
 }
 yy539:
                YYDEBUG(539, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(540, *YYCURSOR);
@@ -5311,8 +5311,8 @@ yy544:
                goto yy159;
 yy545:
                YYDEBUG(545, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(546, *YYCURSOR);
@@ -5332,8 +5332,8 @@ yy548:
                goto yy159;
 yy549:
                YYDEBUG(549, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(550, *YYCURSOR);
@@ -5358,7 +5358,7 @@ yy553:
                goto yy159;
 yy554:
                YYDEBUG(554, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555, &&yy555,
@@ -5394,7 +5394,7 @@ yy554:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy555:
                YYDEBUG(555, *YYCURSOR);
@@ -5444,8 +5444,8 @@ yy563:
                goto yy159;
 yy564:
                YYDEBUG(564, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(565, *YYCURSOR);
@@ -5460,8 +5460,8 @@ yy566:
                goto yy159;
 yy567:
                YYDEBUG(567, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(568, *YYCURSOR);
@@ -5506,8 +5506,8 @@ yy575:
                goto yy159;
 yy576:
                YYDEBUG(576, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(577, *YYCURSOR);
@@ -5517,8 +5517,8 @@ yy576:
 }
 yy578:
                YYDEBUG(578, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(579, *YYCURSOR);
@@ -5528,8 +5528,8 @@ yy578:
 }
 yy580:
                YYDEBUG(580, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(581, *YYCURSOR);
@@ -5539,8 +5539,8 @@ yy580:
 }
 yy582:
                YYDEBUG(582, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(583, *YYCURSOR);
@@ -5550,8 +5550,8 @@ yy582:
 }
 yy584:
                YYDEBUG(584, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(585, *YYCURSOR);
@@ -5729,8 +5729,8 @@ yy617:
                goto yy159;
 yy618:
                YYDEBUG(618, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(619, *YYCURSOR);
@@ -5745,7 +5745,7 @@ yy620:
                goto yy159;
 yy621:
                YYDEBUG(621, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622, &&yy622,
@@ -5781,7 +5781,7 @@ yy621:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy622:
                YYDEBUG(622, *YYCURSOR);
@@ -5821,8 +5821,8 @@ yy628:
                goto yy159;
 yy629:
                YYDEBUG(629, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(630, *YYCURSOR);
@@ -5872,8 +5872,8 @@ yy638:
                goto yy159;
 yy639:
                YYDEBUG(639, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(640, *YYCURSOR);
@@ -5888,8 +5888,8 @@ yy641:
                goto yy159;
 yy642:
                YYDEBUG(642, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(643, *YYCURSOR);
@@ -5899,8 +5899,8 @@ yy642:
 }
 yy644:
                YYDEBUG(644, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(645, *YYCURSOR);
@@ -5910,8 +5910,8 @@ yy644:
 }
 yy646:
                YYDEBUG(646, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(647, *YYCURSOR);
@@ -5985,8 +5985,8 @@ yy659:
                goto yy159;
 yy660:
                YYDEBUG(660, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(661, *YYCURSOR);
@@ -6069,8 +6069,8 @@ yy671:
                goto yy159;
 yy672:
                YYDEBUG(672, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(673, *YYCURSOR);
@@ -6080,8 +6080,8 @@ yy672:
 }
 yy674:
                YYDEBUG(674, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(675, *YYCURSOR);
@@ -6111,8 +6111,8 @@ yy679:
                goto yy159;
 yy680:
                YYDEBUG(680, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(681, *YYCURSOR);
@@ -6122,8 +6122,8 @@ yy680:
 }
 yy682:
                YYDEBUG(682, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(683, *YYCURSOR);
@@ -6133,8 +6133,8 @@ yy682:
 }
 yy684:
                YYDEBUG(684, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(685, *YYCURSOR);
@@ -6154,7 +6154,7 @@ yy687:
                goto yy159;
 yy688:
                YYDEBUG(688, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689, &&yy689,
@@ -6190,7 +6190,7 @@ yy688:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy689:
                YYDEBUG(689, *YYCURSOR);
@@ -6220,8 +6220,8 @@ yy693:
                goto yy159;
 yy694:
                YYDEBUG(694, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(695, *YYCURSOR);
@@ -6236,7 +6236,7 @@ yy696:
                goto yy159;
 yy697:
                YYDEBUG(697, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698, &&yy698,
@@ -6272,7 +6272,7 @@ yy697:
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158,
                                &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158, &&yy158
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy698:
                YYDEBUG(698, *YYCURSOR);
@@ -6346,8 +6346,8 @@ yy705:
                goto yy159;
 yy706:
                YYDEBUG(706, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(707, *YYCURSOR);
@@ -6370,8 +6370,8 @@ yy708:
                goto yy159;
 yy709:
                YYDEBUG(709, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(710, *YYCURSOR);
@@ -6403,8 +6403,8 @@ yy714:
                goto yy159;
 yy715:
                YYDEBUG(715, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(716, *YYCURSOR);
@@ -6414,8 +6414,8 @@ yy715:
 }
 yy717:
                YYDEBUG(717, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(718, *YYCURSOR);
@@ -6425,8 +6425,8 @@ yy717:
 }
 yy719:
                YYDEBUG(719, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(720, *YYCURSOR);
@@ -6451,8 +6451,8 @@ yy723:
                goto yy159;
 yy724:
                YYDEBUG(724, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(725, *YYCURSOR);
@@ -6462,8 +6462,8 @@ yy724:
 }
 yy726:
                YYDEBUG(726, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(727, *YYCURSOR);
@@ -6513,8 +6513,8 @@ yy735:
                goto yy159;
 yy736:
                YYDEBUG(736, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(737, *YYCURSOR);
@@ -6562,8 +6562,8 @@ yy740:
                goto yy159;
 yy741:
                YYDEBUG(741, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(742, *YYCURSOR);
@@ -6604,8 +6604,8 @@ yy745:
                goto yy159;
 yy746:
                YYDEBUG(746, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(747, *YYCURSOR);
@@ -6630,8 +6630,8 @@ yy750:
                goto yy159;
 yy751:
                YYDEBUG(751, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(752, *YYCURSOR);
@@ -6641,8 +6641,8 @@ yy751:
 }
 yy753:
                YYDEBUG(753, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(754, *YYCURSOR);
@@ -6652,8 +6652,8 @@ yy753:
 }
 yy755:
                YYDEBUG(755, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(756, *YYCURSOR);
@@ -6663,8 +6663,8 @@ yy755:
 }
 yy757:
                YYDEBUG(757, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(758, *YYCURSOR);
@@ -6684,8 +6684,8 @@ yy760:
                goto yy159;
 yy761:
                YYDEBUG(761, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(762, *YYCURSOR);
@@ -6722,8 +6722,8 @@ yy764:
                goto yy159;
 yy765:
                YYDEBUG(765, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(766, *YYCURSOR);
@@ -6733,8 +6733,8 @@ yy765:
 }
 yy767:
                YYDEBUG(767, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(768, *YYCURSOR);
@@ -6744,8 +6744,8 @@ yy767:
 }
 yy769:
                YYDEBUG(769, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(770, *YYCURSOR);
@@ -6760,8 +6760,8 @@ yy771:
                goto yy159;
 yy772:
                YYDEBUG(772, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(773, *YYCURSOR);
@@ -6801,8 +6801,8 @@ yy779:
                goto yy159;
 yy780:
                YYDEBUG(780, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(781, *YYCURSOR);
@@ -6834,8 +6834,8 @@ yy783:
                goto yy159;
 yy784:
                YYDEBUG(784, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(785, *YYCURSOR);
@@ -6845,8 +6845,8 @@ yy784:
 }
 yy786:
                YYDEBUG(786, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(787, *YYCURSOR);
@@ -6856,8 +6856,8 @@ yy786:
 }
 yy788:
                YYDEBUG(788, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(789, *YYCURSOR);
@@ -6879,8 +6879,8 @@ yy790:
                yych = *++YYCURSOR;
                if (yych != 'r') goto yy159;
                YYDEBUG(792, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy158;
                }
                YYDEBUG(793, *YYCURSOR);

diff --git a/re2c/test/php20150211_parse_date.ig.c b/re2c/test/php20150211_parse_date.ig.c
index 9383ac31ac7af84ba3e694ba3f93542e5f88b39e..64cc04dfc1b69e455e7a1eaf015efe64a396480d 100644 (file)
--- a/re2c/test/php20150211_parse_date.ig.c
+++ b/re2c/test/php20150211_parse_date.ig.c
@@ -1175,7 +1175,7 @@ yy16:
        if (yych <= '9') goto yy104;
        goto yy5;
 yy17:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        {
                static void *yytarget[256] = {
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
@@ -1211,7 +1211,7 @@ yy17:
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18
                };
-               goto *yytarget[(yych = *YYCURSOR)];
+               goto *yytarget[yych];
        }
 yy18:
        {
@@ -7299,8 +7299,8 @@ yy237:
                goto *yytarget[yych];
        }
 yy239:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy240;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy240;
        if (yych <= '9') goto yy408;
 yy240:
        {
@@ -7805,8 +7805,8 @@ yy270:
                goto yy18;
        }
 yy271:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy443;
@@ -8565,7 +8565,7 @@ yy292:
                goto *yytarget[yych];
        }
 yy293:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        {
                static void *yytarget[256] = {
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294,
@@ -8601,7 +8601,7 @@ yy293:
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294,
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294
                };
-               goto *yytarget[(yych = *YYCURSOR)];
+               goto *yytarget[yych];
        }
 yy294:
        {
@@ -9829,8 +9829,8 @@ yy329:
                goto *yytarget[yych];
        }
 yy330:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy443;
@@ -11720,8 +11720,8 @@ yy400:
                goto *yytarget[yych];
        }
 yy401:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy591;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy591;
        if (yych == 's') goto yy591;
 yy402:
        {
@@ -14199,8 +14199,8 @@ yy502:
                goto *yytarget[yych];
        }
 yy503:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy630;
@@ -16057,8 +16057,8 @@ yy574:
                goto *yytarget[yych];
        }
 yy575:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy766;
        } else {
                if (yych == 'W') goto yy576;
@@ -18559,8 +18559,8 @@ yy702:
        if (yych <= '6') goto yy859;
        goto yy396;
 yy703:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy800;
@@ -23357,8 +23357,8 @@ yy1033:
        if (yych <= '1') goto yy1093;
        goto yy56;
 yy1034:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1035;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1035;
        if (yych <= '9') goto yy1095;
 yy1035:
        {
@@ -23608,8 +23608,8 @@ yy1044:
                goto yy56;
        }
 yy1045:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy1116;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy1116;
        if (yych == 's') goto yy1116;
 yy1046:
        {
@@ -26025,8 +26025,8 @@ yy1229:
        if (yych <= '5') goto yy1237;
        goto yy56;
 yy1230:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1231;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1231;
        if (yych <= '9') goto yy1233;
 yy1231:
        {
@@ -26310,8 +26310,8 @@ yy1256:
                goto *yytarget[yych];
        }
 yy1258:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1259;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1259;
        if (yych <= '9') goto yy1261;
        if (yych <= ':') goto yy1265;
 yy1259:
@@ -26418,8 +26418,8 @@ yy1273:
        if (yych <= '9') goto yy1233;
        goto yy1231;
 yy1274:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '+') goto yy1263;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy1263;
        if (yych == '-') goto yy1263;
        goto yy56;
 }

diff --git a/re2c/test/php20150211_parse_date_crlf.ig.c b/re2c/test/php20150211_parse_date_crlf.ig.c
index 7f5aeebbd22d677073d774561e16f2927745e585..e3002d1f3f6b90d86db58bbedea27330ad83203c 100644 (file)
--- a/re2c/test/php20150211_parse_date_crlf.ig.c
+++ b/re2c/test/php20150211_parse_date_crlf.ig.c
@@ -1175,7 +1175,7 @@ yy16:
        if (yych <= '9') goto yy104;
        goto yy5;
 yy17:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        {
                static void *yytarget[256] = {
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
@@ -1211,7 +1211,7 @@ yy17:
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,
                        &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18,  &&yy18
                };
-               goto *yytarget[(yych = *YYCURSOR)];
+               goto *yytarget[yych];
        }
 yy18:
        {\r
@@ -7299,8 +7299,8 @@ yy237:
                goto *yytarget[yych];
        }
 yy239:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy240;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy240;
        if (yych <= '9') goto yy408;
 yy240:
        {\r
@@ -7805,8 +7805,8 @@ yy270:
                goto yy18;
        }
 yy271:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy443;
@@ -8565,7 +8565,7 @@ yy292:
                goto *yytarget[yych];
        }
 yy293:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        {
                static void *yytarget[256] = {
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294,
@@ -8601,7 +8601,7 @@ yy293:
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294,
                        &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294, &&yy294
                };
-               goto *yytarget[(yych = *YYCURSOR)];
+               goto *yytarget[yych];
        }
 yy294:
        {\r
@@ -9829,8 +9829,8 @@ yy329:
                goto *yytarget[yych];
        }
 yy330:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy443;
@@ -11720,8 +11720,8 @@ yy400:
                goto *yytarget[yych];
        }
 yy401:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy591;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy591;
        if (yych == 's') goto yy591;
 yy402:
        {\r
@@ -14199,8 +14199,8 @@ yy502:
                goto *yytarget[yych];
        }
 yy503:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy630;
@@ -16057,8 +16057,8 @@ yy574:
                goto *yytarget[yych];
        }
 yy575:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'U') {
+       yych = *++YYCURSOR;
+       if (yych <= 'U') {
                if (yych == 'I') goto yy766;
        } else {
                if (yych == 'W') goto yy576;
@@ -18559,8 +18559,8 @@ yy702:
        if (yych <= '6') goto yy859;
        goto yy396;
 yy703:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '@') {
+       yych = *++YYCURSOR;
+       if (yych <= '@') {
                if (yych == ')') goto yy107;
        } else {
                if (yych <= 'Z') goto yy800;
@@ -23357,8 +23357,8 @@ yy1033:
        if (yych <= '1') goto yy1093;
        goto yy56;
 yy1034:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1035;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1035;
        if (yych <= '9') goto yy1095;
 yy1035:
        {\r
@@ -23608,8 +23608,8 @@ yy1044:
                goto yy56;
        }
 yy1045:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 'S') goto yy1116;
+       yych = *++YYCURSOR;
+       if (yych == 'S') goto yy1116;
        if (yych == 's') goto yy1116;
 yy1046:
        {\r
@@ -26025,8 +26025,8 @@ yy1229:
        if (yych <= '5') goto yy1237;
        goto yy56;
 yy1230:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1231;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1231;
        if (yych <= '9') goto yy1233;
 yy1231:
        {\r
@@ -26310,8 +26310,8 @@ yy1256:
                goto *yytarget[yych];
        }
 yy1258:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '/') goto yy1259;
+       yych = *++YYCURSOR;
+       if (yych <= '/') goto yy1259;
        if (yych <= '9') goto yy1261;
        if (yych <= ':') goto yy1265;
 yy1259:
@@ -26418,8 +26418,8 @@ yy1273:
        if (yych <= '9') goto yy1233;
        goto yy1231;
 yy1274:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '+') goto yy1263;
+       yych = *++YYCURSOR;
+       if (yych == '+') goto yy1263;
        if (yych == '-') goto yy1263;
        goto yy56;
 }

diff --git a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
index 3b3e0aef400376bb15b5bcf479fb51cab39e09cc..b3aa60c228a1703aa75bc4970ece57736ef8ad14 100644 (file)
--- a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
+++ b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
@@ -310,7 +310,8 @@ yy11:
         goto yy7;
 yy12:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy34;
         }
         status = check_key_count_line66(keys_count, i, 3)

diff --git a/re2c/test/php20150211_pdo_sql_parser.ig.c b/re2c/test/php20150211_pdo_sql_parser.ig.c
index 8abe9151faa31cb4c832384a8f4be9559ec26032..37e96b9014886dc48927eaabef4fa9759ab9cd0e 100644 (file)
--- a/re2c/test/php20150211_pdo_sql_parser.ig.c
+++ b/re2c/test/php20150211_pdo_sql_parser.ig.c
@@ -196,8 +196,8 @@ yy11:
        if (yych <= ':') goto yy31;
        goto yy7;
 yy12:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 16) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 16) {
                goto yy34;
        }
        { RET(PDO_PARSER_BIND_POS); }

diff --git a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c
index c3c3837303e2854f6ca8d84eb960a2dc847a3e46..e53d9a0ba105a7994bbb7fc026bb87da33cb867b 100644 (file)
--- a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c
+++ b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c
@@ -312,7 +312,8 @@ yy12:
         goto yy8;
 yy13:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy36;
         }
         status = check_key_count_line20(keys_count, i, 3)

diff --git a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
index 4300cb3aaf9e53b989d2ba089aec6bea46f3b09a..2156949e1704e0809f70900e148e82a92ff811d1 100644 (file)
--- a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
+++ b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
@@ -147,8 +147,8 @@ yy12:
        if (yych <= ':') goto yy33;
        goto yy8;
 yy13:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 16) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 16) {
                goto yy36;
        }
        { RET(PDO_PARSER_BIND_POS); }

diff --git a/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c b/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
index f5878280eb42ffa91565fa60ce72a7c44471282f..cec4173d93741cab304f9daa0658f1caf0ed1917 100644 (file)
--- a/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
+++ b/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
@@ -575,8 +575,8 @@ yy49:
                }
 yy50:
                YYDEBUG(50, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == ':') goto yy66;
+               yych = *++YYCURSOR;
+               if (yych == ':') goto yy66;
                YYDEBUG(51, *YYCURSOR);
                yyleng = (size_t) YYCURSOR - (size_t) yytext;
                {

diff --git a/re2c/test/php20150211_zend_ini_scanner.igcd--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_ini_scanner.igcd--flex-syntax--case-inverted.c
index 0ce5453a7cfbf564b784cdadc63df70a05a97a67..92f8bff618e70bbb587a6d509716a26fe712a6c2 100644 (file)
--- a/re2c/test/php20150211_zend_ini_scanner.igcd--flex-syntax--case-inverted.c
+++ b/re2c/test/php20150211_zend_ini_scanner.igcd--flex-syntax--case-inverted.c
@@ -831,7 +831,7 @@ yy34:
                goto yy4;
 yy35:
                YYDEBUG(35, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
@@ -867,7 +867,7 @@ yy35:
                                &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
                                &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy36:
                YYDEBUG(36, *YYCURSOR);
@@ -1845,8 +1845,8 @@ yy120:
 }
 yy121:
                YYDEBUG(121, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy119;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy119;
                goto yy120;
        }
 /* *********************************** */
@@ -1942,8 +1942,8 @@ yy132:
                goto yy131;
 yy133:
                YYDEBUG(133, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy132;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy132;
                goto yy131;
        }
 /* *********************************** */

diff --git a/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c
index 320f062b0377af43d192dd0b6ae56cfc207ea4df..44eca2a9c9e5d28c296a53a187f23b92d3628937 100644 (file)
--- a/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c
+++ b/re2c/test/php20150211_zend_ini_scanner.igcd--skeleton--flex-syntax--case-inverted.c
@@ -520,6 +520,7 @@ yy34:
         goto yy4;
 yy35:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
@@ -555,7 +556,7 @@ yy35:
                 &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,
                 &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4,  &&yy4
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy36:
         status = check_key_count_line652_INITIAL(keys_count, i, 3)
@@ -1755,7 +1756,8 @@ yy123:
         continue;
 yy124:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy122;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy122;
         goto yy123;
 
     }
@@ -1962,7 +1964,8 @@ yy136:
         goto yy135;
 yy137:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy136;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy136;
         goto yy135;
 
     }

diff --git a/re2c/test/php20150211_zend_ini_scanner_trimmed.ic--flex-syntax.c b/re2c/test/php20150211_zend_ini_scanner_trimmed.ic--flex-syntax.c
index 7d6ed745a225f825c1e06d606618dad2a7b48560..141ddd01fd182a89ea118131a91f3198a52fd4a6 100644 (file)
--- a/re2c/test/php20150211_zend_ini_scanner_trimmed.ic--flex-syntax.c
+++ b/re2c/test/php20150211_zend_ini_scanner_trimmed.ic--flex-syntax.c
@@ -206,8 +206,8 @@ yy34:
        default:        goto yy4;
        }
 yy35:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '\t':      goto yy45;
        case '\n':
        case '\r':
@@ -826,8 +826,8 @@ yy119:
 yy120:
        {}
 yy121:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '\n':      goto yy119;
        default:        goto yy120;
        }
@@ -873,8 +873,8 @@ yy132:
        ++YYCURSOR;
        goto yy131;
 yy133:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '\n':      goto yy132;
        default:        goto yy131;
        }

diff --git a/re2c/test/php20150211_zend_ini_scanner_trimmed.icwb--flex-syntax.c b/re2c/test/php20150211_zend_ini_scanner_trimmed.icwb--flex-syntax.c
index 28d0396dd86eb28ae5b234418a6f7fa4c267f31d..fbd600247ebd7e1a899eb93735b46b2f60e4a6d7 100644 (file)
--- a/re2c/test/php20150211_zend_ini_scanner_trimmed.icwb--flex-syntax.c
+++ b/re2c/test/php20150211_zend_ini_scanner_trimmed.icwb--flex-syntax.c
@@ -280,8 +280,8 @@ yy34:
                if (yych == 'l') goto yy44;
                goto yy4;
 yy35:
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) <= '&') {
+               yych = *++YYCURSOR;
+               if (yych <= '&') {
                        if (yych <= 0x001F) {
                                if (yych <= '\n') {
                                        if (yych <= 0x0008) goto yy4;
@@ -1006,8 +1006,8 @@ yy119:
 yy120:
                {}
 yy121:
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy119;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy119;
                goto yy120;
        }
 /* *********************************** */
@@ -1087,8 +1087,8 @@ yy132:
                ++YYCURSOR;
                goto yy131;
 yy133:
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy132;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy132;
                goto yy131;
        }
 /* *********************************** */

diff --git a/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c
index 0ea07c8c32c399f05353ab04c52e17d1ef05aae1..4661c1fa828d2f772ce2e014d194a1fa7553b698 100644 (file)
--- a/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c
+++ b/re2c/test/php20150211_zend_language_scanner.igcd--flex-syntax--case-inverted.c
@@ -1225,8 +1225,8 @@ yy15:
 }
 yy16:
        YYDEBUG(16, *YYCURSOR);
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '\n') goto yy14;
+       yych = *++YYCURSOR;
+       if (yych == '\n') goto yy14;
        goto yy15;
 /* *********************************** */
 yyc_ST_BACKQUOTE:
@@ -2064,8 +2064,8 @@ yy89:
 }
 yy92:
                YYDEBUG(92, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy153;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy153;
 yy93:
                YYDEBUG(93, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -2475,7 +2475,7 @@ yy118:
                goto yy93;
 yy119:
                YYDEBUG(119, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128,
@@ -2511,7 +2511,7 @@ yy119:
                                &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128,
                                &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128, &&yy128
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy120:
                YYDEBUG(120, *YYCURSOR);
@@ -3110,8 +3110,8 @@ yy151:
 }
 yy153:
                YYDEBUG(153, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy277;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy277;
 yy154:
                YYDEBUG(154, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
@@ -3350,8 +3350,8 @@ yy175:
                goto yy166;
 yy176:
                YYDEBUG(176, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy289;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy289;
                YYDEBUG(177, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -3553,8 +3553,8 @@ yy209:
                goto yy154;
 yy210:
                YYDEBUG(210, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy307;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy307;
                YYDEBUG(211, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -3578,8 +3578,8 @@ yy214:
 }
 yy216:
                YYDEBUG(216, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '=') goto yy309;
+               yych = *++YYCURSOR;
+               if (yych == '=') goto yy309;
                YYDEBUG(217, *YYCURSOR);
                yyleng = YYCURSOR - SCNG(yy_text);
                {
@@ -3587,8 +3587,8 @@ yy216:
 }
 yy218:
                YYDEBUG(218, *YYCURSOR);
-               ++YYCURSOR;
-               if ((yych = *YYCURSOR) == '\n') goto yy311;
+               yych = *++YYCURSOR;
+               if (yych == '\n') goto yy311;
                if (yych == '\r') goto yy312;
 yy219:
                YYDEBUG(219, *YYCURSOR);
@@ -3625,8 +3625,8 @@ yy224:
                goto yy128;
 yy225:
                YYDEBUG(225, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(226, *YYCURSOR);
@@ -3779,8 +3779,8 @@ yy233:
                goto yy128;
 yy234:
                YYDEBUG(234, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(235, *YYCURSOR);
@@ -3890,8 +3890,8 @@ yy246:
                goto yy128;
 yy247:
                YYDEBUG(247, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(248, *YYCURSOR);
@@ -3971,8 +3971,8 @@ yy254:
                goto yy128;
 yy255:
                YYDEBUG(255, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(256, *YYCURSOR);
@@ -4494,8 +4494,8 @@ yy313:
                goto yy128;
 yy314:
                YYDEBUG(314, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(315, *YYCURSOR);
@@ -4577,8 +4577,8 @@ yy326:
                goto yy128;
 yy327:
                YYDEBUG(327, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(328, *YYCURSOR);
@@ -4670,7 +4670,7 @@ yy336:
                goto yy128;
 yy337:
                YYDEBUG(337, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy338, &&yy338, &&yy338, &&yy338, &&yy338, &&yy338, &&yy338, &&yy338,
@@ -4706,7 +4706,7 @@ yy337:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy338:
                YYDEBUG(338, *YYCURSOR);
@@ -4776,8 +4776,8 @@ yy348:
                goto yy128;
 yy349:
                YYDEBUG(349, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(350, *YYCURSOR);
@@ -4875,8 +4875,8 @@ yy359:
                goto yy128;
 yy360:
                YYDEBUG(360, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(361, *YYCURSOR);
@@ -4892,8 +4892,8 @@ yy362:
                goto yy128;
 yy363:
                YYDEBUG(363, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(364, *YYCURSOR);
@@ -4903,8 +4903,8 @@ yy363:
 }
 yy365:
                YYDEBUG(365, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(366, *YYCURSOR);
@@ -4920,8 +4920,8 @@ yy367:
                goto yy128;
 yy368:
                YYDEBUG(368, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(369, *YYCURSOR);
@@ -5175,8 +5175,8 @@ yy398:
                goto yy128;
 yy399:
                YYDEBUG(399, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(400, *YYCURSOR);
@@ -5228,8 +5228,8 @@ yy407:
                goto yy128;
 yy408:
                YYDEBUG(408, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(409, *YYCURSOR);
@@ -5239,7 +5239,7 @@ yy408:
 }
 yy410:
                YYDEBUG(410, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy411, &&yy411, &&yy411, &&yy411, &&yy411, &&yy411, &&yy411, &&yy411,
@@ -5275,7 +5275,7 @@ yy410:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy411:
                YYDEBUG(411, *YYCURSOR);
@@ -5321,8 +5321,8 @@ yy417:
                goto yy128;
 yy418:
                YYDEBUG(418, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(419, *YYCURSOR);
@@ -5332,8 +5332,8 @@ yy418:
 }
 yy420:
                YYDEBUG(420, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(421, *YYCURSOR);
@@ -5373,8 +5373,8 @@ yy426:
                goto yy128;
 yy427:
                YYDEBUG(427, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(428, *YYCURSOR);
@@ -5448,8 +5448,8 @@ yy433:
                goto yy128;
 yy434:
                YYDEBUG(434, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(435, *YYCURSOR);
@@ -5837,8 +5837,8 @@ yy481:
                goto yy128;
 yy482:
                YYDEBUG(482, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(483, *YYCURSOR);
@@ -5848,8 +5848,8 @@ yy482:
 }
 yy484:
                YYDEBUG(484, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(485, *YYCURSOR);
@@ -5865,8 +5865,8 @@ yy486:
                goto yy128;
 yy487:
                YYDEBUG(487, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(488, *YYCURSOR);
@@ -5876,8 +5876,8 @@ yy487:
 }
 yy489:
                YYDEBUG(489, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(490, *YYCURSOR);
@@ -5887,8 +5887,8 @@ yy489:
 }
 yy491:
                YYDEBUG(491, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(492, *YYCURSOR);
@@ -5898,8 +5898,8 @@ yy491:
 }
 yy493:
                YYDEBUG(493, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(494, *YYCURSOR);
@@ -5933,8 +5933,8 @@ yy498:
                goto yy128;
 yy499:
                YYDEBUG(499, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(500, *YYCURSOR);
@@ -5956,8 +5956,8 @@ yy502:
                goto yy128;
 yy503:
                YYDEBUG(503, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(504, *YYCURSOR);
@@ -5985,7 +5985,7 @@ yy507:
                goto yy128;
 yy508:
                YYDEBUG(508, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy509, &&yy509, &&yy509, &&yy509, &&yy509, &&yy509, &&yy509, &&yy509,
@@ -6021,7 +6021,7 @@ yy508:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy509:
                YYDEBUG(509, *YYCURSOR);
@@ -6079,8 +6079,8 @@ yy517:
                goto yy128;
 yy518:
                YYDEBUG(518, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(519, *YYCURSOR);
@@ -6096,8 +6096,8 @@ yy520:
                goto yy128;
 yy521:
                YYDEBUG(521, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(522, *YYCURSOR);
@@ -6149,8 +6149,8 @@ yy529:
                goto yy128;
 yy530:
                YYDEBUG(530, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(531, *YYCURSOR);
@@ -6160,8 +6160,8 @@ yy530:
 }
 yy532:
                YYDEBUG(532, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(533, *YYCURSOR);
@@ -6171,8 +6171,8 @@ yy532:
 }
 yy534:
                YYDEBUG(534, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(535, *YYCURSOR);
@@ -6182,8 +6182,8 @@ yy534:
 }
 yy536:
                YYDEBUG(536, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(537, *YYCURSOR);
@@ -6193,8 +6193,8 @@ yy536:
 }
 yy538:
                YYDEBUG(538, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(539, *YYCURSOR);
@@ -6386,8 +6386,8 @@ yy570:
                goto yy128;
 yy571:
                YYDEBUG(571, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(572, *YYCURSOR);
@@ -6403,7 +6403,7 @@ yy573:
                goto yy128;
 yy574:
                YYDEBUG(574, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy575, &&yy575, &&yy575, &&yy575, &&yy575, &&yy575, &&yy575, &&yy575,
@@ -6439,7 +6439,7 @@ yy574:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy575:
                YYDEBUG(575, *YYCURSOR);
@@ -6485,8 +6485,8 @@ yy581:
                goto yy128;
 yy582:
                YYDEBUG(582, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(583, *YYCURSOR);
@@ -6544,8 +6544,8 @@ yy591:
                goto yy128;
 yy592:
                YYDEBUG(592, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(593, *YYCURSOR);
@@ -6561,8 +6561,8 @@ yy594:
                goto yy128;
 yy595:
                YYDEBUG(595, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(596, *YYCURSOR);
@@ -6572,8 +6572,8 @@ yy595:
 }
 yy597:
                YYDEBUG(597, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(598, *YYCURSOR);
@@ -6583,8 +6583,8 @@ yy597:
 }
 yy599:
                YYDEBUG(599, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(600, *YYCURSOR);
@@ -6718,8 +6718,8 @@ yy622:
                goto yy128;
 yy623:
                YYDEBUG(623, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(624, *YYCURSOR);
@@ -6729,8 +6729,8 @@ yy623:
 }
 yy625:
                YYDEBUG(625, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(626, *YYCURSOR);
@@ -6764,8 +6764,8 @@ yy630:
                goto yy128;
 yy631:
                YYDEBUG(631, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(632, *YYCURSOR);
@@ -6775,8 +6775,8 @@ yy631:
 }
 yy633:
                YYDEBUG(633, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(634, *YYCURSOR);
@@ -6786,8 +6786,8 @@ yy633:
 }
 yy635:
                YYDEBUG(635, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(636, *YYCURSOR);
@@ -6809,7 +6809,7 @@ yy638:
                goto yy128;
 yy639:
                YYDEBUG(639, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy640, &&yy640, &&yy640, &&yy640, &&yy640, &&yy640, &&yy640, &&yy640,
@@ -6845,7 +6845,7 @@ yy639:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy640:
                YYDEBUG(640, *YYCURSOR);
@@ -6879,8 +6879,8 @@ yy644:
                goto yy128;
 yy645:
                YYDEBUG(645, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(646, *YYCURSOR);
@@ -6896,7 +6896,7 @@ yy647:
                goto yy128;
 yy648:
                YYDEBUG(648, *YYCURSOR);
-               ++YYCURSOR;
+               yych = *++YYCURSOR;
                {
                        static void *yytarget[256] = {
                                &&yy649, &&yy649, &&yy649, &&yy649, &&yy649, &&yy649, &&yy649, &&yy649,
@@ -6932,7 +6932,7 @@ yy648:
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127,
                                &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127, &&yy127
                        };
-                       goto *yytarget[(yych = *YYCURSOR)];
+                       goto *yytarget[yych];
                }
 yy649:
                YYDEBUG(649, *YYCURSOR);
@@ -6947,8 +6947,8 @@ yy650:
                goto yy128;
 yy651:
                YYDEBUG(651, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(652, *YYCURSOR);
@@ -7013,8 +7013,8 @@ yy662:
 }
 yy664:
                YYDEBUG(664, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(665, *YYCURSOR);
@@ -7024,8 +7024,8 @@ yy664:
 }
 yy666:
                YYDEBUG(666, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(667, *YYCURSOR);
@@ -7035,8 +7035,8 @@ yy666:
 }
 yy668:
                YYDEBUG(668, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(669, *YYCURSOR);
@@ -7064,8 +7064,8 @@ yy672:
                goto yy128;
 yy673:
                YYDEBUG(673, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(674, *YYCURSOR);
@@ -7075,8 +7075,8 @@ yy673:
 }
 yy675:
                YYDEBUG(675, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(676, *YYCURSOR);
@@ -7139,8 +7139,8 @@ yy685:
                goto yy128;
 yy686:
                YYDEBUG(686, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(687, *YYCURSOR);
@@ -7162,8 +7162,8 @@ yy689:
                goto yy128;
 yy690:
                YYDEBUG(690, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(691, *YYCURSOR);
@@ -7201,8 +7201,8 @@ yy696:
                goto yy128;
 yy697:
                YYDEBUG(697, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(698, *YYCURSOR);
@@ -7230,8 +7230,8 @@ yy701:
                goto yy128;
 yy702:
                YYDEBUG(702, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(703, *YYCURSOR);
@@ -7241,8 +7241,8 @@ yy702:
 }
 yy704:
                YYDEBUG(704, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(705, *YYCURSOR);
@@ -7252,8 +7252,8 @@ yy704:
 }
 yy706:
                YYDEBUG(706, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(707, *YYCURSOR);
@@ -7263,8 +7263,8 @@ yy706:
 }
 yy708:
                YYDEBUG(708, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(709, *YYCURSOR);
@@ -7280,8 +7280,8 @@ yy710:
                goto yy128;
 yy711:
                YYDEBUG(711, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(712, *YYCURSOR);
@@ -7314,8 +7314,8 @@ yy716:
                goto yy128;
 yy717:
                YYDEBUG(717, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(718, *YYCURSOR);
@@ -7325,8 +7325,8 @@ yy717:
 }
 yy719:
                YYDEBUG(719, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(720, *YYCURSOR);
@@ -7336,8 +7336,8 @@ yy719:
 }
 yy721:
                YYDEBUG(721, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(722, *YYCURSOR);
@@ -7347,8 +7347,8 @@ yy721:
 }
 yy723:
                YYDEBUG(723, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(724, *YYCURSOR);
@@ -7364,8 +7364,8 @@ yy725:
                goto yy128;
 yy726:
                YYDEBUG(726, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(727, *YYCURSOR);
@@ -7392,8 +7392,8 @@ yy730:
                goto yy128;
 yy731:
                YYDEBUG(731, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(732, *YYCURSOR);
@@ -7437,8 +7437,8 @@ yy738:
                goto yy128;
 yy739:
                YYDEBUG(739, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(740, *YYCURSOR);
@@ -7448,8 +7448,8 @@ yy739:
 }
 yy741:
                YYDEBUG(741, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(742, *YYCURSOR);
@@ -7459,8 +7459,8 @@ yy741:
 }
 yy743:
                YYDEBUG(743, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(744, *YYCURSOR);
@@ -7487,8 +7487,8 @@ yy747:
                goto yy128;
 yy748:
                YYDEBUG(748, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(749, *YYCURSOR);
@@ -7503,8 +7503,8 @@ yy750:
                if (yych != 'r') goto yy128;
 yy751:
                YYDEBUG(751, *YYCURSOR);
-               ++YYCURSOR;
-               if (yybm[0+(yych = *YYCURSOR)] & 16) {
+               yych = *++YYCURSOR;
+               if (yybm[0+yych] & 16) {
                        goto yy127;
                }
                YYDEBUG(752, *YYCURSOR);

diff --git a/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c b/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c
index 1ba93f49eef8702726d1dc1cbb19be0809cb5c73..6f391695dfd4ff609bf01df69cb4bcc5bf7a31ae 100644 (file)
--- a/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c
+++ b/re2c/test/php20150211_zend_language_scanner.igcd--skeleton--flex-syntax--case-inverted.c
@@ -214,7 +214,8 @@ yy15:
         continue;
 yy16:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy14;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy14;
         goto yy15;
 
     }
@@ -1427,7 +1428,8 @@ yy94:
         continue;
 yy97:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '=') goto yy158;
+        yych = YYPEEK ();
+        if (yych == '=') goto yy158;
 yy98:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
              || action_line2358_ST_IN_SCRIPTING(&i, keys, input, token, &cursor, 106);
@@ -1664,6 +1666,7 @@ yy123:
         goto yy98;
 yy124:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133,
@@ -1699,7 +1702,7 @@ yy124:
                 &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133,
                 &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133, &&yy133
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy125:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -2276,7 +2279,8 @@ yy156:
         continue;
 yy158:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '=') goto yy282;
+        yych = YYPEEK ();
+        if (yych == '=') goto yy282;
 yy159:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
              || action_line2358_ST_IN_SCRIPTING(&i, keys, input, token, &cursor, 83);
@@ -2496,7 +2500,8 @@ yy180:
         goto yy171;
 yy181:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '=') goto yy294;
+        yych = YYPEEK ();
+        if (yych == '=') goto yy294;
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
              || action_line2358_ST_IN_SCRIPTING(&i, keys, input, token, &cursor, 89);
         continue;
@@ -2625,7 +2630,8 @@ yy214:
         goto yy159;
 yy215:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '=') goto yy312;
+        yych = YYPEEK ();
+        if (yych == '=') goto yy312;
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
              || action_line2358_ST_IN_SCRIPTING(&i, keys, input, token, &cursor, 82);
         continue;
@@ -2641,13 +2647,15 @@ yy219:
         continue;
 yy221:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '=') goto yy314;
+        yych = YYPEEK ();
+        if (yych == '=') goto yy314;
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
              || action_line2358_ST_IN_SCRIPTING(&i, keys, input, token, &cursor, 105);
         continue;
 yy223:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy316;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy316;
         if (yych == '\r') goto yy317;
 yy224:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -2678,7 +2686,8 @@ yy229:
         goto yy133;
 yy230:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -2829,7 +2838,8 @@ yy238:
         goto yy133;
 yy239:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -2937,7 +2947,8 @@ yy251:
         goto yy133;
 yy252:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3015,7 +3026,8 @@ yy259:
         goto yy133;
 yy260:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3447,7 +3459,8 @@ yy318:
         goto yy133;
 yy319:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3527,7 +3540,8 @@ yy331:
         goto yy133;
 yy332:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3617,6 +3631,7 @@ yy341:
         goto yy133;
 yy342:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy343, &&yy343, &&yy343, &&yy343, &&yy343, &&yy343, &&yy343, &&yy343,
@@ -3652,7 +3667,7 @@ yy342:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy343:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3720,7 +3735,8 @@ yy353:
         goto yy133;
 yy354:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3816,7 +3832,8 @@ yy364:
         goto yy133;
 yy365:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3830,7 +3847,8 @@ yy367:
         goto yy133;
 yy368:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3838,7 +3856,8 @@ yy368:
         continue;
 yy370:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -3852,7 +3871,8 @@ yy372:
         goto yy133;
 yy373:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4100,7 +4120,8 @@ yy403:
         goto yy133;
 yy404:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4150,7 +4171,8 @@ yy412:
         goto yy133;
 yy413:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4158,6 +4180,7 @@ yy413:
         continue;
 yy415:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy416, &&yy416, &&yy416, &&yy416, &&yy416, &&yy416, &&yy416, &&yy416,
@@ -4193,7 +4216,7 @@ yy415:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy416:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4237,7 +4260,8 @@ yy422:
         goto yy133;
 yy423:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4245,7 +4269,8 @@ yy423:
         continue;
 yy425:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4283,7 +4308,8 @@ yy431:
         goto yy133;
 yy432:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4355,7 +4381,8 @@ yy438:
         goto yy133;
 yy439:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4684,7 +4711,8 @@ yy486:
         goto yy133;
 yy487:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4692,7 +4720,8 @@ yy487:
         continue;
 yy489:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4706,7 +4735,8 @@ yy491:
         goto yy133;
 yy492:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4714,7 +4744,8 @@ yy492:
         continue;
 yy494:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4722,7 +4753,8 @@ yy494:
         continue;
 yy496:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4730,7 +4762,8 @@ yy496:
         continue;
 yy498:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4762,7 +4795,8 @@ yy503:
         goto yy133;
 yy504:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4782,7 +4816,8 @@ yy507:
         goto yy133;
 yy508:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4808,6 +4843,7 @@ yy512:
         goto yy133;
 yy513:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy514, &&yy514, &&yy514, &&yy514, &&yy514, &&yy514, &&yy514, &&yy514,
@@ -4843,7 +4879,7 @@ yy513:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy514:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4899,7 +4935,8 @@ yy522:
         goto yy133;
 yy523:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4913,7 +4950,8 @@ yy525:
         goto yy133;
 yy526:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4963,7 +5001,8 @@ yy534:
         goto yy133;
 yy535:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4971,7 +5010,8 @@ yy535:
         continue;
 yy537:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4979,7 +5019,8 @@ yy537:
         continue;
 yy539:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4987,7 +5028,8 @@ yy539:
         continue;
 yy541:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -4995,7 +5037,8 @@ yy541:
         continue;
 yy543:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5173,7 +5216,8 @@ yy575:
         goto yy133;
 yy576:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5187,6 +5231,7 @@ yy578:
         goto yy133;
 yy579:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy580, &&yy580, &&yy580, &&yy580, &&yy580, &&yy580, &&yy580, &&yy580,
@@ -5222,7 +5267,7 @@ yy579:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy580:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5266,7 +5311,8 @@ yy586:
         goto yy133;
 yy587:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5322,7 +5368,8 @@ yy596:
         goto yy133;
 yy597:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5336,7 +5383,8 @@ yy599:
         goto yy133;
 yy600:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5344,7 +5392,8 @@ yy600:
         continue;
 yy602:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5352,7 +5401,8 @@ yy602:
         continue;
 yy604:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5474,7 +5524,8 @@ yy627:
         goto yy133;
 yy628:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5482,7 +5533,8 @@ yy628:
         continue;
 yy630:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5514,7 +5566,8 @@ yy635:
         goto yy133;
 yy636:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5522,7 +5575,8 @@ yy636:
         continue;
 yy638:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5530,7 +5584,8 @@ yy638:
         continue;
 yy640:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5550,6 +5605,7 @@ yy643:
         goto yy133;
 yy644:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy645, &&yy645, &&yy645, &&yy645, &&yy645, &&yy645, &&yy645, &&yy645,
@@ -5585,7 +5641,7 @@ yy644:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy645:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5617,7 +5673,8 @@ yy649:
         goto yy133;
 yy650:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5631,6 +5688,7 @@ yy652:
         goto yy133;
 yy653:
         YYSKIP ();
+        yych = YYPEEK ();
         {
             static void *yytarget[256] = {
                 &&yy654, &&yy654, &&yy654, &&yy654, &&yy654, &&yy654, &&yy654, &&yy654,
@@ -5666,7 +5724,7 @@ yy653:
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132,
                 &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132, &&yy132
             };
-            goto *yytarget[(yych = YYPEEK ())];
+            goto *yytarget[yych];
         }
 yy654:
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5679,7 +5737,8 @@ yy655:
         goto yy133;
 yy656:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5736,7 +5795,8 @@ yy667:
         continue;
 yy669:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5744,7 +5804,8 @@ yy669:
         continue;
 yy671:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5752,7 +5813,8 @@ yy671:
         continue;
 yy673:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5778,7 +5840,8 @@ yy677:
         goto yy133;
 yy678:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5786,7 +5849,8 @@ yy678:
         continue;
 yy680:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5847,7 +5911,8 @@ yy690:
         goto yy133;
 yy691:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5867,7 +5932,8 @@ yy694:
         goto yy133;
 yy695:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5903,7 +5969,8 @@ yy701:
         goto yy133;
 yy702:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5929,7 +5996,8 @@ yy706:
         goto yy133;
 yy707:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5937,7 +6005,8 @@ yy707:
         continue;
 yy709:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5945,7 +6014,8 @@ yy709:
         continue;
 yy711:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5953,7 +6023,8 @@ yy711:
         continue;
 yy713:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5967,7 +6038,8 @@ yy715:
         goto yy133;
 yy716:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -5998,7 +6070,8 @@ yy721:
         goto yy133;
 yy722:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6006,7 +6079,8 @@ yy722:
         continue;
 yy724:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6014,7 +6088,8 @@ yy724:
         continue;
 yy726:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6022,7 +6097,8 @@ yy726:
         continue;
 yy728:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6036,7 +6112,8 @@ yy730:
         goto yy133;
 yy731:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6061,7 +6138,8 @@ yy735:
         goto yy133;
 yy736:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6103,7 +6181,8 @@ yy743:
         goto yy133;
 yy744:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6111,7 +6190,8 @@ yy744:
         continue;
 yy746:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6119,7 +6199,8 @@ yy746:
         continue;
 yy748:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6144,7 +6225,8 @@ yy752:
         goto yy133;
 yy753:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)
@@ -6157,7 +6239,8 @@ yy755:
         if (yych != 'r') goto yy133;
 yy756:
         YYSKIP ();
-        if (yybm[0+(yych = YYPEEK ())] & 16) {
+        yych = YYPEEK ();
+        if (yybm[0+yych] & 16) {
             goto yy132;
         }
         status = check_key_count_line2358_ST_IN_SCRIPTING(keys_count, i, 3)

diff --git a/re2c/test/push.--skeleton.c b/re2c/test/push.--skeleton.c
index 034c012bd18a17168b2f5a1bee765ef9b112b06b..9269dad11d9e131325bcc0ae865af57e2e8a5882 100644 (file)
--- a/re2c/test/push.--skeleton.c
+++ b/re2c/test/push.--skeleton.c
@@ -463,7 +463,8 @@ yy40:
         }
 yy41:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -563,7 +564,8 @@ yy46:
         }
 yy47:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -663,7 +665,8 @@ yy52:
         }
 yy53:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -735,7 +738,8 @@ yy54:
         continue;
 yy55:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -821,7 +825,8 @@ yy58:
         }
 yy59:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -900,7 +905,8 @@ yy61:
         }
 yy62:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':
@@ -972,7 +978,8 @@ yy63:
         continue;
 yy64:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '0':
         case '1':
         case '2':

diff --git a/re2c/test/push.c b/re2c/test/push.c
index 755a97973a1acff151558e3c03b9a4922504d29d..838100f6959541dddc1a28373674b9bbf961ccd4 100644 (file)
--- a/re2c/test/push.c
+++ b/re2c/test/push.c
@@ -533,8 +533,8 @@ yy40:
        default:        goto yy28;
        }
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -629,8 +629,8 @@ yy46:
        default:        goto yy28;
        }
 yy47:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -725,8 +725,8 @@ yy52:
        default:        goto yy28;
        }
 yy53:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -797,8 +797,8 @@ yy54:
        { SEND(kElse);           }
 #line 799 "push.c"
 yy55:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -881,8 +881,8 @@ yy58:
        default:        goto yy28;
        }
 yy59:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -959,8 +959,8 @@ yy61:
        default:        goto yy28;
        }
 yy62:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1031,8 +1031,8 @@ yy63:
        { SEND(kWhile);          }
 #line 1033 "push.c"
 yy64:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/push.f.c b/re2c/test/push.f.c
index 69e1dd387e1085b1ea2128fc5b891f3e958d40d4..ea39123973d47acd1719e3396bd7e0d2a4d811f6 100644 (file)
--- a/re2c/test/push.f.c
+++ b/re2c/test/push.f.c
@@ -544,8 +544,8 @@ yy40:
        default:        goto yy28;
        }
 yy41:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -640,8 +640,8 @@ yy46:
        default:        goto yy28;
        }
 yy47:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -736,8 +736,8 @@ yy52:
        default:        goto yy28;
        }
 yy53:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -808,8 +808,8 @@ yy54:
        { SEND(kElse);           }
 #line 810 "push.f.c"
 yy55:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -892,8 +892,8 @@ yy58:
        default:        goto yy28;
        }
 yy59:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -970,8 +970,8 @@ yy61:
        default:        goto yy28;
        }
 yy62:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':
@@ -1042,8 +1042,8 @@ yy63:
        { SEND(kWhile);          }
 #line 1044 "push.f.c"
 yy64:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/push.fb.c b/re2c/test/push.fb.c
index 7b749775f6d5bee59ee93cb6b57fb7dfecfe522a..c91359eeddd31d697d199dfc9ac05df83b59e4dd 100644 (file)
--- a/re2c/test/push.fb.c
+++ b/re2c/test/push.fb.c
@@ -477,8 +477,8 @@ yy40:
        if (yych == 't') goto yy49;
        goto yy28;
 yy41:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 239 "push.fb.re"
@@ -501,8 +501,8 @@ yy46:
        if (yych == 'e') goto yy53;
        goto yy28;
 yy47:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 240 "push.fb.re"
@@ -525,16 +525,16 @@ yy52:
        if (yych == 'k') goto yy59;
        goto yy28;
 yy53:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 241 "push.fb.re"
        { SEND(kElse);           }
 #line 535 "push.fb.c"
 yy55:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 242 "push.fb.re"
@@ -549,8 +549,8 @@ yy58:
        if (yych == 'e') goto yy62;
        goto yy28;
 yy59:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 243 "push.fb.re"
@@ -561,16 +561,16 @@ yy61:
        if (yych == 'n') goto yy64;
        goto yy28;
 yy62:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 244 "push.fb.re"
        { SEND(kWhile);          }
 #line 571 "push.fb.c"
 yy64:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 245 "push.fb.re"

diff --git a/re2c/test/push.fg.c b/re2c/test/push.fg.c
index 249b5f960074c5d26eb5c27d02d61c23944ae147..d60143d38f7dcd295486b767e66007d99d223f56 100644 (file)
--- a/re2c/test/push.fg.c
+++ b/re2c/test/push.fg.c
@@ -439,8 +439,8 @@ yy40:
        if (yych == 't') goto yy49;
        goto yy28;
 yy41:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 239 "push.fg.re"
@@ -463,8 +463,8 @@ yy46:
        if (yych == 'e') goto yy53;
        goto yy28;
 yy47:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 240 "push.fg.re"
@@ -487,16 +487,16 @@ yy52:
        if (yych == 'k') goto yy59;
        goto yy28;
 yy53:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 241 "push.fg.re"
        { SEND(kElse);           }
 #line 497 "push.fg.c"
 yy55:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 242 "push.fg.re"
@@ -511,8 +511,8 @@ yy58:
        if (yych == 'e') goto yy62;
        goto yy28;
 yy59:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 243 "push.fg.re"
@@ -523,16 +523,16 @@ yy61:
        if (yych == 'n') goto yy64;
        goto yy28;
 yy62:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 244 "push.fg.re"
        { SEND(kWhile);          }
 #line 533 "push.fg.c"
 yy64:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 128) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 128) {
                goto yy27;
        }
 #line 245 "push.fg.re"

diff --git a/re2c/test/push.fs.c b/re2c/test/push.fs.c
index 18157df9e46ea2b9ac3822cdf67afedd4be24c65..180df80684a6b685acb5c2f4f5b538e5101d2e9b 100644 (file)
--- a/re2c/test/push.fs.c
+++ b/re2c/test/push.fs.c
@@ -242,8 +242,8 @@ yy40:
        if (yych == 't') goto yy49;
        goto yy28;
 yy41:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy42;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -276,8 +276,8 @@ yy46:
        if (yych == 'e') goto yy53;
        goto yy28;
 yy47:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy48;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -310,8 +310,8 @@ yy52:
        if (yych == 'k') goto yy59;
        goto yy28;
 yy53:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy54;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -328,8 +328,8 @@ yy54:
        { SEND(kElse);           }
 #line 330 "push.fs.c"
 yy55:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy56;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -354,8 +354,8 @@ yy58:
        if (yych == 'e') goto yy62;
        goto yy28;
 yy59:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy60;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -376,8 +376,8 @@ yy61:
        if (yych == 'n') goto yy64;
        goto yy28;
 yy62:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy63;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;
@@ -394,8 +394,8 @@ yy63:
        { SEND(kWhile);          }
 #line 396 "push.fs.c"
 yy64:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 'Z') {
+       yych = *++YYCURSOR;
+       if (yych <= 'Z') {
                if (yych <= '/') goto yy65;
                if (yych <= '9') goto yy27;
                if (yych >= 'A') goto yy27;

diff --git a/re2c/test/range_dot.8.c b/re2c/test/range_dot.8.c
index 7ba289d55682fc49515b57bfefd317675fe706cc..bdd8efafd649b988f4b9485cb5a7fc9ececa11cb 100644 (file)
--- a/re2c/test/range_dot.8.c
+++ b/re2c/test/range_dot.8.c
@@ -491,8 +491,8 @@ yy9:
        default:        goto yy2;
        }
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/range_dot.x.c b/re2c/test/range_dot.x.c
index d4a6fb9b15e6460e7a7f8b395608a9a819c3129c..5856d7661c3c99e9de53d20a46f6ba5f78dae9b8 100644 (file)
--- a/re2c/test/range_dot.x.c
+++ b/re2c/test/range_dot.x.c
@@ -18,8 +18,8 @@ yy4:
        {return 0;}
 #line 20 "range_dot.x.c"
 yy5:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy4;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy4;
        if (yych <= 0xDFFF) goto yy3;
        goto yy4;
 }

diff --git a/re2c/test/range_full.8.c b/re2c/test/range_full.8.c
index be9351080b7473392d83646071dd8861d2757db3..5ba9553dd714a64724c75adcf5d9ae87404ff614 100644 (file)
--- a/re2c/test/range_full.8.c
+++ b/re2c/test/range_full.8.c
@@ -492,8 +492,8 @@ yy9:
        default:        goto yy2;
        }
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/range_full.x.c b/re2c/test/range_full.x.c
index 4ff721d3546bcdf0026494978b8950d70cb52339..a7dd8a0a634f02e501ab04eadacb9c3a3ac201ad 100644 (file)
--- a/re2c/test/range_full.x.c
+++ b/re2c/test/range_full.x.c
@@ -15,8 +15,8 @@ yy3:
        {return 0;}
 #line 17 "range_full.x.c"
 yy4:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDFFF) goto yy2;
        goto yy3;
 }

diff --git a/re2c/test/range_neg_lf.8.c b/re2c/test/range_neg_lf.8.c
index 464513a569a3720d0e69524140635606e6ba4664..87a50b919a0096611d1b5a665402fef28dca0b4d 100644 (file)
--- a/re2c/test/range_neg_lf.8.c
+++ b/re2c/test/range_neg_lf.8.c
@@ -491,8 +491,8 @@ yy9:
        default:        goto yy2;
        }
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/range_neg_lf.x.c b/re2c/test/range_neg_lf.x.c
index 477e019ae88c99a24c7f196fb0bd89ada046211f..4b4b3fa16978b96368f74db6a64ff4e1817ce877 100644 (file)
--- a/re2c/test/range_neg_lf.x.c
+++ b/re2c/test/range_neg_lf.x.c
@@ -18,8 +18,8 @@ yy4:
        {return 0;}
 #line 20 "range_neg_lf.x.c"
 yy5:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy4;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy4;
        if (yych <= 0xDFFF) goto yy3;
        goto yy4;
 }

diff --git a/re2c/test/repeater2.c b/re2c/test/repeater2.c
index 366d2a27d63f7248ea5dad58fd2463dbbe88db9b..c184225fabbbc3bfb4f64e47cc2e33afd476b1f2 100644 (file)
--- a/re2c/test/repeater2.c
+++ b/re2c/test/repeater2.c
@@ -241,8 +241,8 @@ yy53:
        default:        goto yy52;
        }
 yy54:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy56;
        default:        goto yy55;
        }

diff --git a/re2c/test/rexx.--empty-class(match-empty).c b/re2c/test/rexx.--empty-class(match-empty).c
index 563f6357f79d0442e8a495fdf9417906b0bd7ab9..61474f3f7e5ce1354a55542c49b8e18bdc3b0533 100644 (file)
--- a/re2c/test/rexx.--empty-class(match-empty).c
+++ b/re2c/test/rexx.--empty-class(match-empty).c
@@ -652,8 +652,8 @@ yy66:
        { RETURN(OP_OR); }
 #line 654 "rexx.--empty-class(match-empty).c"
 yy67:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '.':
        case '0':
@@ -1019,8 +1019,8 @@ yy110:
        default:        goto yy9;
        }
 yy111:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1108,8 +1108,8 @@ yy114:
        default:        goto yy9;
        }
 yy115:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1250,8 +1250,8 @@ yy125:
        default:        goto yy9;
        }
 yy126:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1385,8 +1385,8 @@ yy135:
        default:        goto yy9;
        }
 yy136:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1560,8 +1560,8 @@ yy151:
        default:        goto yy9;
        }
 yy152:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2014,8 +2014,8 @@ yy184:
        default:        goto yy9;
        }
 yy185:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2117,8 +2117,8 @@ yy190:
        default:        goto yy9;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2227,8 +2227,8 @@ yy197:
        default:        goto yy9;
        }
 yy198:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2351,8 +2351,8 @@ yy206:
        default:        goto yy9;
        }
 yy207:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2447,8 +2447,8 @@ yy211:
        default:        goto yy9;
        }
 yy212:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2578,8 +2578,8 @@ yy221:
        default:        goto yy9;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2723,8 +2723,8 @@ yy233:
        default:        goto yy9;
        }
 yy234:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2897,8 +2897,8 @@ yy254:
        default:        goto yy9;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2979,8 +2979,8 @@ yy257:
        default:        goto yy9;
        }
 yy258:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3054,8 +3054,8 @@ yy259:
        { RETURN(RX_DROP); }
 #line 3056 "rexx.--empty-class(match-empty).c"
 yy260:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3143,8 +3143,8 @@ yy263:
        default:        goto yy9;
        }
 yy264:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3239,8 +3239,8 @@ yy268:
        default:        goto yy9;
        }
 yy269:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3314,8 +3314,8 @@ yy270:
        { RETURN(RXS_FORM); }
 #line 3316 "rexx.--empty-class(match-empty).c"
 yy271:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3389,8 +3389,8 @@ yy272:
        { RETURN(RXS_FUZZ); }
 #line 3391 "rexx.--empty-class(match-empty).c"
 yy273:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3492,8 +3492,8 @@ yy278:
        default:        goto yy9;
        }
 yy279:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3616,8 +3616,8 @@ yy287:
        default:        goto yy9;
        }
 yy288:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3691,8 +3691,8 @@ yy289:
        { RETURN(RX_PULL); }
 #line 3693 "rexx.--empty-class(match-empty).c"
 yy290:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3815,8 +3815,8 @@ yy298:
        default:        goto yy9;
        }
 yy299:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3925,8 +3925,8 @@ yy305:
        default:        goto yy9;
        }
 yy306:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4007,8 +4007,8 @@ yy308:
        default:        goto yy9;
        }
 yy309:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4103,8 +4103,8 @@ yy313:
        default:        goto yy9;
        }
 yy314:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4213,8 +4213,8 @@ yy320:
        default:        goto yy9;
        }
 yy321:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4330,8 +4330,8 @@ yy328:
        default:        goto yy9;
        }
 yy329:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4412,8 +4412,8 @@ yy331:
        default:        goto yy9;
        }
 yy332:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4529,8 +4529,8 @@ yy339:
        default:        goto yy9;
        }
 yy340:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4604,8 +4604,8 @@ yy341:
        { RETURN(RX_TRACE); }
 #line 4606 "rexx.--empty-class(match-empty).c"
 yy342:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4679,8 +4679,8 @@ yy343:
        { RETURN(RXS_UNTIL); }
 #line 4681 "rexx.--empty-class(match-empty).c"
 yy344:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4754,8 +4754,8 @@ yy345:
        { RETURN(RXS_UPPER); }
 #line 4756 "rexx.--empty-class(match-empty).c"
 yy346:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4836,8 +4836,8 @@ yy348:
        default:        goto yy9;
        }
 yy349:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4918,8 +4918,8 @@ yy351:
        default:        goto yy9;
        }
 yy352:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5000,8 +5000,8 @@ yy354:
        default:        goto yy9;
        }
 yy355:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5103,8 +5103,8 @@ yy360:
        default:        goto yy9;
        }
 yy361:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5220,8 +5220,8 @@ yy368:
        default:        goto yy9;
        }
 yy369:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5302,8 +5302,8 @@ yy371:
        default:        goto yy9;
        }
 yy372:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5377,8 +5377,8 @@ yy373:
        { RETURN(RX_SELECT); }
 #line 5379 "rexx.--empty-class(match-empty).c"
 yy374:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5452,8 +5452,8 @@ yy375:
        { RETURN(RX_SIGNAL); }
 #line 5454 "rexx.--empty-class(match-empty).c"
 yy376:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5527,8 +5527,8 @@ yy377:
        { RETURN(RXS_SOURCE); }
 #line 5529 "rexx.--empty-class(match-empty).c"
 yy378:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5609,8 +5609,8 @@ yy380:
        default:        goto yy9;
        }
 yy381:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5691,8 +5691,8 @@ yy383:
        default:        goto yy9;
        }
 yy384:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5766,8 +5766,8 @@ yy385:
        { RETURN(RXS_FAILURE); }
 #line 5768 "rexx.--empty-class(match-empty).c"
 yy386:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5848,8 +5848,8 @@ yy388:
        default:        goto yy9;
        }
 yy389:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5930,8 +5930,8 @@ yy391:
        default:        goto yy9;
        }
 yy392:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6005,8 +6005,8 @@ yy393:
        { RETURN(RXS_NOVALUE); }
 #line 6007 "rexx.--empty-class(match-empty).c"
 yy394:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6080,8 +6080,8 @@ yy395:
        { RETURN(RX_NUMERIC); }
 #line 6082 "rexx.--empty-class(match-empty).c"
 yy396:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6176,8 +6176,8 @@ yy400:
        default:        goto yy9;
        }
 yy401:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6265,8 +6265,8 @@ yy404:
        default:        goto yy9;
        }
 yy405:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6368,8 +6368,8 @@ yy410:
        default:        goto yy9;
        }
 yy411:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6443,8 +6443,8 @@ yy412:
        { RETURN(RX_INTERPRET); }
 #line 6445 "rexx.--empty-class(match-empty).c"
 yy413:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6518,8 +6518,8 @@ yy414:
        { RETURN(RX_OTHERWISE); }
 #line 6520 "rexx.--empty-class(match-empty).c"
 yy415:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6607,8 +6607,8 @@ yy418:
        default:        goto yy9;
        }
 yy419:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6682,8 +6682,8 @@ yy420:
        { RETURN(RXS_SCIENTIFIC); }
 #line 6684 "rexx.--empty-class(match-empty).c"
 yy421:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':

diff --git a/re2c/test/rexx.--empty-class(match-none).c b/re2c/test/rexx.--empty-class(match-none).c
index fe5c22861fcaf57ade4b8215a8bf8a30c861c853..a7a89f91d9a6c72c642962d5351d3dc79d103b9f 100644 (file)
--- a/re2c/test/rexx.--empty-class(match-none).c
+++ b/re2c/test/rexx.--empty-class(match-none).c
@@ -652,8 +652,8 @@ yy66:
        { RETURN(OP_OR); }
 #line 654 "rexx.--empty-class(match-none).c"
 yy67:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '.':
        case '0':
@@ -1019,8 +1019,8 @@ yy110:
        default:        goto yy9;
        }
 yy111:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1108,8 +1108,8 @@ yy114:
        default:        goto yy9;
        }
 yy115:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1250,8 +1250,8 @@ yy125:
        default:        goto yy9;
        }
 yy126:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1385,8 +1385,8 @@ yy135:
        default:        goto yy9;
        }
 yy136:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1560,8 +1560,8 @@ yy151:
        default:        goto yy9;
        }
 yy152:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2014,8 +2014,8 @@ yy184:
        default:        goto yy9;
        }
 yy185:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2117,8 +2117,8 @@ yy190:
        default:        goto yy9;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2227,8 +2227,8 @@ yy197:
        default:        goto yy9;
        }
 yy198:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2351,8 +2351,8 @@ yy206:
        default:        goto yy9;
        }
 yy207:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2447,8 +2447,8 @@ yy211:
        default:        goto yy9;
        }
 yy212:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2578,8 +2578,8 @@ yy221:
        default:        goto yy9;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2723,8 +2723,8 @@ yy233:
        default:        goto yy9;
        }
 yy234:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2897,8 +2897,8 @@ yy254:
        default:        goto yy9;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2979,8 +2979,8 @@ yy257:
        default:        goto yy9;
        }
 yy258:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3054,8 +3054,8 @@ yy259:
        { RETURN(RX_DROP); }
 #line 3056 "rexx.--empty-class(match-none).c"
 yy260:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3143,8 +3143,8 @@ yy263:
        default:        goto yy9;
        }
 yy264:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3239,8 +3239,8 @@ yy268:
        default:        goto yy9;
        }
 yy269:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3314,8 +3314,8 @@ yy270:
        { RETURN(RXS_FORM); }
 #line 3316 "rexx.--empty-class(match-none).c"
 yy271:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3389,8 +3389,8 @@ yy272:
        { RETURN(RXS_FUZZ); }
 #line 3391 "rexx.--empty-class(match-none).c"
 yy273:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3492,8 +3492,8 @@ yy278:
        default:        goto yy9;
        }
 yy279:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3616,8 +3616,8 @@ yy287:
        default:        goto yy9;
        }
 yy288:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3691,8 +3691,8 @@ yy289:
        { RETURN(RX_PULL); }
 #line 3693 "rexx.--empty-class(match-none).c"
 yy290:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3815,8 +3815,8 @@ yy298:
        default:        goto yy9;
        }
 yy299:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3925,8 +3925,8 @@ yy305:
        default:        goto yy9;
        }
 yy306:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4007,8 +4007,8 @@ yy308:
        default:        goto yy9;
        }
 yy309:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4103,8 +4103,8 @@ yy313:
        default:        goto yy9;
        }
 yy314:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4213,8 +4213,8 @@ yy320:
        default:        goto yy9;
        }
 yy321:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4330,8 +4330,8 @@ yy328:
        default:        goto yy9;
        }
 yy329:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4412,8 +4412,8 @@ yy331:
        default:        goto yy9;
        }
 yy332:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4529,8 +4529,8 @@ yy339:
        default:        goto yy9;
        }
 yy340:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4604,8 +4604,8 @@ yy341:
        { RETURN(RX_TRACE); }
 #line 4606 "rexx.--empty-class(match-none).c"
 yy342:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4679,8 +4679,8 @@ yy343:
        { RETURN(RXS_UNTIL); }
 #line 4681 "rexx.--empty-class(match-none).c"
 yy344:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4754,8 +4754,8 @@ yy345:
        { RETURN(RXS_UPPER); }
 #line 4756 "rexx.--empty-class(match-none).c"
 yy346:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4836,8 +4836,8 @@ yy348:
        default:        goto yy9;
        }
 yy349:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4918,8 +4918,8 @@ yy351:
        default:        goto yy9;
        }
 yy352:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5000,8 +5000,8 @@ yy354:
        default:        goto yy9;
        }
 yy355:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5103,8 +5103,8 @@ yy360:
        default:        goto yy9;
        }
 yy361:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5220,8 +5220,8 @@ yy368:
        default:        goto yy9;
        }
 yy369:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5302,8 +5302,8 @@ yy371:
        default:        goto yy9;
        }
 yy372:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5377,8 +5377,8 @@ yy373:
        { RETURN(RX_SELECT); }
 #line 5379 "rexx.--empty-class(match-none).c"
 yy374:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5452,8 +5452,8 @@ yy375:
        { RETURN(RX_SIGNAL); }
 #line 5454 "rexx.--empty-class(match-none).c"
 yy376:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5527,8 +5527,8 @@ yy377:
        { RETURN(RXS_SOURCE); }
 #line 5529 "rexx.--empty-class(match-none).c"
 yy378:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5609,8 +5609,8 @@ yy380:
        default:        goto yy9;
        }
 yy381:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5691,8 +5691,8 @@ yy383:
        default:        goto yy9;
        }
 yy384:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5766,8 +5766,8 @@ yy385:
        { RETURN(RXS_FAILURE); }
 #line 5768 "rexx.--empty-class(match-none).c"
 yy386:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5848,8 +5848,8 @@ yy388:
        default:        goto yy9;
        }
 yy389:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5930,8 +5930,8 @@ yy391:
        default:        goto yy9;
        }
 yy392:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6005,8 +6005,8 @@ yy393:
        { RETURN(RXS_NOVALUE); }
 #line 6007 "rexx.--empty-class(match-none).c"
 yy394:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6080,8 +6080,8 @@ yy395:
        { RETURN(RX_NUMERIC); }
 #line 6082 "rexx.--empty-class(match-none).c"
 yy396:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6176,8 +6176,8 @@ yy400:
        default:        goto yy9;
        }
 yy401:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6265,8 +6265,8 @@ yy404:
        default:        goto yy9;
        }
 yy405:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6368,8 +6368,8 @@ yy410:
        default:        goto yy9;
        }
 yy411:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6443,8 +6443,8 @@ yy412:
        { RETURN(RX_INTERPRET); }
 #line 6445 "rexx.--empty-class(match-none).c"
 yy413:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6518,8 +6518,8 @@ yy414:
        { RETURN(RX_OTHERWISE); }
 #line 6520 "rexx.--empty-class(match-none).c"
 yy415:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6607,8 +6607,8 @@ yy418:
        default:        goto yy9;
        }
 yy419:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6682,8 +6682,8 @@ yy420:
        { RETURN(RXS_SCIENTIFIC); }
 #line 6684 "rexx.--empty-class(match-none).c"
 yy421:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':

diff --git a/re2c/test/rexx.--skeleton.c b/re2c/test/rexx.--skeleton.c
index 38dbda0f7af8b45471ffce3cac088a19df6a7f53..390dec5f15bc20359e7db12c79cca180e481095c 100644 (file)
--- a/re2c/test/rexx.--skeleton.c
+++ b/re2c/test/rexx.--skeleton.c
@@ -816,7 +816,8 @@ yy66:
         continue;
 yy67:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '.':
         case '0':
@@ -1192,7 +1193,8 @@ yy110:
         }
 yy111:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -1283,7 +1285,8 @@ yy114:
         }
 yy115:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -1434,7 +1437,8 @@ yy125:
         }
 yy126:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -1577,7 +1581,8 @@ yy135:
         }
 yy136:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -1766,7 +1771,8 @@ yy151:
         }
 yy152:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2241,7 +2247,8 @@ yy184:
         }
 yy185:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2348,7 +2355,8 @@ yy190:
         }
 yy191:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2463,7 +2471,8 @@ yy197:
         }
 yy198:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2594,7 +2603,8 @@ yy206:
         }
 yy207:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2693,7 +2703,8 @@ yy211:
         }
 yy212:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2832,7 +2843,8 @@ yy221:
         }
 yy222:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -2987,7 +2999,8 @@ yy233:
         }
 yy234:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3166,7 +3179,8 @@ yy254:
         }
 yy255:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3249,7 +3263,8 @@ yy257:
         }
 yy258:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3324,7 +3339,8 @@ yy259:
         continue;
 yy260:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3415,7 +3431,8 @@ yy263:
         }
 yy264:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3514,7 +3531,8 @@ yy268:
         }
 yy269:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3589,7 +3607,8 @@ yy270:
         continue;
 yy271:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3664,7 +3683,8 @@ yy272:
         continue;
 yy273:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3771,7 +3791,8 @@ yy278:
         }
 yy279:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3902,7 +3923,8 @@ yy287:
         }
 yy288:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -3977,7 +3999,8 @@ yy289:
         continue;
 yy290:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4108,7 +4131,8 @@ yy298:
         }
 yy299:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4223,7 +4247,8 @@ yy305:
         }
 yy306:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4306,7 +4331,8 @@ yy308:
         }
 yy309:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4405,7 +4431,8 @@ yy313:
         }
 yy314:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4520,7 +4547,8 @@ yy320:
         }
 yy321:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4643,7 +4671,8 @@ yy328:
         }
 yy329:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4726,7 +4755,8 @@ yy331:
         }
 yy332:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4849,7 +4879,8 @@ yy339:
         }
 yy340:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4924,7 +4955,8 @@ yy341:
         continue;
 yy342:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -4999,7 +5031,8 @@ yy343:
         continue;
 yy344:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5074,7 +5107,8 @@ yy345:
         continue;
 yy346:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5157,7 +5191,8 @@ yy348:
         }
 yy349:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5240,7 +5275,8 @@ yy351:
         }
 yy352:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5323,7 +5359,8 @@ yy354:
         }
 yy355:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5430,7 +5467,8 @@ yy360:
         }
 yy361:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5553,7 +5591,8 @@ yy368:
         }
 yy369:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5636,7 +5675,8 @@ yy371:
         }
 yy372:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5711,7 +5751,8 @@ yy373:
         continue;
 yy374:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5786,7 +5827,8 @@ yy375:
         continue;
 yy376:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5861,7 +5903,8 @@ yy377:
         continue;
 yy378:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -5944,7 +5987,8 @@ yy380:
         }
 yy381:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6027,7 +6071,8 @@ yy383:
         }
 yy384:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6102,7 +6147,8 @@ yy385:
         continue;
 yy386:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6185,7 +6231,8 @@ yy388:
         }
 yy389:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6268,7 +6315,8 @@ yy391:
         }
 yy392:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6343,7 +6391,8 @@ yy393:
         continue;
 yy394:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6418,7 +6467,8 @@ yy395:
         continue;
 yy396:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6517,7 +6567,8 @@ yy400:
         }
 yy401:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6608,7 +6659,8 @@ yy404:
         }
 yy405:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6715,7 +6767,8 @@ yy410:
         }
 yy411:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6790,7 +6843,8 @@ yy412:
         continue;
 yy413:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6865,7 +6919,8 @@ yy414:
         continue;
 yy415:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -6956,7 +7011,8 @@ yy418:
         }
 yy419:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':
@@ -7031,7 +7087,8 @@ yy420:
         continue;
 yy421:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '!':
         case '0':
         case '1':

diff --git a/re2c/test/rexx.c b/re2c/test/rexx.c
index e7ec8d936e3023bc85ce281deacdc0ff684c5fe2..4273ab8644e0e027b84c43de43cb33423722fd5f 100644 (file)
--- a/re2c/test/rexx.c
+++ b/re2c/test/rexx.c
@@ -652,8 +652,8 @@ yy66:
        { RETURN(OP_OR); }
 #line 654 "rexx.c"
 yy67:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '.':
        case '0':
@@ -1019,8 +1019,8 @@ yy110:
        default:        goto yy9;
        }
 yy111:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1108,8 +1108,8 @@ yy114:
        default:        goto yy9;
        }
 yy115:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1250,8 +1250,8 @@ yy125:
        default:        goto yy9;
        }
 yy126:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1385,8 +1385,8 @@ yy135:
        default:        goto yy9;
        }
 yy136:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -1560,8 +1560,8 @@ yy151:
        default:        goto yy9;
        }
 yy152:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2014,8 +2014,8 @@ yy184:
        default:        goto yy9;
        }
 yy185:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2117,8 +2117,8 @@ yy190:
        default:        goto yy9;
        }
 yy191:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2227,8 +2227,8 @@ yy197:
        default:        goto yy9;
        }
 yy198:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2351,8 +2351,8 @@ yy206:
        default:        goto yy9;
        }
 yy207:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2447,8 +2447,8 @@ yy211:
        default:        goto yy9;
        }
 yy212:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2578,8 +2578,8 @@ yy221:
        default:        goto yy9;
        }
 yy222:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2723,8 +2723,8 @@ yy233:
        default:        goto yy9;
        }
 yy234:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2897,8 +2897,8 @@ yy254:
        default:        goto yy9;
        }
 yy255:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -2979,8 +2979,8 @@ yy257:
        default:        goto yy9;
        }
 yy258:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3054,8 +3054,8 @@ yy259:
        { RETURN(RX_DROP); }
 #line 3056 "rexx.c"
 yy260:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3143,8 +3143,8 @@ yy263:
        default:        goto yy9;
        }
 yy264:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3239,8 +3239,8 @@ yy268:
        default:        goto yy9;
        }
 yy269:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3314,8 +3314,8 @@ yy270:
        { RETURN(RXS_FORM); }
 #line 3316 "rexx.c"
 yy271:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3389,8 +3389,8 @@ yy272:
        { RETURN(RXS_FUZZ); }
 #line 3391 "rexx.c"
 yy273:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3492,8 +3492,8 @@ yy278:
        default:        goto yy9;
        }
 yy279:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3616,8 +3616,8 @@ yy287:
        default:        goto yy9;
        }
 yy288:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3691,8 +3691,8 @@ yy289:
        { RETURN(RX_PULL); }
 #line 3693 "rexx.c"
 yy290:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3815,8 +3815,8 @@ yy298:
        default:        goto yy9;
        }
 yy299:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -3925,8 +3925,8 @@ yy305:
        default:        goto yy9;
        }
 yy306:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4007,8 +4007,8 @@ yy308:
        default:        goto yy9;
        }
 yy309:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4103,8 +4103,8 @@ yy313:
        default:        goto yy9;
        }
 yy314:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4213,8 +4213,8 @@ yy320:
        default:        goto yy9;
        }
 yy321:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4330,8 +4330,8 @@ yy328:
        default:        goto yy9;
        }
 yy329:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4412,8 +4412,8 @@ yy331:
        default:        goto yy9;
        }
 yy332:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4529,8 +4529,8 @@ yy339:
        default:        goto yy9;
        }
 yy340:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4604,8 +4604,8 @@ yy341:
        { RETURN(RX_TRACE); }
 #line 4606 "rexx.c"
 yy342:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4679,8 +4679,8 @@ yy343:
        { RETURN(RXS_UNTIL); }
 #line 4681 "rexx.c"
 yy344:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4754,8 +4754,8 @@ yy345:
        { RETURN(RXS_UPPER); }
 #line 4756 "rexx.c"
 yy346:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4836,8 +4836,8 @@ yy348:
        default:        goto yy9;
        }
 yy349:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -4918,8 +4918,8 @@ yy351:
        default:        goto yy9;
        }
 yy352:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5000,8 +5000,8 @@ yy354:
        default:        goto yy9;
        }
 yy355:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5103,8 +5103,8 @@ yy360:
        default:        goto yy9;
        }
 yy361:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5220,8 +5220,8 @@ yy368:
        default:        goto yy9;
        }
 yy369:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5302,8 +5302,8 @@ yy371:
        default:        goto yy9;
        }
 yy372:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5377,8 +5377,8 @@ yy373:
        { RETURN(RX_SELECT); }
 #line 5379 "rexx.c"
 yy374:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5452,8 +5452,8 @@ yy375:
        { RETURN(RX_SIGNAL); }
 #line 5454 "rexx.c"
 yy376:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5527,8 +5527,8 @@ yy377:
        { RETURN(RXS_SOURCE); }
 #line 5529 "rexx.c"
 yy378:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5609,8 +5609,8 @@ yy380:
        default:        goto yy9;
        }
 yy381:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5691,8 +5691,8 @@ yy383:
        default:        goto yy9;
        }
 yy384:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5766,8 +5766,8 @@ yy385:
        { RETURN(RXS_FAILURE); }
 #line 5768 "rexx.c"
 yy386:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5848,8 +5848,8 @@ yy388:
        default:        goto yy9;
        }
 yy389:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -5930,8 +5930,8 @@ yy391:
        default:        goto yy9;
        }
 yy392:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6005,8 +6005,8 @@ yy393:
        { RETURN(RXS_NOVALUE); }
 #line 6007 "rexx.c"
 yy394:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6080,8 +6080,8 @@ yy395:
        { RETURN(RX_NUMERIC); }
 #line 6082 "rexx.c"
 yy396:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6176,8 +6176,8 @@ yy400:
        default:        goto yy9;
        }
 yy401:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6265,8 +6265,8 @@ yy404:
        default:        goto yy9;
        }
 yy405:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6368,8 +6368,8 @@ yy410:
        default:        goto yy9;
        }
 yy411:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6443,8 +6443,8 @@ yy412:
        { RETURN(RX_INTERPRET); }
 #line 6445 "rexx.c"
 yy413:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6518,8 +6518,8 @@ yy414:
        { RETURN(RX_OTHERWISE); }
 #line 6520 "rexx.c"
 yy415:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6607,8 +6607,8 @@ yy418:
        default:        goto yy9;
        }
 yy419:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':
@@ -6682,8 +6682,8 @@ yy420:
        { RETURN(RXS_SCIENTIFIC); }
 #line 6684 "rexx.c"
 yy421:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '!':
        case '0':
        case '1':

diff --git a/re2c/test/sample.c b/re2c/test/sample.c
index 36e072919cd975b7338fcbec6e703f621557c973..b8b7323ca5b9aee76e58367e9f0297110ab5a8e4 100644 (file)
--- a/re2c/test/sample.c
+++ b/re2c/test/sample.c
@@ -192,8 +192,8 @@ yy19:
        default:        goto yy9;
        }
 yy20:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':
        case 'b':
        case 'c':

diff --git a/re2c/test/scanner.--skeleton.c b/re2c/test/scanner.--skeleton.c
index 7a1dbdba7f8d41be5a7576749115fe16ae4a1290..18217d667f54b76be0d604f714366caa32242080 100644 (file)
--- a/re2c/test/scanner.--skeleton.c
+++ b/re2c/test/scanner.--skeleton.c
@@ -573,7 +573,8 @@ yy44:
         continue;
 yy45:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '/':    goto yy70;
         default:    goto yy46;
         }
@@ -1885,7 +1886,8 @@ yy158:
         }
 yy159:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case '\t':
         case '\n':
         case '\r':

diff --git a/re2c/test/scanner.c b/re2c/test/scanner.c
index 84919ee794d1c8adc2998d981cd14ffd530aa8b8..ef3c9bc5e2d8230df9773bc6f2fae990d7555d40 100644 (file)
--- a/re2c/test/scanner.c
+++ b/re2c/test/scanner.c
@@ -422,8 +422,8 @@ yy44:
        { RETURN(*tok); }
 #line 424 "scanner.c"
 yy45:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '/':       goto yy70;
        default:        goto yy46;
        }
@@ -1270,8 +1270,8 @@ yy158:
        default:        goto yy153;
        }
 yy159:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '\t':
        case '\n':
        case '\r':

diff --git a/re2c/test/scanner.fs.c b/re2c/test/scanner.fs.c
index 72488ba90310e70f09669dbbdf9d0f3d3d6feb50..932895ddc40301c8fe44aa83828b51e7af6a0e57 100644 (file)
--- a/re2c/test/scanner.fs.c
+++ b/re2c/test/scanner.fs.c
@@ -397,8 +397,8 @@ yy44:
        { RETURN(*tok); }
 #line 399 "scanner.fs.c"
 yy45:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '/') goto yy70;
+       yych = *++YYCURSOR;
+       if (yych == '/') goto yy70;
 yy46:
 #line 198 "scanner.fs.re"
        { yylval.op = *tok;
@@ -1091,8 +1091,8 @@ yy158:
        if (yych <= '9') goto yy161;
        goto yy153;
 yy159:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '\r') {
+       yych = *++YYCURSOR;
+       if (yych <= '\r') {
                if (yych <= 0x08) goto yy152;
                if (yych <= '\n') goto yy160;
                if (yych <= '\f') goto yy152;

diff --git a/re2c/test/scanner.s.c b/re2c/test/scanner.s.c
index 4c4ec3c6bcebc4b8a9f60ea8ab3bfd72c292414b..e05bc2e02bd51c3a0a0b045bbff358f77ff0c1fa 100644 (file)
--- a/re2c/test/scanner.s.c
+++ b/re2c/test/scanner.s.c
@@ -355,8 +355,8 @@ yy44:
        { RETURN(*tok); }
 #line 357 "scanner.s.c"
 yy45:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '/') goto yy70;
+       yych = *++YYCURSOR;
+       if (yych == '/') goto yy70;
 yy46:
 #line 198 "scanner.s.re"
        { yylval.op = *tok;
@@ -1005,8 +1005,8 @@ yy158:
        if (yych <= '9') goto yy161;
        goto yy153;
 yy159:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= '\r') {
+       yych = *++YYCURSOR;
+       if (yych <= '\r') {
                if (yych <= 0x08) goto yy152;
                if (yych <= '\n') goto yy160;
                if (yych <= '\f') goto yy152;

diff --git a/re2c/test/scanner_re2c.bi.c b/re2c/test/scanner_re2c.bi.c
index e9f5440fb551b231080b04baee09acce36f0bff5..f2af2099641865caf0d733c5fc069761901b3fe3 100644 (file)
--- a/re2c/test/scanner_re2c.bi.c
+++ b/re2c/test/scanner_re2c.bi.c
@@ -857,8 +857,8 @@ yy126:
                                        RETURN(*tok);
                                }
 yy127:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '/') goto yy153;
+       yych = *++YYCURSOR;
+       if (yych == '/') goto yy153;
        {
                                        yylval.op = *tok;
                                        RETURN(STAR);
@@ -1088,8 +1088,8 @@ yy162:
                                goto nextLine;
                        }
 yy164:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '>') goto yy191;
+       yych = *++YYCURSOR;
+       if (yych == '>') goto yy191;
        {
                                        cur = cursor;
                                        tok += 2; /* skip ":=" */
@@ -2334,8 +2334,8 @@ yy348:
        if (yych <= '9') goto yy351;
        goto yy343;
 yy349:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 4) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 4) {
                goto yy342;
        }
 yy350:

diff --git a/re2c/test/scanner_re2c_default.bi.c b/re2c/test/scanner_re2c_default.bi.c
index c3db5a5e33a2e6da98860ee43dd71135d4cd3acb..f949f75efc167a44628f0695be54505b3cc898e9 100644 (file)
--- a/re2c/test/scanner_re2c_default.bi.c
+++ b/re2c/test/scanner_re2c_default.bi.c
@@ -857,8 +857,8 @@ yy126:
                                        RETURN(*tok);
                                }
 yy127:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '/') goto yy153;
+       yych = *++YYCURSOR;
+       if (yych == '/') goto yy153;
        {
                                        yylval.op = *tok;
                                        RETURN(STAR);
@@ -1088,8 +1088,8 @@ yy162:
                                goto nextLine;
                        }
 yy164:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == '>') goto yy191;
+       yych = *++YYCURSOR;
+       if (yych == '>') goto yy191;
        {
                                        cur = cursor;
                                        tok += 2; /* skip ":=" */
@@ -2340,8 +2340,8 @@ yy350:
        if (yych <= '9') goto yy353;
        goto yy345;
 yy351:
-       ++YYCURSOR;
-       if (yybm[0+(yych = *YYCURSOR)] & 4) {
+       yych = *++YYCURSOR;
+       if (yybm[0+yych] & 4) {
                goto yy344;
        }
 yy352:

diff --git a/re2c/test/strip_001.s.c b/re2c/test/strip_001.s.c
index 628d3a499c8900609ad95c91e8ba3d7ae4df7129..d77257a662fe2e00575e56f8fa3d98aa3a19d6af 100644 (file)
--- a/re2c/test/strip_001.s.c
+++ b/re2c/test/strip_001.s.c
@@ -153,8 +153,8 @@ yy20:
                        { fwrite(s.tok, 1, s.cur - s.tok, stdout); continue; }
 #line 155 "strip_001.s.c"
 yy22:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) == '\n') goto yy20;
+                       yych = *++YYCURSOR;
+                       if (yych == '\n') goto yy20;
                        goto yy19;
                }
 #line 126 "strip_001.s.re"

diff --git a/re2c/test/strip_002.s.c b/re2c/test/strip_002.s.c
index e15f2becdb2c2a3718793a2e5f29289b935420a7..0b076cba869d8ba5ee3f0680cb2d6efc1cd0128e 100644 (file)
--- a/re2c/test/strip_002.s.c
+++ b/re2c/test/strip_002.s.c
@@ -172,8 +172,8 @@ yy22:
                        { echo(&s); continue; }
 #line 174 "strip_002.s.c"
 yy24:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) == '\n') goto yy22;
+                       yych = *++YYCURSOR;
+                       if (yych == '\n') goto yy22;
                        goto yy21;
                }
 #line 135 "strip_002.s.re"
@@ -199,8 +199,8 @@ yy29:
                        { echo(&s); continue; }
 #line 201 "strip_002.s.c"
 yy31:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) == '\n') goto yy29;
+                       yych = *++YYCURSOR;
+                       if (yych == '\n') goto yy29;
                        goto yy28;
                }
 #line 141 "strip_002.s.re"

diff --git a/re2c/test/strip_003.b--skeleton.c b/re2c/test/strip_003.b--skeleton.c
index e88618af145c7e6272b542a72ce0786355d19faf..d3d11202411ba43e4ccca335d2a3122bf1b1c727 100644 (file)
--- a/re2c/test/strip_003.b--skeleton.c
+++ b/re2c/test/strip_003.b--skeleton.c
@@ -710,7 +710,8 @@ yy41:
         continue;
 yy43:
         YYSKIP ();
-        if ((yych = YYPEEK ()) == '\n') goto yy41;
+        yych = YYPEEK ();
+        if (yych == '\n') goto yy41;
         goto yy40;
 
     }

diff --git a/re2c/test/strip_003.b.c b/re2c/test/strip_003.b.c
index 096f0975570315dad5fda6ce1153572c986f125b..b8820258f9d2084728b99e5e220ce1698b9c1b1f 100644 (file)
--- a/re2c/test/strip_003.b.c
+++ b/re2c/test/strip_003.b.c
@@ -260,8 +260,8 @@ yy41:
                        { echo(&s); continue; }
 #line 262 "strip_003.b.c"
 yy43:
-                       ++YYCURSOR;
-                       if ((yych = *YYCURSOR) == '\n') goto yy41;
+                       yych = *++YYCURSOR;
+                       if (yych == '\n') goto yy41;
                        goto yy40;
                }
 #line 158 "strip_003.b.re"

diff --git a/re2c/test/tags/bug121_var_multiple.i--tags--input(custom).c b/re2c/test/tags/bug121_var_multiple.i--tags--input(custom).c
index e7f6169943deac9c23b65fe6a0367571e45a7f84..b58d556ea4401262bc1972fceea2ab90a6e473d9 100644 (file)
--- a/re2c/test/tags/bug121_var_multiple.i--tags--input(custom).c
+++ b/re2c/test/tags/bug121_var_multiple.i--tags--input(custom).c
@@ -16,8 +16,9 @@ yy2:
        { d }
 yy4:
        YYSKIP ();
+       yych = YYPEEK ();
        YYBACKUPTAG (yyt2);
-       switch ((yych = YYPEEK ())) {
+       switch (yych) {
        case 'b':       goto yy6;
        default:        goto yy5;
        }

diff --git a/re2c/test/tags/bug121_var_multiple.i--tags.c b/re2c/test/tags/bug121_var_multiple.i--tags.c
index 96f2a840772aabe077504d4efb74ea1d54eef124..7ead767a54b0d53296e98e61c09b9d2beb50c86b 100644 (file)
--- a/re2c/test/tags/bug121_var_multiple.i--tags.c
+++ b/re2c/test/tags/bug121_var_multiple.i--tags.c
@@ -15,9 +15,9 @@ yy2:
        ++YYCURSOR;
        { d }
 yy4:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        yyt2 = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy6;
        default:        goto yy5;
        }

diff --git a/re2c/test/tags/bug121_var_single.i--input(custom).c b/re2c/test/tags/bug121_var_single.i--input(custom).c
index fbcb38aac3f7d0fcfb9b4badb7a7fd22b2db540f..ed46150c339970dfd160460c738ac85d4bdb2806 100644 (file)
--- a/re2c/test/tags/bug121_var_single.i--input(custom).c
+++ b/re2c/test/tags/bug121_var_single.i--input(custom).c
@@ -18,8 +18,9 @@ yy2:
        { d }
 yy4:
        YYSKIP ();
+       yych = YYPEEK ();
        YYBACKUPCTX ();
-       switch ((yych = YYPEEK ())) {
+       switch (yych) {
        case 'b':       goto yy6;
        default:        goto yy5;
        }
@@ -28,7 +29,8 @@ yy5:
        { 1 }
 yy6:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case 'b':       goto yy8;
        case 'c':
                YYBACKUPCTX ();

diff --git a/re2c/test/tags/bug121_var_single.i.c b/re2c/test/tags/bug121_var_single.i.c
index a9619bf91a44c25f0d6ee9fc293bc2155843a87c..14277be64fc9af66422eba4db90e16aa5c35df98 100644 (file)
--- a/re2c/test/tags/bug121_var_single.i.c
+++ b/re2c/test/tags/bug121_var_single.i.c
@@ -17,9 +17,9 @@ yy2:
        ++YYCURSOR;
        { d }
 yy4:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy6;
        default:        goto yy5;
        }
@@ -27,8 +27,8 @@ yy5:
        YYCURSOR = YYCTXMARKER;
        { 1 }
 yy6:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':       goto yy8;
        case 'c':
                YYCTXMARKER = YYCURSOR;

diff --git a/re2c/test/tags/cond_star0.ci--input(custom).c b/re2c/test/tags/cond_star0.ci--input(custom).c
index 2dcfaa24810af45a1dd2dedd120470d0c097de19..415165ae98e326efc27a9a9d232bd36263cded21 100644 (file)
--- a/re2c/test/tags/cond_star0.ci--input(custom).c
+++ b/re2c/test/tags/cond_star0.ci--input(custom).c
@@ -18,8 +18,9 @@ yy3:
        {}
 yy5:
        YYSKIP ();
+       yych = YYPEEK ();
        YYBACKUPCTX ();
-       switch ((yych = YYPEEK ())) {
+       switch (yych) {
        case 'b':       goto yy7;
        default:        goto yy6;
        }
@@ -28,7 +29,8 @@ yy6:
        {}
 yy7:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case 'b':       goto yy9;
        case 'c':
                YYBACKUPCTX ();

diff --git a/re2c/test/tags/cond_star0.ci.c b/re2c/test/tags/cond_star0.ci.c
index cda1204fd12394424fcdbf5c29ed4caad4e44f46..e3103b2163c0dac1623b26041eb3ce32b515cddb 100644 (file)
--- a/re2c/test/tags/cond_star0.ci.c
+++ b/re2c/test/tags/cond_star0.ci.c
@@ -17,9 +17,9 @@ yy3:
        ++YYCURSOR;
        {}
 yy5:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy7;
        default:        goto yy6;
        }
@@ -27,8 +27,8 @@ yy6:
        YYCURSOR = YYCTXMARKER;
        {}
 yy7:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':       goto yy9;
        case 'c':
                YYCTXMARKER = YYCURSOR;

diff --git a/re2c/test/tags/cond_star1.ci--input(custom).c b/re2c/test/tags/cond_star1.ci--input(custom).c
index 48f7c9fa74d26f89b5c96e2818587142247b1462..64f714d0be8f8eb1ebc6705bae34144c3fb4a8ed 100644 (file)
--- a/re2c/test/tags/cond_star1.ci--input(custom).c
+++ b/re2c/test/tags/cond_star1.ci--input(custom).c
@@ -19,8 +19,9 @@ yy3:
        {}
 yy5:
        YYSKIP ();
+       yych = YYPEEK ();
        YYBACKUPCTX ();
-       switch ((yych = YYPEEK ())) {
+       switch (yych) {
        case 'b':       goto yy7;
        default:        goto yy6;
        }
@@ -29,7 +30,8 @@ yy6:
        {}
 yy7:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case 'b':       goto yy9;
        case 'c':
                YYBACKUPCTX ();
@@ -70,8 +72,9 @@ yy15:
        {}
 yy17:
        YYSKIP ();
+       yych = YYPEEK ();
        YYBACKUPCTX ();
-       switch ((yych = YYPEEK ())) {
+       switch (yych) {
        case 'b':       goto yy19;
        default:        goto yy23;
        }

diff --git a/re2c/test/tags/cond_star1.ci.c b/re2c/test/tags/cond_star1.ci.c
index 78af9b95ea3f35dd1b08f1c9e9a8857a293cd48a..f29a33c99dfcd9be669779a10a7f2c3bd2ada3c1 100644 (file)
--- a/re2c/test/tags/cond_star1.ci.c
+++ b/re2c/test/tags/cond_star1.ci.c
@@ -18,9 +18,9 @@ yy3:
        ++YYCURSOR;
        {}
 yy5:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy7;
        default:        goto yy6;
        }
@@ -28,8 +28,8 @@ yy6:
        YYCURSOR = YYCTXMARKER;
        {}
 yy7:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':       goto yy9;
        case 'c':
                YYCTXMARKER = YYCURSOR;
@@ -69,9 +69,9 @@ yy15:
        ++YYCURSOR;
        {}
 yy17:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy19;
        default:        goto yy23;
        }

diff --git a/re2c/test/tags/cond_star2.ci.c b/re2c/test/tags/cond_star2.ci.c
index b23f43174b4deaa6629c2f0ec91cf491ffa78960..300902ece2692b3dc9984427a6cbda6e056deef1 100644 (file)
--- a/re2c/test/tags/cond_star2.ci.c
+++ b/re2c/test/tags/cond_star2.ci.c
@@ -18,9 +18,9 @@ yy3:
        ++YYCURSOR;
        {}
 yy5:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       switch (yych) {
        case 'b':       goto yy7;
        default:        goto yy6;
        }
@@ -28,8 +28,8 @@ yy6:
        YYCURSOR = YYCTXMARKER;
        {}
 yy7:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':       goto yy9;
        case 'c':
                YYCTXMARKER = YYCURSOR;
@@ -66,9 +66,8 @@ yyc_c2:
        default:        goto yy15;
        }
 yy15:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       yych = *YYCURSOR;
        goto yy20;
 yy16:
        YYCURSOR = YYCTXMARKER;

diff --git a/re2c/test/tags/conf1.i--tags--input(custom).c b/re2c/test/tags/conf1.i--tags--input(custom).c
index 7a6d9509425cf0632d357aed041671328ef6d65d..9cb08e4eb503c76511847ab35403f798042ae5c3 100644 (file)
--- a/re2c/test/tags/conf1.i--tags--input(custom).c
+++ b/re2c/test/tags/conf1.i--tags--input(custom).c
@@ -231,7 +231,8 @@ yy15:
        }
 yy16:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/tags/conf1.i--tags.c b/re2c/test/tags/conf1.i--tags.c
index 18f9af174af2ae665b64e8f71a014f9a13ad27b4..fb9f63f2c3bf83920c5b7f492c21d4011f5569c9 100644 (file)
--- a/re2c/test/tags/conf1.i--tags.c
+++ b/re2c/test/tags/conf1.i--tags.c
@@ -211,8 +211,8 @@ yy15:
        default:        goto yy6;
        }
 yy16:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/tags/conf2.i--tags--input(custom).c b/re2c/test/tags/conf2.i--tags--input(custom).c
index a0e383f89fd977eda749d8ba133e4e1f3540b71e..eda9c01363fcf0a1508b0004caea763f71c0f0d8 100644 (file)
--- a/re2c/test/tags/conf2.i--tags--input(custom).c
+++ b/re2c/test/tags/conf2.i--tags--input(custom).c
@@ -343,7 +343,8 @@ yy22:
        }
 yy23:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case '\n':      goto yy20;
        default:        goto yy8;
        }

diff --git a/re2c/test/tags/conf2.i--tags.c b/re2c/test/tags/conf2.i--tags.c
index c00484e6ab173ad0a368577b42eddbe62a5a7bc2..4448e78a8346ef7a36301d0f182c1a82fc22de2b 100644 (file)
--- a/re2c/test/tags/conf2.i--tags.c
+++ b/re2c/test/tags/conf2.i--tags.c
@@ -319,8 +319,8 @@ yy22:
        default:        goto yy8;
        }
 yy23:
-       ++in.cur;
-       switch ((yych = *in.cur)) {
+       yych = *++in.cur;
+       switch (yych) {
        case '\n':      goto yy20;
        default:        goto yy8;
        }

diff --git a/re2c/test/tags/conf3.i--tags--input(custom).c b/re2c/test/tags/conf3.i--tags--input(custom).c
index 1eb369149e088b251c7070c05f04bb46d8f62099..fe8ebf6f7fc1ac90cf60dc90066c0fbbc08f7ed4 100644 (file)
--- a/re2c/test/tags/conf3.i--tags--input(custom).c
+++ b/re2c/test/tags/conf3.i--tags--input(custom).c
@@ -240,7 +240,8 @@ yy15:
        }
 yy16:
        YYSKIP ();
-       switch ((yych = YYPEEK ())) {
+       yych = YYPEEK ();
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/tags/conf3.i--tags.c b/re2c/test/tags/conf3.i--tags.c
index 16449399e7065893f8f6d20f055fb12b69fe2540..d705048559f2718675e242fa6b6ace34ef4bfa9a 100644 (file)
--- a/re2c/test/tags/conf3.i--tags.c
+++ b/re2c/test/tags/conf3.i--tags.c
@@ -220,8 +220,8 @@ yy15:
        default:        goto yy6;
        }
 yy16:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case '0':
        case '1':
        case '2':

diff --git a/re2c/test/tags/dedup1.i--input(custom).c b/re2c/test/tags/dedup1.i--input(custom).c
index 4fe89a68dc784effa982d735dc68c92942061761..605cfad4dc24d72e0b1731c14dd5b4d05135a79c 100644 (file)
--- a/re2c/test/tags/dedup1.i--input(custom).c
+++ b/re2c/test/tags/dedup1.i--input(custom).c
@@ -10,8 +10,8 @@
        }
 yy2:
        YYSKIP ();
-       YYBACKUPCTX ();
        yych = YYPEEK ();
+       YYBACKUPCTX ();
        goto yy7;
 yy3:
        YYRESTORECTX ();

diff --git a/re2c/test/tags/dedup1.i.c b/re2c/test/tags/dedup1.i.c
index dfd7012b389a65557ca4440b65d809ed3809911d..d3c17037a85283a9e31b727d1519aa5fe0f3aa48 100644 (file)
--- a/re2c/test/tags/dedup1.i.c
+++ b/re2c/test/tags/dedup1.i.c
@@ -9,9 +9,8 @@
        default:        goto yy2;
        }
 yy2:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       yych = *YYCURSOR;
        goto yy7;
 yy3:
        YYCURSOR = YYCTXMARKER;

diff --git a/re2c/test/tags/dedup3.i--input(custom).c b/re2c/test/tags/dedup3.i--input(custom).c
index adf529d106da2c4e016b11552fe18a4d461bdf2f..063deddb3edfee11bcfb66e471641a20df6781a6 100644 (file)
--- a/re2c/test/tags/dedup3.i--input(custom).c
+++ b/re2c/test/tags/dedup3.i--input(custom).c
@@ -10,8 +10,8 @@
        }
 yy2:
        YYSKIP ();
-       YYBACKUPCTX ();
        yych = YYPEEK ();
+       YYBACKUPCTX ();
        goto yy7;
 yy3:
        YYRESTORECTX ();

diff --git a/re2c/test/tags/dedup3.i.c b/re2c/test/tags/dedup3.i.c
index ec4d094ea072f297363dff2e7289f55300ce3e4c..be5739b5f2a728aa29e13ed643c52729c6da98bc 100644 (file)
--- a/re2c/test/tags/dedup3.i.c
+++ b/re2c/test/tags/dedup3.i.c
@@ -9,9 +9,8 @@
        default:        goto yy2;
        }
 yy2:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        YYCTXMARKER = YYCURSOR;
-       yych = *YYCURSOR;
        goto yy7;
 yy3:
        YYCURSOR = YYCTXMARKER;

diff --git a/re2c/test/tags/dedup4.i--tags.c b/re2c/test/tags/dedup4.i--tags.c
index d02028c2973ffe904172797094e9026f0d7c3e5e..e649c9ed10575e56c46f6ecfe2a113caa16351ca 100644 (file)
--- a/re2c/test/tags/dedup4.i--tags.c
+++ b/re2c/test/tags/dedup4.i--tags.c
@@ -12,8 +12,8 @@ yy2:
        ++YYCURSOR;
        {}
 yy4:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':
                yyt2 = YYCURSOR;
                goto yy6;
@@ -83,8 +83,8 @@ yy15:
        ++YYCURSOR;
        {}
 yy17:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'b':
                yyt1 = yyt2 = YYCURSOR;
                goto yy19;

diff --git a/re2c/test/tags/fallback4.i--tags.c b/re2c/test/tags/fallback4.i--tags.c
index 79ce879bb7912d6b792e647f04aeec71fdc411a2..04a7acbd2acfadf72b8aa752dc8d6be563afc483 100644 (file)
--- a/re2c/test/tags/fallback4.i--tags.c
+++ b/re2c/test/tags/fallback4.i--tags.c
@@ -30,8 +30,8 @@ yy4:
        default:        goto yy3;
        }
 yy5:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'c':       goto yy7;
        default:        goto yy6;
        }

diff --git a/re2c/test/tags/fix5.i--tags.c b/re2c/test/tags/fix5.i--tags.c
index 7bc4980d31329b1e8add0e1f314d39503f566490..5a65aec1662f2c59f8bc2be172f8a9f34be57441 100644 (file)
--- a/re2c/test/tags/fix5.i--tags.c
+++ b/re2c/test/tags/fix5.i--tags.c
@@ -73,9 +73,8 @@ yy10:
        default:        goto yy8;
        }
 yy12:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        yyt1 = YYCURSOR;
-       yych = *YYCURSOR;
        goto yy15;
 yy13:
        p4 = yyt1;

diff --git a/re2c/test/tags/fix5_trail.i--tags--input(custom).c b/re2c/test/tags/fix5_trail.i--tags--input(custom).c
index a833d01c7f67655570752d3854e288e2c1d6b2a9..bbed469df901f95c1c466ba0250a6af5e07d3996 100644 (file)
--- a/re2c/test/tags/fix5_trail.i--tags--input(custom).c
+++ b/re2c/test/tags/fix5_trail.i--tags--input(custom).c
@@ -93,8 +93,8 @@ yy10:
        }
 yy12:
        YYSKIP ();
-       YYBACKUPTAG (yyt1);
        yych = YYPEEK ();
+       YYBACKUPTAG (yyt1);
        goto yy15;
 yy13:
        YYRESTORETAG (yyt1);

diff --git a/re2c/test/tags/fix5_trail.i--tags.c b/re2c/test/tags/fix5_trail.i--tags.c
index 9e3cc7a75d617be8827bc5ff2b693dcd74250bfd..3a8651e0c0b6a8b62fda4b031d96f84f7b053a93 100644 (file)
--- a/re2c/test/tags/fix5_trail.i--tags.c
+++ b/re2c/test/tags/fix5_trail.i--tags.c
@@ -73,9 +73,8 @@ yy10:
        default:        goto yy8;
        }
 yy12:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        yyt1 = YYCURSOR;
-       yych = *YYCURSOR;
        goto yy15;
 yy13:
        YYCURSOR = yyt1;

diff --git a/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c b/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c
index d9fb4a06b58805aa8afeac71ef7cffafc61d3aa3..70a47d53f8f1a530ed09ed89f8fc7119eed8f6a2 100644 (file)
--- a/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c
+++ b/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c
@@ -30,8 +30,8 @@ yy4:
        YYCURSOR = YYMARKER;
        goto yy2;
 yy5:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy10;
        default:        goto yy6;
        }

diff --git a/re2c/test/tags/mapping1.i--tags.c b/re2c/test/tags/mapping1.i--tags.c
index d9fb4a06b58805aa8afeac71ef7cffafc61d3aa3..70a47d53f8f1a530ed09ed89f8fc7119eed8f6a2 100644 (file)
--- a/re2c/test/tags/mapping1.i--tags.c
+++ b/re2c/test/tags/mapping1.i--tags.c
@@ -30,8 +30,8 @@ yy4:
        YYCURSOR = YYMARKER;
        goto yy2;
 yy5:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy10;
        default:        goto yy6;
        }

diff --git a/re2c/test/tags/mapping2.i--tags--non-bijective-mapping.c b/re2c/test/tags/mapping2.i--tags--non-bijective-mapping.c
index a898ee401ffcbb8b83d063b64204343d029d3a84..3ace5d57d009ea91fe7c2dee8b1d2e09e00cfe80 100644 (file)
--- a/re2c/test/tags/mapping2.i--tags--non-bijective-mapping.c
+++ b/re2c/test/tags/mapping2.i--tags--non-bijective-mapping.c
@@ -23,9 +23,8 @@ yy4:
        p = yyt1;
        {}
 yy5:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        yyt1 = NULL;
-       yych = *YYCURSOR;
        goto yy3;
 }
 

diff --git a/re2c/test/tags/mapping2.i--tags.c b/re2c/test/tags/mapping2.i--tags.c
index a898ee401ffcbb8b83d063b64204343d029d3a84..3ace5d57d009ea91fe7c2dee8b1d2e09e00cfe80 100644 (file)
--- a/re2c/test/tags/mapping2.i--tags.c
+++ b/re2c/test/tags/mapping2.i--tags.c
@@ -23,9 +23,8 @@ yy4:
        p = yyt1;
        {}
 yy5:
-       ++YYCURSOR;
+       yych = *++YYCURSOR;
        yyt1 = NULL;
-       yych = *YYCURSOR;
        goto yy3;
 }
 

diff --git a/re2c/test/tags/twopass.i--tags.c b/re2c/test/tags/twopass.i--tags.c
index d5e0e1fd80202dc8b058f7b46070b1b687526a05..04f5ce8b1ce2b523edb0a5da0cc8da6ad6f400ad 100644 (file)
--- a/re2c/test/tags/twopass.i--tags.c
+++ b/re2c/test/tags/twopass.i--tags.c
@@ -192,8 +192,8 @@ yy20:
        default:        goto yy5;
        }
 yy21:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy5;
        case 'b':
                yyt3 = NULL;

diff --git a/re2c/test/unicode_blocks.8--encoding-policy(ignore).c b/re2c/test/unicode_blocks.8--encoding-policy(ignore).c
index 43f63c4fe286caf8477167aa3015c6caded5bb11..128edcd37f25174cb49924484dadca8caa8c2880 100644 (file)
--- a/re2c/test/unicode_blocks.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_blocks.8--encoding-policy(ignore).c
@@ -12734,8 +12734,8 @@ yy977:
        default:        goto yy972;
        }
 yy978:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_blocks.8--encoding-policy(substitute).c b/re2c/test/unicode_blocks.8--encoding-policy(substitute).c
index 7ed885ca644c2296a6817f19e925f1e9fde736e0..c4854e804e69b64749ba82f9766b4c8e2ce542a5 100644 (file)
--- a/re2c/test/unicode_blocks.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_blocks.8--encoding-policy(substitute).c
@@ -12484,8 +12484,8 @@ yy977:
        default:        goto yy972;
        }
 yy978:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c b/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c
index 8c101b6e4eb07bd94f6c908701acf95d623576c2..338cbd46e4083c2a20bc22b3fbc72fa859267e9f 100644 (file)
--- a/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c
+++ b/re2c/test/unicode_blocks.8--skeleton--encoding-policy(ignore).c
@@ -26267,7 +26267,8 @@ yy977:
         }
 yy978:
         YYSKIP ();
-        switch ((yych = YYPEEK ())) {
+        yych = YYPEEK ();
+        switch (yych) {
         case 0x80:
         case 0x81:
         case 0x82:

diff --git a/re2c/test/unicode_group_C.8--encoding-policy(ignore).c b/re2c/test/unicode_group_C.8--encoding-policy(ignore).c
index ea8c32cc16d6782fa6a2b47b7961324d6963f240..b4246130715175358d81a1725305e6513b3ea7cc 100644 (file)
--- a/re2c/test/unicode_group_C.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_C.8--encoding-policy(ignore).c
@@ -5525,8 +5525,8 @@ yy224:
        default:        goto yy34;
        }
 yy225:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_C.8--encoding-policy(substitute).c b/re2c/test/unicode_group_C.8--encoding-policy(substitute).c
index f04b0cfdd8143ae413f9e1a8178ce0954e427f30..14e94f4e229705f0d0a6b4aadbd1fd8237e28fb5 100644 (file)
--- a/re2c/test/unicode_group_C.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_C.8--encoding-policy(substitute).c
@@ -5494,8 +5494,8 @@ yy224:
        default:        goto yy34;
        }
 yy225:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_C.x--encoding-policy(ignore).c b/re2c/test/unicode_group_C.x--encoding-policy(ignore).c
index 2d0d0af06b9ce0ce448169b549c52b8ebdda52e9..700193738143e50b68d2440f905520df6a20807a 100644 (file)
--- a/re2c/test/unicode_group_C.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_C.x--encoding-policy(ignore).c
@@ -1806,8 +1806,8 @@ yy24:
        if (yych <= 0xDFFF) goto yy2;
        goto yy3;
 yy25:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDCFF) goto yy2;
        if (yych <= 0xDDEF) goto yy3;
        if (yych <= 0xDFFF) goto yy2;

diff --git a/re2c/test/unicode_group_C.x--encoding-policy(substitute).c b/re2c/test/unicode_group_C.x--encoding-policy(substitute).c
index 1fe2a092ea8cfc982c3cf3e341bde6a88735d89f..5d196d44410bfd4b586a68f2ceefb2079808a67f 100644 (file)
--- a/re2c/test/unicode_group_C.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_C.x--encoding-policy(substitute).c
@@ -1809,8 +1809,8 @@ yy24:
        if (yych <= 0xDFFF) goto yy2;
        goto yy5;
 yy25:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy5;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy5;
        if (yych <= 0xDCFF) goto yy2;
        if (yych <= 0xDDEF) goto yy5;
        if (yych <= 0xDFFF) goto yy2;

diff --git a/re2c/test/unicode_group_Cc.8--encoding-policy(fail).c b/re2c/test/unicode_group_Cc.8--encoding-policy(fail).c
index 7d736f1e50b91aa0129f2d08bb7dbc147b146a3a..0877f4c903ffb77194c21f74c510c142d219a843 100644 (file)
--- a/re2c/test/unicode_group_Cc.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Cc.8--encoding-policy(fail).c
@@ -62,8 +62,8 @@ yy5:
        { return YYCURSOR == limit; }
 #line 64 "unicode_group_Cc.8--encoding-policy(fail).c"
 yy6:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cc.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Cc.8--encoding-policy(ignore).c
index 7d1cd52588c24432078de8957845ea118327e238..0aa8c58a5d94d68ac4d1de4802ff0dcf3d7a98cc 100644 (file)
--- a/re2c/test/unicode_group_Cc.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Cc.8--encoding-policy(ignore).c
@@ -62,8 +62,8 @@ yy5:
        { return YYCURSOR == limit; }
 #line 64 "unicode_group_Cc.8--encoding-policy(ignore).c"
 yy6:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cc.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Cc.8--encoding-policy(substitute).c
index 6fd61319d9c0817d1b2d345caec7a6180c7acb6e..b3154e8f2784e3fe51f085a7ec9a09ee87d94524 100644 (file)
--- a/re2c/test/unicode_group_Cc.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Cc.8--encoding-policy(substitute).c
@@ -62,8 +62,8 @@ yy5:
        { return YYCURSOR == limit; }
 #line 64 "unicode_group_Cc.8--encoding-policy(substitute).c"
 yy6:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cf.8--encoding-policy(fail).c b/re2c/test/unicode_group_Cf.8--encoding-policy(fail).c
index d697166055e16c8fdc4f96ed1e15b9e8f2b14640..140050d3e7442fe8f42b4a7099f75da5606374a5 100644 (file)
--- a/re2c/test/unicode_group_Cf.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Cf.8--encoding-policy(fail).c
@@ -228,8 +228,8 @@ yy26:
        default:        goto yy16;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cf.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Cf.8--encoding-policy(ignore).c
index 31988d7a8aa1f2f27f929edb8f6e39c281f25e37..e0964c42cc0fd45abcbb0918ec3ecc9f85f2f491 100644 (file)
--- a/re2c/test/unicode_group_Cf.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Cf.8--encoding-policy(ignore).c
@@ -228,8 +228,8 @@ yy26:
        default:        goto yy16;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cf.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Cf.8--encoding-policy(substitute).c
index c19602cc2ebf5bc6b6b51d780fd546af4c43e26f..f496b423fd9c1987c220a0de16757c6f104d9f1a 100644 (file)
--- a/re2c/test/unicode_group_Cf.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Cf.8--encoding-policy(substitute).c
@@ -228,8 +228,8 @@ yy26:
        default:        goto yy16;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Cf.x--encoding-policy(fail).c b/re2c/test/unicode_group_Cf.x--encoding-policy(fail).c
index 7d14f925bcb3a919bee25ae775e81e74e1bccde2..403dd02755311171c920a581ecab01207db475ba 100644 (file)
--- a/re2c/test/unicode_group_Cf.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Cf.x--encoding-policy(fail).c
@@ -72,8 +72,8 @@ yy7:
        if (yych <= 0xDD7A) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 0xDC01) goto yy4;
+       yych = *++YYCURSOR;
+       if (yych == 0xDC01) goto yy4;
        if (yych <= 0xDC1F) goto yy3;
        if (yych <= 0xDC7F) goto yy4;
        goto yy3;

diff --git a/re2c/test/unicode_group_Cf.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Cf.x--encoding-policy(ignore).c
index 9c67559735bc085fc1f24330b677c520e6593b6a..e0a7c7e6bde8b056f3c60450e5e0d31398104ba8 100644 (file)
--- a/re2c/test/unicode_group_Cf.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Cf.x--encoding-policy(ignore).c
@@ -72,8 +72,8 @@ yy7:
        if (yych <= 0xDD7A) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 0xDC01) goto yy4;
+       yych = *++YYCURSOR;
+       if (yych == 0xDC01) goto yy4;
        if (yych <= 0xDC1F) goto yy3;
        if (yych <= 0xDC7F) goto yy4;
        goto yy3;

diff --git a/re2c/test/unicode_group_Cf.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Cf.x--encoding-policy(substitute).c
index cf1bc26d35c09c7ddf6d66a51ce6acaf0e55520f..08dcdbd1131ceaf715cfca973b99ad10fb0a3c74 100644 (file)
--- a/re2c/test/unicode_group_Cf.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Cf.x--encoding-policy(substitute).c
@@ -72,8 +72,8 @@ yy7:
        if (yych <= 0xDD7A) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) == 0xDC01) goto yy4;
+       yych = *++YYCURSOR;
+       if (yych == 0xDC01) goto yy4;
        if (yych <= 0xDC1F) goto yy3;
        if (yych <= 0xDC7F) goto yy4;
        goto yy3;

diff --git a/re2c/test/unicode_group_Cn.8--encoding-policy(fail).c b/re2c/test/unicode_group_Cn.8--encoding-policy(fail).c
index e2098345b7a9952c4ae3a815cc5d529da122df2f..ed74eb6e59a7acfbcca6bf62a50774f27237c1cd 100644 (file)
--- a/re2c/test/unicode_group_Cn.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Cn.8--encoding-policy(fail).c
@@ -5262,8 +5262,8 @@ yy220:
        default:        goto yy31;
        }
 yy221:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Cn.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Cn.8--encoding-policy(ignore).c
index 685117168371c215ceb7eaeb6fbc28999bd45602..5301d83201d6f9bf649358607c6e5252cae5c054 100644 (file)
--- a/re2c/test/unicode_group_Cn.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Cn.8--encoding-policy(ignore).c
@@ -5262,8 +5262,8 @@ yy220:
        default:        goto yy31;
        }
 yy221:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Cn.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Cn.8--encoding-policy(substitute).c
index eeb2afbe189b01ae4131dbdd6015310e0b193cfc..3525a3d0a7263bfba1b179f6620b1dcef85ff7dd 100644 (file)
--- a/re2c/test/unicode_group_Cn.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Cn.8--encoding-policy(substitute).c
@@ -5262,8 +5262,8 @@ yy220:
        default:        goto yy31;
        }
 yy221:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Cn.x--encoding-policy(fail).c b/re2c/test/unicode_group_Cn.x--encoding-policy(fail).c
index 5236ff33305f732e0ba77bb6b827d97df5b03b23..aa307c17712956d9ec1c3226f388b4c7c6e17410 100644 (file)
--- a/re2c/test/unicode_group_Cn.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Cn.x--encoding-policy(fail).c
@@ -1803,8 +1803,8 @@ yy25:
                }
        }
 yy26:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFFD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFFD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Cn.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Cn.x--encoding-policy(ignore).c
index 50c776d345de557c4750cb743a3aa02d7d791c9b..bed2209f98e04c769bbf043f1347639430da54f6 100644 (file)
--- a/re2c/test/unicode_group_Cn.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Cn.x--encoding-policy(ignore).c
@@ -1803,8 +1803,8 @@ yy25:
                }
        }
 yy26:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFFD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFFD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Cn.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Cn.x--encoding-policy(substitute).c
index 8aee9d55ff3f63da6d10e43c2682b890074cbcb5..4590e9cbb0fc0046b0081f253e4e7dafd2efc3cf 100644 (file)
--- a/re2c/test/unicode_group_Cn.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Cn.x--encoding-policy(substitute).c
@@ -1803,8 +1803,8 @@ yy25:
                }
        }
 yy26:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFFD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFFD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Co.8--encoding-policy(fail).c b/re2c/test/unicode_group_Co.8--encoding-policy(fail).c
index 5fb0a2fa572e063d8f920642a9f52b8286bc674a..373eba3fa638b1754746ee5af24036b485f33f14 100644 (file)
--- a/re2c/test/unicode_group_Co.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Co.8--encoding-policy(fail).c
@@ -394,8 +394,8 @@ yy12:
        { goto Co; }
 #line 396 "unicode_group_Co.8--encoding-policy(fail).c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Co.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Co.8--encoding-policy(ignore).c
index 688955bcead0ff1d96b35feee22a7ce8d8623f4b..a528c041d6ade5169afa916f81e944a1459dffc9 100644 (file)
--- a/re2c/test/unicode_group_Co.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Co.8--encoding-policy(ignore).c
@@ -394,8 +394,8 @@ yy12:
        { goto Co; }
 #line 396 "unicode_group_Co.8--encoding-policy(ignore).c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Co.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Co.8--encoding-policy(substitute).c
index 6a01e9faacf88e55aaee6f440bb7d14820a01f61..62765a8b914e3377868cd306cfd43c280899478a 100644 (file)
--- a/re2c/test/unicode_group_Co.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Co.8--encoding-policy(substitute).c
@@ -394,8 +394,8 @@ yy12:
        { goto Co; }
 #line 396 "unicode_group_Co.8--encoding-policy(substitute).c"
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L.8--encoding-policy(fail).c b/re2c/test/unicode_group_L.8--encoding-policy(fail).c
index 137b25cdd697e7e7a9a020208b0bf97d3b656726..1545b28b94c29b72a3341a35e7393f0217327afd 100644 (file)
--- a/re2c/test/unicode_group_L.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_L.8--encoding-policy(fail).c
@@ -8666,8 +8666,8 @@ yy208:
        default:        goto yy37;
        }
 yy209:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L.8--encoding-policy(ignore).c b/re2c/test/unicode_group_L.8--encoding-policy(ignore).c
index 7d4cbf6ea33f2bab3bda85fbf7f6ebd2087edac1..b4356b4ff231e448cc00950291996cf22c51d2df 100644 (file)
--- a/re2c/test/unicode_group_L.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_L.8--encoding-policy(ignore).c
@@ -8666,8 +8666,8 @@ yy208:
        default:        goto yy37;
        }
 yy209:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L.8--encoding-policy(substitute).c b/re2c/test/unicode_group_L.8--encoding-policy(substitute).c
index 6e73c5fa86f4fd0d6124e23b7878a1c9a4e28770..4980cfb24e5200bd4a2ff7ca46ac68a0c4a0eef5 100644 (file)
--- a/re2c/test/unicode_group_L.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_L.8--encoding-policy(substitute).c
@@ -8666,8 +8666,8 @@ yy208:
        default:        goto yy37;
        }
 yy209:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L.x--encoding-policy(fail).c b/re2c/test/unicode_group_L.x--encoding-policy(fail).c
index a6ee80783ff85a0d92c13f0342c709b39e1e00a0..9fddae99eee5c2660f9b26b24181afcf20d26ec5 100644 (file)
--- a/re2c/test/unicode_group_L.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_L.x--encoding-policy(fail).c
@@ -1488,8 +1488,8 @@ yy19:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy20:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_L.x--encoding-policy(ignore).c b/re2c/test/unicode_group_L.x--encoding-policy(ignore).c
index 78cc4cfd2b43c2c233bb15273c7ea5f9fb86b8bd..28da5e8695043c6991d9d7342f958d854efd0a46 100644 (file)
--- a/re2c/test/unicode_group_L.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_L.x--encoding-policy(ignore).c
@@ -1488,8 +1488,8 @@ yy19:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy20:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_L.x--encoding-policy(substitute).c b/re2c/test/unicode_group_L.x--encoding-policy(substitute).c
index 7e0587c2ee906c6df3f279e17bb22e615826d419..3190295844bc6cfc3e88b1139bee98746c33aefb 100644 (file)
--- a/re2c/test/unicode_group_L.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_L.x--encoding-policy(substitute).c
@@ -1488,8 +1488,8 @@ yy19:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy20:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_L_.8--encoding-policy(fail).c b/re2c/test/unicode_group_L_.8--encoding-policy(fail).c
index 943303752033a23cda32964be7278e6e2a97c869..cd5b5e3967276af3099232ad201ce2a0a2df8247 100644 (file)
--- a/re2c/test/unicode_group_L_.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_L_.8--encoding-policy(fail).c
@@ -2581,8 +2581,8 @@ yy63:
        default:        goto yy25;
        }
 yy64:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L_.8--encoding-policy(ignore).c b/re2c/test/unicode_group_L_.8--encoding-policy(ignore).c
index cd5703164dffcbd106775fa4c057faaa89813102..de82962e43805de82e25d1bbcbee9140a5d41abf 100644 (file)
--- a/re2c/test/unicode_group_L_.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_L_.8--encoding-policy(ignore).c
@@ -2581,8 +2581,8 @@ yy63:
        default:        goto yy25;
        }
 yy64:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L_.8--encoding-policy(substitute).c b/re2c/test/unicode_group_L_.8--encoding-policy(substitute).c
index bc01b1bdf057df3b123324745ae1c8137241d429..f55e44adc0c4ae73b3e9dd9acec32d3c25472176 100644 (file)
--- a/re2c/test/unicode_group_L_.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_L_.8--encoding-policy(substitute).c
@@ -2581,8 +2581,8 @@ yy63:
        default:        goto yy25;
        }
 yy64:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_L_.x--encoding-policy(fail).c b/re2c/test/unicode_group_L_.x--encoding-policy(fail).c
index f9add8049acb3dabb04ef6dd72fdb3d556f415ad..74bce5a379e4bcb6c10f6be22c898707a07a5acc 100644 (file)
--- a/re2c/test/unicode_group_L_.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_L_.x--encoding-policy(fail).c
@@ -311,8 +311,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3E) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3E) {
                if (yych <= 0xDCBA) {
                        if (yych <= 0xDCA1) {
                                if (yych <= 0xDC55) {

diff --git a/re2c/test/unicode_group_L_.x--encoding-policy(ignore).c b/re2c/test/unicode_group_L_.x--encoding-policy(ignore).c
index 779d5de7391ca50385bad6db36cea310e252f18c..ce4c24050156a207a51f5a51fe6515d30ba77461 100644 (file)
--- a/re2c/test/unicode_group_L_.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_L_.x--encoding-policy(ignore).c
@@ -311,8 +311,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3E) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3E) {
                if (yych <= 0xDCBA) {
                        if (yych <= 0xDCA1) {
                                if (yych <= 0xDC55) {

diff --git a/re2c/test/unicode_group_L_.x--encoding-policy(substitute).c b/re2c/test/unicode_group_L_.x--encoding-policy(substitute).c
index b76eacc6d831f8221e6343f690d47a04a9346e12..7bfea87132ff954d5439953a67d6c35634e57853 100644 (file)
--- a/re2c/test/unicode_group_L_.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_L_.x--encoding-policy(substitute).c
@@ -311,8 +311,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3E) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3E) {
                if (yych <= 0xDCBA) {
                        if (yych <= 0xDCA1) {
                                if (yych <= 0xDC55) {

diff --git a/re2c/test/unicode_group_Ll.8--encoding-policy(fail).c b/re2c/test/unicode_group_Ll.8--encoding-policy(fail).c
index 533516cfad6eff336c73374e5ace18d605f68b70..8c4d749a09acd051d865996c7f09ff25bc55ee5f 100644 (file)
--- a/re2c/test/unicode_group_Ll.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Ll.8--encoding-policy(fail).c
@@ -2090,8 +2090,8 @@ yy73:
        default:        goto yy31;
        }
 yy74:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Ll.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Ll.8--encoding-policy(ignore).c
index 6291668f436cba4f100b135b4556163cdb540ca6..be516c40b85d8daa5c7ec3a8d120625f1ff68b5a 100644 (file)
--- a/re2c/test/unicode_group_Ll.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Ll.8--encoding-policy(ignore).c
@@ -2090,8 +2090,8 @@ yy73:
        default:        goto yy31;
        }
 yy74:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Ll.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Ll.8--encoding-policy(substitute).c
index d9d03a3abf06f0977413efbf0d2089162864ab8c..0e09c91beb7864e5617bb960c3699433877b9110 100644 (file)
--- a/re2c/test/unicode_group_Ll.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Ll.8--encoding-policy(substitute).c
@@ -2090,8 +2090,8 @@ yy73:
        default:        goto yy31;
        }
 yy74:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Ll.x--encoding-policy(fail).c b/re2c/test/unicode_group_Ll.x--encoding-policy(fail).c
index fc3bac4ddb027e53e284b6a908fb8f7da13e5e46..7da961ea5914c3f6e67ef0fd284b3fee9a35949e 100644 (file)
--- a/re2c/test/unicode_group_Ll.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Ll.x--encoding-policy(fail).c
@@ -1757,8 +1757,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE07) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE07) {
                if (yych <= 0xDCC3) {
                        if (yych <= 0xDC81) {
                                if (yych <= 0xDC4D) {

diff --git a/re2c/test/unicode_group_Ll.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Ll.x--encoding-policy(ignore).c
index 70839a7d5c46b4aebdd2ed7f0779954da06ec6ad..3659fda89c1c077d67ed6005d9c7ef96fd0e2417 100644 (file)
--- a/re2c/test/unicode_group_Ll.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Ll.x--encoding-policy(ignore).c
@@ -1757,8 +1757,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE07) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE07) {
                if (yych <= 0xDCC3) {
                        if (yych <= 0xDC81) {
                                if (yych <= 0xDC4D) {

diff --git a/re2c/test/unicode_group_Ll.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Ll.x--encoding-policy(substitute).c
index e528501a70b5423bd818f4ea7381c25892d3dc61..20c85088d7a46c88f97f8456ce780d4b132052c1 100644 (file)
--- a/re2c/test/unicode_group_Ll.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Ll.x--encoding-policy(substitute).c
@@ -1757,8 +1757,8 @@ yy6:
        if (yych <= 0xDC4F) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE07) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE07) {
                if (yych <= 0xDCC3) {
                        if (yych <= 0xDC81) {
                                if (yych <= 0xDC4D) {

diff --git a/re2c/test/unicode_group_Lm.8--encoding-policy(fail).c b/re2c/test/unicode_group_Lm.8--encoding-policy(fail).c
index ebfd0ca016b4909486310904c78d4dfb67e67afe..14d0acc5bfaa40522cd51db684cd403401ae65fc 100644 (file)
--- a/re2c/test/unicode_group_Lm.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lm.8--encoding-policy(fail).c
@@ -469,8 +469,8 @@ yy45:
        default:        goto yy20;
        }
 yy46:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9E:
        case 0x9F:      goto yy17;
        default:        goto yy20;

diff --git a/re2c/test/unicode_group_Lm.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Lm.8--encoding-policy(ignore).c
index fa5723647086aae7f37da9085806bbc359da80dd..2340519cb53d5646bd538b6e62fb5fd0961a9f69 100644 (file)
--- a/re2c/test/unicode_group_Lm.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lm.8--encoding-policy(ignore).c
@@ -469,8 +469,8 @@ yy45:
        default:        goto yy20;
        }
 yy46:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9E:
        case 0x9F:      goto yy17;
        default:        goto yy20;

diff --git a/re2c/test/unicode_group_Lm.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Lm.8--encoding-policy(substitute).c
index 950d7471ed89724b5cd6f63f5eaba21524cf18ad..541ea711be82e2f9702e3a82ab4e26fb4a40dc91 100644 (file)
--- a/re2c/test/unicode_group_Lm.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lm.8--encoding-policy(substitute).c
@@ -469,8 +469,8 @@ yy45:
        default:        goto yy20;
        }
 yy46:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9E:
        case 0x9F:      goto yy17;
        default:        goto yy20;

diff --git a/re2c/test/unicode_group_Lo.8--encoding-policy(fail).c b/re2c/test/unicode_group_Lo.8--encoding-policy(fail).c
index 98ab0384c397df5203b5adc0a45deffe1bc11ac3..4761edd0f25a0d60920a558ba16045fb0ae9025c 100644 (file)
--- a/re2c/test/unicode_group_Lo.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lo.8--encoding-policy(fail).c
@@ -6558,8 +6558,8 @@ yy170:
        default:        goto yy30;
        }
 yy171:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Lo.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Lo.8--encoding-policy(ignore).c
index d8abdaf8136bb9e38bb6fd76ea6699281334099a..569905fc90e68103c896f61227a5aa44c06c23cf 100644 (file)
--- a/re2c/test/unicode_group_Lo.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lo.8--encoding-policy(ignore).c
@@ -6558,8 +6558,8 @@ yy170:
        default:        goto yy30;
        }
 yy171:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Lo.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Lo.8--encoding-policy(substitute).c
index ac641bc09ebc62dcf11b52a5d374d99335da6b22..9fb5ba7fe543d1cd0c4d6b0afb6a501039bc820e 100644 (file)
--- a/re2c/test/unicode_group_Lo.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lo.8--encoding-policy(substitute).c
@@ -6558,8 +6558,8 @@ yy170:
        default:        goto yy30;
        }
 yy171:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Lo.x--encoding-policy(fail).c b/re2c/test/unicode_group_Lo.x--encoding-policy(fail).c
index d600b1a21024e3249eed9054557fec74059de4fa..aa05e72f54b1f9c8ea7fba45454b2a77f465c327 100644 (file)
--- a/re2c/test/unicode_group_Lo.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lo.x--encoding-policy(fail).c
@@ -1132,8 +1132,8 @@ yy18:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy19:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Lo.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Lo.x--encoding-policy(ignore).c
index 0c9a9f5437405ffd98fbbed1c7f56138fec9ef9a..b99e1e285c3fea79ece5461d3c2d48c59a4aa693 100644 (file)
--- a/re2c/test/unicode_group_Lo.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lo.x--encoding-policy(ignore).c
@@ -1132,8 +1132,8 @@ yy18:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy19:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Lo.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Lo.x--encoding-policy(substitute).c
index 7c28cd9848c005003b8736f24c32b9dce75b1a33..130e45cad0e08d5d0d672bff26916185e7512b5c 100644 (file)
--- a/re2c/test/unicode_group_Lo.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lo.x--encoding-policy(substitute).c
@@ -1132,8 +1132,8 @@ yy18:
        if (yych <= 0xDC1D) goto yy4;
        goto yy3;
 yy19:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDE1D) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Lt.8--encoding-policy(fail).c b/re2c/test/unicode_group_Lt.8--encoding-policy(fail).c
index df74665af17f022a87a127a395a90092d650fbe2..db664d865e2b52c4250e5a94e2429e7866c5533a 100644 (file)
--- a/re2c/test/unicode_group_Lt.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lt.8--encoding-policy(fail).c
@@ -79,8 +79,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8C:
        case 0xBC:      goto yy6;
        default:        goto yy9;

diff --git a/re2c/test/unicode_group_Lt.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Lt.8--encoding-policy(ignore).c
index 32a5002b15bf42a930d31488a241c7f21b592eab..92d0061809d6e9f95ade577997e830b4eb6afabf 100644 (file)
--- a/re2c/test/unicode_group_Lt.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lt.8--encoding-policy(ignore).c
@@ -79,8 +79,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8C:
        case 0xBC:      goto yy6;
        default:        goto yy9;

diff --git a/re2c/test/unicode_group_Lt.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Lt.8--encoding-policy(substitute).c
index a25a0ef65f0dd63d50d2b755c6d6dfdb33f3ad1e..891638e3ba31bb696a8a4904217993f00e53a63d 100644 (file)
--- a/re2c/test/unicode_group_Lt.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lt.8--encoding-policy(substitute).c
@@ -79,8 +79,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8C:
        case 0xBC:      goto yy6;
        default:        goto yy9;

diff --git a/re2c/test/unicode_group_Lu.8--encoding-policy(fail).c b/re2c/test/unicode_group_Lu.8--encoding-policy(fail).c
index 9f045addc9efc8f8023d38f76b09bf8a0d257545..7d83c6d3ec6ef2c0270ee6d7a717dbb540be0088 100644 (file)
--- a/re2c/test/unicode_group_Lu.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lu.8--encoding-policy(fail).c
@@ -1728,8 +1728,8 @@ yy65:
        default:        goto yy28;
        }
 yy66:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8A:      goto yy4;
        default:        goto yy28;
        }

diff --git a/re2c/test/unicode_group_Lu.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Lu.8--encoding-policy(ignore).c
index 4235a598a7d8dc3d0db43ef7121096fdd97d270b..52f6b0585d6cb4fc94fe97693ace6ffc3ac8c905 100644 (file)
--- a/re2c/test/unicode_group_Lu.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lu.8--encoding-policy(ignore).c
@@ -1728,8 +1728,8 @@ yy65:
        default:        goto yy28;
        }
 yy66:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8A:      goto yy4;
        default:        goto yy28;
        }

diff --git a/re2c/test/unicode_group_Lu.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Lu.8--encoding-policy(substitute).c
index 267710a7c6167c297dfd8e7d920312bc6b119b94..43660278c3a67e5494fa33fbac21805cdc267d58 100644 (file)
--- a/re2c/test/unicode_group_Lu.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lu.8--encoding-policy(substitute).c
@@ -1728,8 +1728,8 @@ yy65:
        default:        goto yy28;
        }
 yy66:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8A:      goto yy4;
        default:        goto yy28;
        }

diff --git a/re2c/test/unicode_group_Lu.x--encoding-policy(fail).c b/re2c/test/unicode_group_Lu.x--encoding-policy(fail).c
index e9c516870c756a6bc5d9c34d2aec148769c22331..7aab3b6630ad61d245a4515db98f8518dd2d8af1 100644 (file)
--- a/re2c/test/unicode_group_Lu.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Lu.x--encoding-policy(fail).c
@@ -1699,8 +1699,8 @@ yy6:
        if (yych <= 0xDC27) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3A) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3A) {
                if (yych <= 0xDCA8) {
                        if (yych <= 0xDC9B) {
                                if (yych <= 0xDC33) {

diff --git a/re2c/test/unicode_group_Lu.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Lu.x--encoding-policy(ignore).c
index 0ec41295456b0acff3374e77cc60d26d0f0697ad..b973e891b572ef5df9e0e70b323c063c326e7ddf 100644 (file)
--- a/re2c/test/unicode_group_Lu.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Lu.x--encoding-policy(ignore).c
@@ -1699,8 +1699,8 @@ yy6:
        if (yych <= 0xDC27) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3A) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3A) {
                if (yych <= 0xDCA8) {
                        if (yych <= 0xDC9B) {
                                if (yych <= 0xDC33) {

diff --git a/re2c/test/unicode_group_Lu.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Lu.x--encoding-policy(substitute).c
index 41e58aefd3a1ed85deb6f6024b38c3335b662a3d..1cd2e9f9c264d771d901db34b5c6976b6504e3c2 100644 (file)
--- a/re2c/test/unicode_group_Lu.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Lu.x--encoding-policy(substitute).c
@@ -1699,8 +1699,8 @@ yy6:
        if (yych <= 0xDC27) goto yy4;
        goto yy3;
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD3A) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD3A) {
                if (yych <= 0xDCA8) {
                        if (yych <= 0xDC9B) {
                                if (yych <= 0xDC33) {

diff --git a/re2c/test/unicode_group_M.8--encoding-policy(fail).c b/re2c/test/unicode_group_M.8--encoding-policy(fail).c
index 5bc0b4c2bd62548b109122ee3bc82bee6a71efb2..e8ad75cdc5398170ec8ffc672fc9e2c7db64edf7 100644 (file)
--- a/re2c/test/unicode_group_M.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_M.8--encoding-policy(fail).c
@@ -1944,8 +1944,8 @@ yy109:
        default:        goto yy27;
        }
 yy110:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_M.8--encoding-policy(ignore).c b/re2c/test/unicode_group_M.8--encoding-policy(ignore).c
index 45dd8872314fbc35ff695ca4cfc57f44585b6564..712259f35f03bb5fb8b7be1adb87d5356424dc94 100644 (file)
--- a/re2c/test/unicode_group_M.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_M.8--encoding-policy(ignore).c
@@ -1944,8 +1944,8 @@ yy109:
        default:        goto yy27;
        }
 yy110:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_M.8--encoding-policy(substitute).c b/re2c/test/unicode_group_M.8--encoding-policy(substitute).c
index 28876ac0aadb1845376de50069c55e2a0a613ce7..af5a7501b24eb9515f57a192e2f718c4445ad60b 100644 (file)
--- a/re2c/test/unicode_group_M.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_M.8--encoding-policy(substitute).c
@@ -1944,8 +1944,8 @@ yy109:
        default:        goto yy27;
        }
 yy110:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_M.x--encoding-policy(fail).c b/re2c/test/unicode_group_M.x--encoding-policy(fail).c
index 2d930a78b5ed470266bf483a6562daff946ad684..46abb49a16c0501a1ccec094e4296b701947d39a 100644 (file)
--- a/re2c/test/unicode_group_M.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_M.x--encoding-policy(fail).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_M.x--encoding-policy(ignore).c b/re2c/test/unicode_group_M.x--encoding-policy(ignore).c
index 6a4679872114459edea0e90daed74a753e65e12a..773916f37314db11171046a8f1c333aec4617405 100644 (file)
--- a/re2c/test/unicode_group_M.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_M.x--encoding-policy(ignore).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_M.x--encoding-policy(substitute).c b/re2c/test/unicode_group_M.x--encoding-policy(substitute).c
index 880f1d5f3ab83ecec5993959bd75dba50e376e93..1b3ebb74d02837bacb71d74a5018234f125f7962 100644 (file)
--- a/re2c/test/unicode_group_M.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_M.x--encoding-policy(substitute).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Mc.8--encoding-policy(fail).c b/re2c/test/unicode_group_Mc.8--encoding-policy(fail).c
index dd39bb952712675f7414ec54270f0738453d935f..90455c057b624dcfb6ed4aa9d932389e07154d93 100644 (file)
--- a/re2c/test/unicode_group_Mc.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Mc.8--encoding-policy(fail).c
@@ -592,8 +592,8 @@ yy55:
        default:        goto yy9;
        }
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA5:
        case 0xA6:
        case 0xAD:

diff --git a/re2c/test/unicode_group_Mc.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Mc.8--encoding-policy(ignore).c
index 74b6c8dd2da78d2d5764179d30e00d7c8c97a8de..16a32b335db3712ea620e40573573829a8449b73 100644 (file)
--- a/re2c/test/unicode_group_Mc.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Mc.8--encoding-policy(ignore).c
@@ -592,8 +592,8 @@ yy55:
        default:        goto yy9;
        }
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA5:
        case 0xA6:
        case 0xAD:

diff --git a/re2c/test/unicode_group_Mc.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Mc.8--encoding-policy(substitute).c
index dfb0111cd901f75701c7a5ea486eae5434a166e8..9ed4aa903ab3803ee8456a39bb178ee67d26a7f4 100644 (file)
--- a/re2c/test/unicode_group_Mc.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Mc.8--encoding-policy(substitute).c
@@ -592,8 +592,8 @@ yy55:
        default:        goto yy9;
        }
 yy56:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA5:
        case 0xA6:
        case 0xAD:

diff --git a/re2c/test/unicode_group_Mc.x--encoding-policy(fail).c b/re2c/test/unicode_group_Mc.x--encoding-policy(fail).c
index 40d35ef065dced615228760ed4186237480306a3..35ae73e9b240b21492b56e8e3ed29b060cdcb5ce 100644 (file)
--- a/re2c/test/unicode_group_Mc.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Mc.x--encoding-policy(fail).c
@@ -365,8 +365,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD64) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD64) goto yy3;
        if (yych <= 0xDD66) goto yy4;
        if (yych <= 0xDD6C) goto yy3;
        if (yych <= 0xDD72) goto yy4;

diff --git a/re2c/test/unicode_group_Mc.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Mc.x--encoding-policy(ignore).c
index 65a8c24ebbba884c33d5d65081a679f4eb8b45ed..5766c976996945f4a7bb0804631b0532d0ea8e19 100644 (file)
--- a/re2c/test/unicode_group_Mc.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Mc.x--encoding-policy(ignore).c
@@ -365,8 +365,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD64) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD64) goto yy3;
        if (yych <= 0xDD66) goto yy4;
        if (yych <= 0xDD6C) goto yy3;
        if (yych <= 0xDD72) goto yy4;

diff --git a/re2c/test/unicode_group_Mc.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Mc.x--encoding-policy(substitute).c
index 95e709e0c85ff742d1e6d7c2d56dfe144b97092b..122802f8c3d46a410749a216c99799efd880ccc6 100644 (file)
--- a/re2c/test/unicode_group_Mc.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Mc.x--encoding-policy(substitute).c
@@ -365,8 +365,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDD64) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDD64) goto yy3;
        if (yych <= 0xDD66) goto yy4;
        if (yych <= 0xDD6C) goto yy3;
        if (yych <= 0xDD72) goto yy4;

diff --git a/re2c/test/unicode_group_Me.8--encoding-policy(fail).c b/re2c/test/unicode_group_Me.8--encoding-policy(fail).c
index 3e447fb72e09f5a50838d435cc7683094427115c..7c23edf15b5bc0fa31d21812b95102dd7d3fdbc6 100644 (file)
--- a/re2c/test/unicode_group_Me.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Me.8--encoding-policy(fail).c
@@ -65,8 +65,8 @@ yy10:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:      goto yy7;

diff --git a/re2c/test/unicode_group_Me.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Me.8--encoding-policy(ignore).c
index 6c982d9147fe8090740d224bf3b034cca9e4ce36..d14da4aaa63e4d54131d1cebd8afe4ef1c84e257 100644 (file)
--- a/re2c/test/unicode_group_Me.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Me.8--encoding-policy(ignore).c
@@ -65,8 +65,8 @@ yy10:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:      goto yy7;

diff --git a/re2c/test/unicode_group_Me.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Me.8--encoding-policy(substitute).c
index 1c5701d6087a0f04dd979642942313b153a5a188..23e6da2e76378c008ff78175533374b52bde27bf 100644 (file)
--- a/re2c/test/unicode_group_Me.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Me.8--encoding-policy(substitute).c
@@ -65,8 +65,8 @@ yy10:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:      goto yy7;

diff --git a/re2c/test/unicode_group_Mn.8--encoding-policy(fail).c b/re2c/test/unicode_group_Mn.8--encoding-policy(fail).c
index 128587d00fde532c1c2dd325991f4b701358f48f..981eb697eba97c86bb8a4669e49c42705ad2dac4 100644 (file)
--- a/re2c/test/unicode_group_Mn.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Mn.8--encoding-policy(fail).c
@@ -1643,8 +1643,8 @@ yy105:
        default:        goto yy27;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Mn.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Mn.8--encoding-policy(ignore).c
index ffe826a778411cb1bc982a591cef4780ea9caba0..6cef5c6ce1acfc326c598243573422145f180b15 100644 (file)
--- a/re2c/test/unicode_group_Mn.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Mn.8--encoding-policy(ignore).c
@@ -1643,8 +1643,8 @@ yy105:
        default:        goto yy27;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Mn.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Mn.8--encoding-policy(substitute).c
index f72349f1a8babc90915646c6d2b79a2b0b720f38..a2fcdb1fbee207563141674525ebbc89653399a5 100644 (file)
--- a/re2c/test/unicode_group_Mn.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Mn.8--encoding-policy(substitute).c
@@ -1643,8 +1643,8 @@ yy105:
        default:        goto yy27;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Mn.x--encoding-policy(fail).c b/re2c/test/unicode_group_Mn.x--encoding-policy(fail).c
index 91ed679eee1fa3df488507a7242caee181d34b27..1b9087ea8aa848485a00a25fdf723ee23ce9a839 100644 (file)
--- a/re2c/test/unicode_group_Mn.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Mn.x--encoding-policy(fail).c
@@ -699,8 +699,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Mn.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Mn.x--encoding-policy(ignore).c
index 41fcb5b2322a1ecde00c805ce5f10abdc61eba07..d69d171d2a7efc60a5736917d779625467a29afd 100644 (file)
--- a/re2c/test/unicode_group_Mn.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Mn.x--encoding-policy(ignore).c
@@ -699,8 +699,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Mn.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Mn.x--encoding-policy(substitute).c
index 85ce25bbf80070568c4671ff6db21843fdd4db65..e082533bc7a52a06643645708f1bb1ca9b339694 100644 (file)
--- a/re2c/test/unicode_group_Mn.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Mn.x--encoding-policy(substitute).c
@@ -699,8 +699,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDDEF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_N.8--encoding-policy(fail).c b/re2c/test/unicode_group_N.8--encoding-policy(fail).c
index 946b7c0d605cede6066d59b708e120d12e5223c1..1fc1f4db400f15b78ae895a6dd09c37079ad6b18 100644 (file)
--- a/re2c/test/unicode_group_N.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_N.8--encoding-policy(fail).c
@@ -1327,8 +1327,8 @@ yy69:
        default:        goto yy18;
        }
 yy70:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_N.8--encoding-policy(ignore).c b/re2c/test/unicode_group_N.8--encoding-policy(ignore).c
index cf1b94cdb0c47ac420b07757a6c0f5e7fe337926..426c8a006ddb4d8d1845cb1b69d774c1a443584f 100644 (file)
--- a/re2c/test/unicode_group_N.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_N.8--encoding-policy(ignore).c
@@ -1327,8 +1327,8 @@ yy69:
        default:        goto yy18;
        }
 yy70:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_N.8--encoding-policy(substitute).c b/re2c/test/unicode_group_N.8--encoding-policy(substitute).c
index ffa04a893454bd7a92c5765d5e3cbcd2e30688f4..a6f6497db3e34a9d181d99ea18e32ba7e578d5c5 100644 (file)
--- a/re2c/test/unicode_group_N.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_N.8--encoding-policy(substitute).c
@@ -1327,8 +1327,8 @@ yy69:
        default:        goto yy18;
        }
 yy70:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_N.x--encoding-policy(fail).c b/re2c/test/unicode_group_N.x--encoding-policy(fail).c
index 730864e742b744e09cc22d411489e4ca4242308e..59031699636b4cf5f306e7837b1a53de0a339c84 100644 (file)
--- a/re2c/test/unicode_group_N.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_N.x--encoding-policy(fail).c
@@ -328,8 +328,8 @@ yy13:
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 yy14:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_N.x--encoding-policy(ignore).c b/re2c/test/unicode_group_N.x--encoding-policy(ignore).c
index ffb9afd3164eb4921c4792ca4868bb4befb5c5b5..6b4d9fcef06139ca77a7bd5c4cafa4e3e39c7b91 100644 (file)
--- a/re2c/test/unicode_group_N.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_N.x--encoding-policy(ignore).c
@@ -328,8 +328,8 @@ yy13:
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 yy14:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_N.x--encoding-policy(substitute).c b/re2c/test/unicode_group_N.x--encoding-policy(substitute).c
index 9054f3b2be50ae4894fb80d2da63e75db1c9b890..08e15fda83522bef2572f808264000188aff05a9 100644 (file)
--- a/re2c/test/unicode_group_N.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_N.x--encoding-policy(substitute).c
@@ -328,8 +328,8 @@ yy13:
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 yy14:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nd.8--encoding-policy(fail).c b/re2c/test/unicode_group_Nd.8--encoding-policy(fail).c
index 77d8c5ac00a6e6ceb62730ddf123b2573cae2f9d..3e9c8a56c440a68a3f75f21dbb9c323aca7754b2 100644 (file)
--- a/re2c/test/unicode_group_Nd.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Nd.8--encoding-policy(fail).c
@@ -284,8 +284,8 @@ yy24:
        default:        goto yy15;
        }
 yy25:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8E:
        case 0x8F:
        case 0x90:

diff --git a/re2c/test/unicode_group_Nd.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Nd.8--encoding-policy(ignore).c
index b91a60d3611307167b7933db59589034e92e9fa0..036f91a45d2a84bf1f9af7564a7e29bb54bde59e 100644 (file)
--- a/re2c/test/unicode_group_Nd.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Nd.8--encoding-policy(ignore).c
@@ -284,8 +284,8 @@ yy24:
        default:        goto yy15;
        }
 yy25:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8E:
        case 0x8F:
        case 0x90:

diff --git a/re2c/test/unicode_group_Nd.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Nd.8--encoding-policy(substitute).c
index fd3f1023bc83f440bed7a6312a44d0488d2032c9..de046c7d257ea561b2ae5bc8da741fb50d6a79d4 100644 (file)
--- a/re2c/test/unicode_group_Nd.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Nd.8--encoding-policy(substitute).c
@@ -284,8 +284,8 @@ yy24:
        default:        goto yy15;
        }
 yy25:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8E:
        case 0x8F:
        case 0x90:

diff --git a/re2c/test/unicode_group_Nd.x--encoding-policy(fail).c b/re2c/test/unicode_group_Nd.x--encoding-policy(fail).c
index e9ac55487e55665b640190eccb2651aed4f39a89..98bfd2a9e646c52379a74b32de385de96f02e11d 100644 (file)
--- a/re2c/test/unicode_group_Nd.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Nd.x--encoding-policy(fail).c
@@ -167,8 +167,8 @@ yy7:
        if (yych <= 0xDC6F) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFCD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFCD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nd.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Nd.x--encoding-policy(ignore).c
index 30013793b23876fded8c97c5849dbccc6e687a65..cfda1b72fb72ed613ac6e92c4dea1ab768f7fb90 100644 (file)
--- a/re2c/test/unicode_group_Nd.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Nd.x--encoding-policy(ignore).c
@@ -167,8 +167,8 @@ yy7:
        if (yych <= 0xDC6F) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFCD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFCD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nd.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Nd.x--encoding-policy(substitute).c
index 161823d43eee10f9726ef5d486ad9748e1774fe5..17e835598f2ee55a60ee6bcf66fc07f4e3e8609c 100644 (file)
--- a/re2c/test/unicode_group_Nd.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Nd.x--encoding-policy(substitute).c
@@ -167,8 +167,8 @@ yy7:
        if (yych <= 0xDC6F) goto yy4;
        goto yy3;
 yy8:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDFCD) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDFCD) goto yy3;
        if (yych <= 0xDFFF) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nl.8--encoding-policy(fail).c b/re2c/test/unicode_group_Nl.8--encoding-policy(fail).c
index 120a04eb3e0c37c5096d4e8171e97a32b309a7b0..d6faba1bc534b6013d77b81fe4c2c80f3c42558e 100644 (file)
--- a/re2c/test/unicode_group_Nl.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Nl.8--encoding-policy(fail).c
@@ -317,8 +317,8 @@ yy22:
        default:        goto yy10;
        }
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Nl.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Nl.8--encoding-policy(ignore).c
index 08e31a5bb528d584f512ad9748f2aeb631472424..d00c1e8ed5696495116b178a1fc13a4f8953513f 100644 (file)
--- a/re2c/test/unicode_group_Nl.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Nl.8--encoding-policy(ignore).c
@@ -317,8 +317,8 @@ yy22:
        default:        goto yy10;
        }
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Nl.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Nl.8--encoding-policy(substitute).c
index f151e5ce0d82eba7d9a661fdcbc3e38f2be262e1..2fe9e8d0ec7a54c8ab1a4a08e103846df37d0325 100644 (file)
--- a/re2c/test/unicode_group_Nl.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Nl.8--encoding-policy(substitute).c
@@ -317,8 +317,8 @@ yy22:
        default:        goto yy10;
        }
 yy23:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_Nl.x--encoding-policy(fail).c b/re2c/test/unicode_group_Nl.x--encoding-policy(fail).c
index 0576fda63257e9d1bb0ee88e366feae13b849483..e6ede98ea1a57eafee957d2e8ed7873261b27f45 100644 (file)
--- a/re2c/test/unicode_group_Nl.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Nl.x--encoding-policy(fail).c
@@ -70,8 +70,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDC62) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nl.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Nl.x--encoding-policy(ignore).c
index 2f9db7cee3dc74a02600b73233e2d00ee8f345c6..fbd9708158e942fb516196d464a40108a45943bc 100644 (file)
--- a/re2c/test/unicode_group_Nl.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Nl.x--encoding-policy(ignore).c
@@ -70,8 +70,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDC62) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Nl.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Nl.x--encoding-policy(substitute).c
index 1569c3f17c1867a4a496eafa708382b46b94a8e4..743b392d6eb74bbc30562f86b25cfbff63c6723c 100644 (file)
--- a/re2c/test/unicode_group_Nl.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Nl.x--encoding-policy(substitute).c
@@ -70,8 +70,8 @@ yy6:
                }
        }
 yy7:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDBFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDBFF) goto yy3;
        if (yych <= 0xDC62) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_No.8--encoding-policy(fail).c b/re2c/test/unicode_group_No.8--encoding-policy(fail).c
index 3779e3119b39925710ec4e404a2437be1dddf2dd..de11fcb234480f939356ee495de387f29f96b1c6 100644 (file)
--- a/re2c/test/unicode_group_No.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_No.8--encoding-policy(fail).c
@@ -742,8 +742,8 @@ yy51:
        default:        goto yy14;
        }
 yy52:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_No.8--encoding-policy(ignore).c b/re2c/test/unicode_group_No.8--encoding-policy(ignore).c
index 9e9499acd3842f6aa907a7dd9dfe56eb1cf7749e..86df05d5c86c67ee2ed38fcb90586ca57c51721c 100644 (file)
--- a/re2c/test/unicode_group_No.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_No.8--encoding-policy(ignore).c
@@ -742,8 +742,8 @@ yy51:
        default:        goto yy14;
        }
 yy52:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_No.8--encoding-policy(substitute).c b/re2c/test/unicode_group_No.8--encoding-policy(substitute).c
index 108d75d8124964da8c12d543ba8ed80adc95dff2..da44285872412660b123aa752c4ccc28833a808c 100644 (file)
--- a/re2c/test/unicode_group_No.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_No.8--encoding-policy(substitute).c
@@ -742,8 +742,8 @@ yy51:
        default:        goto yy14;
        }
 yy52:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_No.x--encoding-policy(fail).c b/re2c/test/unicode_group_No.x--encoding-policy(fail).c
index 859782424a0411d314f6345269cd8f6f6aa2af50..0660a6bc412ce595ae6808fdc72506263a6ccc3b 100644 (file)
--- a/re2c/test/unicode_group_No.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_No.x--encoding-policy(fail).c
@@ -174,8 +174,8 @@ yy10:
        if (yych <= 0xDF71) goto yy4;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_No.x--encoding-policy(ignore).c b/re2c/test/unicode_group_No.x--encoding-policy(ignore).c
index 21a388f8a1ffa0568de543948a6a9c0a6e96ce78..cb41b5eb1e3cebdb0b8e968eddeba1a7f274acdd 100644 (file)
--- a/re2c/test/unicode_group_No.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_No.x--encoding-policy(ignore).c
@@ -174,8 +174,8 @@ yy10:
        if (yych <= 0xDF71) goto yy4;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_No.x--encoding-policy(substitute).c b/re2c/test/unicode_group_No.x--encoding-policy(substitute).c
index 875599b66a757c611fa7a1ab642cdd87d626992f..1fc718b4d273ad7303da00936c5c3b03c7973c6e 100644 (file)
--- a/re2c/test/unicode_group_No.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_No.x--encoding-policy(substitute).c
@@ -174,8 +174,8 @@ yy10:
        if (yych <= 0xDF71) goto yy4;
        goto yy3;
 yy11:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDCFF) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDCFF) goto yy3;
        if (yych <= 0xDD0A) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_P.8--encoding-policy(fail).c b/re2c/test/unicode_group_P.8--encoding-policy(fail).c
index f3a6160d1989dacc2631c3266e01937ae65ffac6..b80ed543ee22f1d7714f7867da69057ce307eb02 100644 (file)
--- a/re2c/test/unicode_group_P.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_P.8--encoding-policy(fail).c
@@ -1114,8 +1114,8 @@ yy88:
        default:        goto yy25;
        }
 yy89:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_P.8--encoding-policy(ignore).c b/re2c/test/unicode_group_P.8--encoding-policy(ignore).c
index 15db5ff50a4e9001dedb2b1ca708cb5fbea022ae..62fc67847f787f70583a42f7b62db72774ee9e83 100644 (file)
--- a/re2c/test/unicode_group_P.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_P.8--encoding-policy(ignore).c
@@ -1114,8 +1114,8 @@ yy88:
        default:        goto yy25;
        }
 yy89:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_P.8--encoding-policy(substitute).c b/re2c/test/unicode_group_P.8--encoding-policy(substitute).c
index b2149832756ac6411da0eb2df3fb532bd3044f95..12f0a8aca0ce692aae171ad801d933169b7ee466 100644 (file)
--- a/re2c/test/unicode_group_P.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_P.8--encoding-policy(substitute).c
@@ -1114,8 +1114,8 @@ yy88:
        default:        goto yy25;
        }
 yy89:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_P.x--encoding-policy(fail).c b/re2c/test/unicode_group_P.x--encoding-policy(fail).c
index bc4b4346dd14112e7c411756d94f4d162395b81b..d01c028d51e1bfd92f2d10278abc1ec524bbc31f 100644 (file)
--- a/re2c/test/unicode_group_P.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_P.x--encoding-policy(fail).c
@@ -418,8 +418,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_P.x--encoding-policy(ignore).c b/re2c/test/unicode_group_P.x--encoding-policy(ignore).c
index 2c833a909b64d7b8ab919faca8e059c9845f8471..88f9f5488c1412a30d8114f77f1d20c6d7ea7d23 100644 (file)
--- a/re2c/test/unicode_group_P.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_P.x--encoding-policy(ignore).c
@@ -418,8 +418,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_P.x--encoding-policy(substitute).c b/re2c/test/unicode_group_P.x--encoding-policy(substitute).c
index b748ba9a76167feaca0ab44a09154620753768cd..e9e4a65f07db94efc601c7580bcf5f82e08f30fc 100644 (file)
--- a/re2c/test/unicode_group_P.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_P.x--encoding-policy(substitute).c
@@ -418,8 +418,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Pc.8--encoding-policy(fail).c b/re2c/test/unicode_group_Pc.8--encoding-policy(fail).c
index 286e0c3c25159a3e49248fb30c6485ff1e18ab6f..7f366597f6ce93ea40aa89c333f14596ff72a53b 100644 (file)
--- a/re2c/test/unicode_group_Pc.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Pc.8--encoding-policy(fail).c
@@ -69,8 +69,8 @@ yy11:
        default:        goto yy9;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:
        case 0x8E:
        case 0x8F:      goto yy4;

diff --git a/re2c/test/unicode_group_Pc.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Pc.8--encoding-policy(ignore).c
index cd28dcbf2f802b1a7ab4489ac279a68daff7ce62..e9b00990eb6e827714a478535b9d233b257cc01e 100644 (file)
--- a/re2c/test/unicode_group_Pc.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Pc.8--encoding-policy(ignore).c
@@ -69,8 +69,8 @@ yy11:
        default:        goto yy9;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:
        case 0x8E:
        case 0x8F:      goto yy4;

diff --git a/re2c/test/unicode_group_Pc.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Pc.8--encoding-policy(substitute).c
index 8e70dc76a2c0c809a9e0a449aeecb77b1401e8ea..233ec841db9b674a182d24405f66b6811b91dadc 100644 (file)
--- a/re2c/test/unicode_group_Pc.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Pc.8--encoding-policy(substitute).c
@@ -69,8 +69,8 @@ yy11:
        default:        goto yy9;
        }
 yy12:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:
        case 0x8E:
        case 0x8F:      goto yy4;

diff --git a/re2c/test/unicode_group_Pd.8--encoding-policy(fail).c b/re2c/test/unicode_group_Pd.8--encoding-policy(fail).c
index fb8d2a46d82b79b48fde259996babffc1b440bd1..8c5eecebd98be200d20ebfb37f3612b809b84a47 100644 (file)
--- a/re2c/test/unicode_group_Pd.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Pd.8--encoding-policy(fail).c
@@ -130,8 +130,8 @@ yy19:
        default:        goto yy12;
        }
 yy20:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:      goto yy4;
        default:        goto yy12;
        }

diff --git a/re2c/test/unicode_group_Pd.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Pd.8--encoding-policy(ignore).c
index 6d571316901b5380f82a26298ff700086ecf65fb..bbe189095dc48bfad148eab0723652fcc9905777 100644 (file)
--- a/re2c/test/unicode_group_Pd.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Pd.8--encoding-policy(ignore).c
@@ -130,8 +130,8 @@ yy19:
        default:        goto yy12;
        }
 yy20:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:      goto yy4;
        default:        goto yy12;
        }

diff --git a/re2c/test/unicode_group_Pd.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Pd.8--encoding-policy(substitute).c
index ec3d4e50142d7f4055e57a5d9f60027606d84c93..fa650bf852d1b83772228fa4d049b92b4a46ebc7 100644 (file)
--- a/re2c/test/unicode_group_Pd.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Pd.8--encoding-policy(substitute).c
@@ -130,8 +130,8 @@ yy19:
        default:        goto yy12;
        }
 yy20:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x8D:      goto yy4;
        default:        goto yy12;
        }

diff --git a/re2c/test/unicode_group_Pe.8--encoding-policy(fail).c b/re2c/test/unicode_group_Pe.8--encoding-policy(fail).c
index 789c76da0a3e030784a1a8c1cc6a7701dc060965..50a16dcbd9b8a57d08d17bbd8cd5df58a1c6e519 100644 (file)
--- a/re2c/test/unicode_group_Pe.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Pe.8--encoding-policy(fail).c
@@ -220,8 +220,8 @@ yy26:
        default:        goto yy12;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9D:
        case 0xA0:
        case 0xA3:      goto yy4;

diff --git a/re2c/test/unicode_group_Pe.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Pe.8--encoding-policy(ignore).c
index 3b01af53d413191ea4237813f8af60a4c3bfb6d1..92626cf3deb775d5b3187f3f71e34efec681584e 100644 (file)
--- a/re2c/test/unicode_group_Pe.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Pe.8--encoding-policy(ignore).c
@@ -220,8 +220,8 @@ yy26:
        default:        goto yy12;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9D:
        case 0xA0:
        case 0xA3:      goto yy4;

diff --git a/re2c/test/unicode_group_Pe.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Pe.8--encoding-policy(substitute).c
index 467607dcc8d103780fc8933dc7bf7887413cbf36..448d818bc5ba440ceca66a786091c9a136593534 100644 (file)
--- a/re2c/test/unicode_group_Pe.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Pe.8--encoding-policy(substitute).c
@@ -220,8 +220,8 @@ yy26:
        default:        goto yy12;
        }
 yy27:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9D:
        case 0xA0:
        case 0xA3:      goto yy4;

diff --git a/re2c/test/unicode_group_Pf.8--encoding-policy(fail).c b/re2c/test/unicode_group_Pf.8--encoding-policy(fail).c
index 775846a1f2f8cf4396e84fc95eb7c19e26c32798..148dfa4bc08a1cc445ef6b547db2724df8cbba02 100644 (file)
--- a/re2c/test/unicode_group_Pf.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Pf.8--encoding-policy(fail).c
@@ -54,8 +54,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:
        case 0x85:
        case 0x8A:

diff --git a/re2c/test/unicode_group_Pf.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Pf.8--encoding-policy(ignore).c
index 006f1bbef19ffb1891c66c936b0bcb3077d6fca5..95a7157c1bd37af8b6a754dae04630bb40bc34fd 100644 (file)
--- a/re2c/test/unicode_group_Pf.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Pf.8--encoding-policy(ignore).c
@@ -54,8 +54,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:
        case 0x85:
        case 0x8A:

diff --git a/re2c/test/unicode_group_Pf.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Pf.8--encoding-policy(substitute).c
index ebccd384528170ce6b9a288903af6a263051e6b7..58d9c170e0cc1e907caf5b9fb49a9ea207d265ad 100644 (file)
--- a/re2c/test/unicode_group_Pf.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Pf.8--encoding-policy(substitute).c
@@ -54,8 +54,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:
        case 0x85:
        case 0x8A:

diff --git a/re2c/test/unicode_group_Pi.8--encoding-policy(fail).c b/re2c/test/unicode_group_Pi.8--encoding-policy(fail).c
index ccea256f163c5965520005a3c425b6138167cd02..c103f5d66c5fde1579807c3fb08adf719fd2795d 100644 (file)
--- a/re2c/test/unicode_group_Pi.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Pi.8--encoding-policy(fail).c
@@ -56,8 +56,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x82:
        case 0x84:
        case 0x89:

diff --git a/re2c/test/unicode_group_Pi.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Pi.8--encoding-policy(ignore).c
index 60601a380125f0054b774cf1978bb45b26dd5881..9aee7c805b895e30cf11c267533d84282c104451 100644 (file)
--- a/re2c/test/unicode_group_Pi.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Pi.8--encoding-policy(ignore).c
@@ -56,8 +56,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x82:
        case 0x84:
        case 0x89:

diff --git a/re2c/test/unicode_group_Pi.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Pi.8--encoding-policy(substitute).c
index 3164f2f99867df3dec21be06b89c2170e69fdc31..b2fdd5f418fd3358000ece7eb4b5682f7edd00fc 100644 (file)
--- a/re2c/test/unicode_group_Pi.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Pi.8--encoding-policy(substitute).c
@@ -56,8 +56,8 @@ yy9:
        YYCURSOR = YYMARKER;
        goto yy3;
 yy10:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x82:
        case 0x84:
        case 0x89:

diff --git a/re2c/test/unicode_group_Po.8--encoding-policy(fail).c b/re2c/test/unicode_group_Po.8--encoding-policy(fail).c
index 46c8fab2f05d15ab9c50294ad7414e5fcf84ae4e..3a0a29e8df866a9498c188f6b3e942a0eaa71978 100644 (file)
--- a/re2c/test/unicode_group_Po.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Po.8--encoding-policy(fail).c
@@ -865,8 +865,8 @@ yy79:
        default:        goto yy25;
        }
 yy80:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Po.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Po.8--encoding-policy(ignore).c
index 114c863d4c669ed25dea43ca354ab05d9ca79424..786087f755475eb278bca041528e1a0cf3acdd7b 100644 (file)
--- a/re2c/test/unicode_group_Po.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Po.8--encoding-policy(ignore).c
@@ -865,8 +865,8 @@ yy79:
        default:        goto yy25;
        }
 yy80:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Po.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Po.8--encoding-policy(substitute).c
index d0c886689a5b8e69b8b508f7bef01918a6a075a0..700ab5450fa497c87ec21d4e5ff844d5f195deff 100644 (file)
--- a/re2c/test/unicode_group_Po.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Po.8--encoding-policy(substitute).c
@@ -865,8 +865,8 @@ yy79:
        default:        goto yy25;
        }
 yy80:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xB0:
        case 0xB1:
        case 0xB2:

diff --git a/re2c/test/unicode_group_Po.x--encoding-policy(fail).c b/re2c/test/unicode_group_Po.x--encoding-policy(fail).c
index 36d81481437fcaefa622ef9bc044cd6ac8c373fe..52f2f0da18fa92bf871b9ab008ada4ad3be6331f 100644 (file)
--- a/re2c/test/unicode_group_Po.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Po.x--encoding-policy(fail).c
@@ -407,8 +407,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Po.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Po.x--encoding-policy(ignore).c
index 2f3f9095fcd32582df8598112162bf3dd8b2b080..e31948b66a588be74f6b6ee16a209aad840db117 100644 (file)
--- a/re2c/test/unicode_group_Po.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Po.x--encoding-policy(ignore).c
@@ -407,8 +407,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Po.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Po.x--encoding-policy(substitute).c
index 851feae4fb1e2662d094cadd1699ad20bc4fe9b0..2656e1fb14b3ae39a0e04449ab9946c6a1913749 100644 (file)
--- a/re2c/test/unicode_group_Po.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Po.x--encoding-policy(substitute).c
@@ -407,8 +407,8 @@ yy8:
                goto yy3;
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDC6F) goto yy3;
+       yych = *++YYCURSOR;
+       if (yych <= 0xDC6F) goto yy3;
        if (yych <= 0xDC73) goto yy4;
        goto yy3;
 }

diff --git a/re2c/test/unicode_group_Ps.8--encoding-policy(fail).c b/re2c/test/unicode_group_Ps.8--encoding-policy(fail).c
index b23f3746e2d624f262c09cc46ca4b920f79d4958..c6c92ac105c6c411c541c91325234d72408cfde1 100644 (file)
--- a/re2c/test/unicode_group_Ps.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Ps.8--encoding-policy(fail).c
@@ -227,8 +227,8 @@ yy27:
        default:        goto yy12;
        }
 yy28:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9B:
        case 0x9F:
        case 0xA2:      goto yy4;

diff --git a/re2c/test/unicode_group_Ps.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Ps.8--encoding-policy(ignore).c
index 761ff77927fe0c0549fb874ea6c0a8431904e83f..53ba6eb389cf06ff4159072607ed0388516c08ec 100644 (file)
--- a/re2c/test/unicode_group_Ps.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Ps.8--encoding-policy(ignore).c
@@ -227,8 +227,8 @@ yy27:
        default:        goto yy12;
        }
 yy28:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9B:
        case 0x9F:
        case 0xA2:      goto yy4;

diff --git a/re2c/test/unicode_group_Ps.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Ps.8--encoding-policy(substitute).c
index fbfd12b20d84d62f2dd5dc9e8cb4e8b44ad14d12..4b7f1ce4702ec5804122a309fae4a66126e52d9b 100644 (file)
--- a/re2c/test/unicode_group_Ps.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Ps.8--encoding-policy(substitute).c
@@ -227,8 +227,8 @@ yy27:
        default:        goto yy12;
        }
 yy28:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9B:
        case 0x9F:
        case 0xA2:      goto yy4;

diff --git a/re2c/test/unicode_group_S.8--encoding-policy(fail).c b/re2c/test/unicode_group_S.8--encoding-policy(fail).c
index 4e7a163446d2c61e11252f932a34a4af1d248bf7..7dfca42e65629f7b26461e044c49c24431d79cf0 100644 (file)
--- a/re2c/test/unicode_group_S.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_S.8--encoding-policy(fail).c
@@ -3379,8 +3379,8 @@ yy123:
        default:        goto yy24;
        }
 yy124:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_S.8--encoding-policy(ignore).c b/re2c/test/unicode_group_S.8--encoding-policy(ignore).c
index f4e9ef6d37dccb93340315e86996affdfca62512..ffd8f61e932c4d61b48cea3dfe8f8cf99e915339 100644 (file)
--- a/re2c/test/unicode_group_S.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_S.8--encoding-policy(ignore).c
@@ -3379,8 +3379,8 @@ yy123:
        default:        goto yy24;
        }
 yy124:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_S.8--encoding-policy(substitute).c b/re2c/test/unicode_group_S.8--encoding-policy(substitute).c
index fb1cbee77280287696721b12c2cdde79e7164cf2..e871f6e8090d56303967f57c867b1e3073887a8c 100644 (file)
--- a/re2c/test/unicode_group_S.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_S.8--encoding-policy(substitute).c
@@ -3379,8 +3379,8 @@ yy123:
        default:        goto yy24;
        }
 yy124:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_S.x--encoding-policy(fail).c b/re2c/test/unicode_group_S.x--encoding-policy(fail).c
index 6aa99c3fee473da78749c0e80d7c3afbc81705e6..68f93142632b4b74253d6948fdf493cce343e53f 100644 (file)
--- a/re2c/test/unicode_group_S.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_S.x--encoding-policy(fail).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_S.x--encoding-policy(ignore).c b/re2c/test/unicode_group_S.x--encoding-policy(ignore).c
index cb89ded2b71a310ffe6a6c80c5dacc5ed9f2f64f..76da1c2b4c2c456b00368539aef9daef2922778e 100644 (file)
--- a/re2c/test/unicode_group_S.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_S.x--encoding-policy(ignore).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_S.x--encoding-policy(substitute).c b/re2c/test/unicode_group_S.x--encoding-policy(substitute).c
index 200ef27d242c5b519e4e2f0cb5d93bcd38a68e64..8aef98ae25ceaca8a95962c65b1906cb42390636 100644 (file)
--- a/re2c/test/unicode_group_S.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_S.x--encoding-policy(substitute).c
@@ -687,8 +687,8 @@ yy9:
                }
        }
 yy10:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_Sc.8--encoding-policy(fail).c b/re2c/test/unicode_group_Sc.8--encoding-policy(fail).c
index ee9215242d9c8a701657f7079ad44ce08bb8770b..4236c21324cc2d18021df412e5167f2514ca2a20 100644 (file)
--- a/re2c/test/unicode_group_Sc.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Sc.8--encoding-policy(fail).c
@@ -177,8 +177,8 @@ yy23:
        default:        goto yy14;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA0:
        case 0xA1:
        case 0xA5:

diff --git a/re2c/test/unicode_group_Sc.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Sc.8--encoding-policy(ignore).c
index 6a3002307070a988985527e1c79c7ab9539f47b4..e5f2a8c98f517866b3eb7fae95def67964d0114e 100644 (file)
--- a/re2c/test/unicode_group_Sc.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Sc.8--encoding-policy(ignore).c
@@ -177,8 +177,8 @@ yy23:
        default:        goto yy14;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA0:
        case 0xA1:
        case 0xA5:

diff --git a/re2c/test/unicode_group_Sc.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Sc.8--encoding-policy(substitute).c
index 4e4edb65cf7cc6a94b3652112c28294ffad809e4..7798dd9008b23f7ff2c973c5f764883351fe2b98 100644 (file)
--- a/re2c/test/unicode_group_Sc.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Sc.8--encoding-policy(substitute).c
@@ -177,8 +177,8 @@ yy23:
        default:        goto yy14;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA0:
        case 0xA1:
        case 0xA5:

diff --git a/re2c/test/unicode_group_Sk.8--encoding-policy(fail).c b/re2c/test/unicode_group_Sk.8--encoding-policy(fail).c
index c440c6e5304ecf681c62c002a82272c77d2f088c..59e966c4648eed4fd8644c5cbc1d3e0a1f8de196 100644 (file)
--- a/re2c/test/unicode_group_Sk.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Sk.8--encoding-policy(fail).c
@@ -248,8 +248,8 @@ yy23:
        default:        goto yy15;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA3:      goto yy4;
        default:        goto yy15;
        }

diff --git a/re2c/test/unicode_group_Sk.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Sk.8--encoding-policy(ignore).c
index 519785d6b9f1e1c1742bef5a9fe29b850b121fc6..5efbed1613667bdf3699f48885662abac1e2cbd0 100644 (file)
--- a/re2c/test/unicode_group_Sk.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Sk.8--encoding-policy(ignore).c
@@ -248,8 +248,8 @@ yy23:
        default:        goto yy15;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA3:      goto yy4;
        default:        goto yy15;
        }

diff --git a/re2c/test/unicode_group_Sk.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Sk.8--encoding-policy(substitute).c
index 254697e6d255ce5f66ba5c68203d6a311892c3e1..01d9786e406af1bf1196a695303e76c2b00ee1f7 100644 (file)
--- a/re2c/test/unicode_group_Sk.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Sk.8--encoding-policy(substitute).c
@@ -248,8 +248,8 @@ yy23:
        default:        goto yy15;
        }
 yy24:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0xA3:      goto yy4;
        default:        goto yy15;
        }

diff --git a/re2c/test/unicode_group_Sm.8--encoding-policy(fail).c b/re2c/test/unicode_group_Sm.8--encoding-policy(fail).c
index 1bef859f15fb60ae848e4ad63b247750ee9f8c6d..d3dc4c37e9e923d3d505cd26035d3004e403794d 100644 (file)
--- a/re2c/test/unicode_group_Sm.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Sm.8--encoding-policy(fail).c
@@ -628,8 +628,8 @@ yy42:
        default:        goto yy14;
        }
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:      goto yy4;
        default:        goto yy14;
        }

diff --git a/re2c/test/unicode_group_Sm.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Sm.8--encoding-policy(ignore).c
index c578f26febe0bd63b81582256d1d44e7bbaa777e..1251f31cb9e1f7aefd213deb58e4ee0e6b603265 100644 (file)
--- a/re2c/test/unicode_group_Sm.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Sm.8--encoding-policy(ignore).c
@@ -628,8 +628,8 @@ yy42:
        default:        goto yy14;
        }
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:      goto yy4;
        default:        goto yy14;
        }

diff --git a/re2c/test/unicode_group_Sm.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Sm.8--encoding-policy(substitute).c
index 812557a785cfd81d2ab2109bd3c02b9e1345074c..db600cb6ed0e2293fb68706c2191fee88b9910a7 100644 (file)
--- a/re2c/test/unicode_group_Sm.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Sm.8--encoding-policy(substitute).c
@@ -628,8 +628,8 @@ yy42:
        default:        goto yy14;
        }
 yy43:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x83:      goto yy4;
        default:        goto yy14;
        }

diff --git a/re2c/test/unicode_group_Sm.x--encoding-policy(fail).c b/re2c/test/unicode_group_Sm.x--encoding-policy(fail).c
index f3a766394c08e10302e09e8a485a95382e3e1164..d80855953d573dcf88b421de77d916cae2a6ea2e 100644 (file)
--- a/re2c/test/unicode_group_Sm.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Sm.x--encoding-policy(fail).c
@@ -188,8 +188,8 @@ yy4:
        { goto Sm; }
 #line 190 "unicode_group_Sm.x--encoding-policy(fail).c"
 yy6:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDF35) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDF35) {
                if (yych <= 0xDEFA) {
                        if (yych <= 0xDEC1) {
                                if (yych <= 0xDEC0) goto yy3;

diff --git a/re2c/test/unicode_group_Sm.x--encoding-policy(ignore).c b/re2c/test/unicode_group_Sm.x--encoding-policy(ignore).c
index d79a37c261915997ea6813e1004b0b98f24f6416..a97f96c870f8d980c3303a66ab133ea110ef43db 100644 (file)
--- a/re2c/test/unicode_group_Sm.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Sm.x--encoding-policy(ignore).c
@@ -188,8 +188,8 @@ yy4:
        { goto Sm; }
 #line 190 "unicode_group_Sm.x--encoding-policy(ignore).c"
 yy6:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDF35) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDF35) {
                if (yych <= 0xDEFA) {
                        if (yych <= 0xDEC1) {
                                if (yych <= 0xDEC0) goto yy3;

diff --git a/re2c/test/unicode_group_Sm.x--encoding-policy(substitute).c b/re2c/test/unicode_group_Sm.x--encoding-policy(substitute).c
index 6fb3970a4532c6e28515cc0a4f26df06ff94e6d3..63edeefe3f98474d6ec5310a49f539fdc773d1be 100644 (file)
--- a/re2c/test/unicode_group_Sm.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Sm.x--encoding-policy(substitute).c
@@ -188,8 +188,8 @@ yy4:
        { goto Sm; }
 #line 190 "unicode_group_Sm.x--encoding-policy(substitute).c"
 yy6:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDF35) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDF35) {
                if (yych <= 0xDEFA) {
                        if (yych <= 0xDEC1) {
                                if (yych <= 0xDEC0) goto yy3;

diff --git a/re2c/test/unicode_group_So.8--encoding-policy(fail).c b/re2c/test/unicode_group_So.8--encoding-policy(fail).c
index 00c864b0d5e4eca1534cc17641c67d4f319eb839..3378404fc6021a186548444f1ac98742e91a8540 100644 (file)
--- a/re2c/test/unicode_group_So.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_So.8--encoding-policy(fail).c
@@ -3330,8 +3330,8 @@ yy105:
        default:        goto yy20;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_So.8--encoding-policy(ignore).c b/re2c/test/unicode_group_So.8--encoding-policy(ignore).c
index bbc111599acf7a171d24bb888cc7519c30ee7995..347884256c21a9404060413d09399eb418e33f12 100644 (file)
--- a/re2c/test/unicode_group_So.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_So.8--encoding-policy(ignore).c
@@ -3330,8 +3330,8 @@ yy105:
        default:        goto yy20;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_So.8--encoding-policy(substitute).c b/re2c/test/unicode_group_So.8--encoding-policy(substitute).c
index 070a0275454ae475a69a2ac7cb437ee5a2bde8c5..02306e7907672c92e8cc7e7ca2c68a3859da1885 100644 (file)
--- a/re2c/test/unicode_group_So.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_So.8--encoding-policy(substitute).c
@@ -3330,8 +3330,8 @@ yy105:
        default:        goto yy20;
        }
 yy106:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x80:
        case 0x81:
        case 0x82:

diff --git a/re2c/test/unicode_group_So.x--encoding-policy(fail).c b/re2c/test/unicode_group_So.x--encoding-policy(fail).c
index d0d3667067b4c8bb824497ceeb88dc1de0963d6f..bea155e5604a79ee490e1ca18c2de89a36ddf065 100644 (file)
--- a/re2c/test/unicode_group_So.x--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_So.x--encoding-policy(fail).c
@@ -505,8 +505,8 @@ yy8:
                }
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_So.x--encoding-policy(ignore).c b/re2c/test/unicode_group_So.x--encoding-policy(ignore).c
index 9e983c87370edcc487e122f97c40e922eb23ede6..53f4cb5eae31815d5d4ba73ad5da7930ea6ae0f5 100644 (file)
--- a/re2c/test/unicode_group_So.x--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_So.x--encoding-policy(ignore).c
@@ -505,8 +505,8 @@ yy8:
                }
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_So.x--encoding-policy(substitute).c b/re2c/test/unicode_group_So.x--encoding-policy(substitute).c
index d299a793050a17539e7593626f676a02f154d467..fd15807531f5fef27fa2f43231a3c92c05849e8c 100644 (file)
--- a/re2c/test/unicode_group_So.x--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_So.x--encoding-policy(substitute).c
@@ -505,8 +505,8 @@ yy8:
                }
        }
 yy9:
-       ++YYCURSOR;
-       if ((yych = *YYCURSOR) <= 0xDE17) {
+       yych = *++YYCURSOR;
+       if (yych <= 0xDE17) {
                if (yych <= 0xDD3D) {
                        if (yych <= 0xDC41) {
                                if (yych <= 0xDC3E) {

diff --git a/re2c/test/unicode_group_Z.8--encoding-policy(fail).c b/re2c/test/unicode_group_Z.8--encoding-policy(fail).c
index 2bfb7c36d7cee7b479454ac05e41bbe48d57ec09..1186ef9ca6f56cd5be69f1469a5c0fa08927408c 100644 (file)
--- a/re2c/test/unicode_group_Z.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Z.8--encoding-policy(fail).c
@@ -93,8 +93,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/unicode_group_Z.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Z.8--encoding-policy(ignore).c
index c6d2263915449f13ff79b6092f9daacc40afe5d7..6049a335010022888035dc31ec926e982cb6ee6c 100644 (file)
--- a/re2c/test/unicode_group_Z.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Z.8--encoding-policy(ignore).c
@@ -93,8 +93,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/unicode_group_Z.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Z.8--encoding-policy(substitute).c
index 3da8f1c67bafc94276c18f6b61fa218810580697..d03e7bcd170285b4f26daac327bac9dd6c5dae1d 100644 (file)
--- a/re2c/test/unicode_group_Z.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Z.8--encoding-policy(substitute).c
@@ -93,8 +93,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/unicode_group_Zs.8--encoding-policy(fail).c b/re2c/test/unicode_group_Zs.8--encoding-policy(fail).c
index 6809bb39912fdf205493f0a412b736bc54422010..1b226f19385093e869f557bad0fab35c32167ca1 100644 (file)
--- a/re2c/test/unicode_group_Zs.8--encoding-policy(fail).c
+++ b/re2c/test/unicode_group_Zs.8--encoding-policy(fail).c
@@ -91,8 +91,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/unicode_group_Zs.8--encoding-policy(ignore).c b/re2c/test/unicode_group_Zs.8--encoding-policy(ignore).c
index d5fd4ecba6f650a1346c5c75c3b508ab76ca704e..9654824f58adbf34ce3e30957b2f0ff81d760d34 100644 (file)
--- a/re2c/test/unicode_group_Zs.8--encoding-policy(ignore).c
+++ b/re2c/test/unicode_group_Zs.8--encoding-policy(ignore).c
@@ -91,8 +91,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/unicode_group_Zs.8--encoding-policy(substitute).c b/re2c/test/unicode_group_Zs.8--encoding-policy(substitute).c
index 249e84190a3fea8a6f3b0af44d768ab33c18f31f..301182dcf5388c923e432594198dc0c95697bb88 100644 (file)
--- a/re2c/test/unicode_group_Zs.8--encoding-policy(substitute).c
+++ b/re2c/test/unicode_group_Zs.8--encoding-policy(substitute).c
@@ -91,8 +91,8 @@ yy13:
        default:        goto yy11;
        }
 yy14:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 0x9F:      goto yy4;
        default:        goto yy11;
        }

diff --git a/re2c/test/wunreachable_rules.i.c b/re2c/test/wunreachable_rules.i.c
index 6d7c2a7efc2e83805bf87049f2ed92db9c425b95..739ded01cce6410f17271abf9bd7b834e0f2e881 100644 (file)
--- a/re2c/test/wunreachable_rules.i.c
+++ b/re2c/test/wunreachable_rules.i.c
@@ -13,8 +13,8 @@ yy0:
        default:        goto yy1;
        }
 yy3:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy5;
        default:        goto yy4;
        }
@@ -40,8 +40,8 @@ yy6:
        default:        goto yy7;
        }
 yy9:
-       ++YYCURSOR;
-       switch ((yych = *YYCURSOR)) {
+       yych = *++YYCURSOR;
+       switch (yych) {
        case 'a':       goto yy11;
        default:        goto yy10;
        }