From: Ulya Trofimovich Date: Wed, 14 Dec 2016 14:21:28 +0000 (+0000) Subject: Don't delay reading next character until dispatch. X-Git-Tag: 1.0~39^2~194 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb16c9a2d35d8a18847a7fb93ba95db5f6bdfa4a;p=re2c 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 2fdbdcf7..382856d7 100644 --- a/re2c/src/codegen/emit.h +++ b/re2c/src/codegen/emit.h @@ -8,10 +8,10 @@ namespace re2c { typedef std::vector code_lines_t; -void emit_action(OutputFile &o, uint32_t ind, bool &readCh, const DFA &dfa, const State *s, const std::set &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 &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 f0b9fc63..2d748dbb 100644 --- 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 &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 &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 &used_labels) +void emit_action(OutputFile &o, uint32_t ind, const DFA &dfa, + const State *s, const std::set &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 &used_labels, bool save_yyaccept) +void emit_initial(OutputFile &o, uint32_t ind, const State *s, + const std::set &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 c9d5cc67..70ef6e8f 100644 --- 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 7c65f447..e00fa056 100644 --- 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 &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 & 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 &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 & 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 & 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 & 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 & 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 & used); Go (const Go & g) diff --git a/re2c/src/codegen/go_emit.cc b/re2c/src/codegen/go_emit.cc index 5ba662c1..9cc17c1b 100644 --- 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 8e5ec681..2972ee62 100644 --- 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 adce72d2..be8106db 100644 --- 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 a6de4a28..e68846a9 100644 --- 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 9458bae8..c01ae39a 100644 --- 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 3bb6fab1..3fbbbab3 100644 --- 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 6ac1efe9..784d936b 100644 --- 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 d95ca703..e5416c0f 100644 --- 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 8dd0b19d..f5137ab6 100644 --- 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 59732797..64c77e0f 100644 --- 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 3bf3045b..9626822e 100644 --- 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 010a5902..516a1682 100644 --- 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 f298565c..f764521e 100644 --- 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 d3067ae1..66e79b53 100644 --- 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 a984288f..1597220b 100644 --- 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 1739a9c0..08e4fa47 100644 --- 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 ebcb8e4e..202aa559 100644 --- 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 82319660..7d972ed6 100644 --- 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 0d9928ec..68a9e4a3 100644 --- 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 875935b1..06eb75c9 100644 --- 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 fd2b173a..4d6ba533 100644 --- 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 1369c759..0f93466b 100644 --- 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 b482fed2..6b99d29f 100644 --- 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 a0a68e86..508b7938 100644 --- 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 aeb91e79..eede5c29 100644 --- 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 c90abde6..4e8dfd1c 100644 --- 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 ec6a4469..b4264232 100644 --- 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 017009b6..06085625 100644 --- 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 ceafc6a8..35777be3 100644 --- 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 a312343c..6ae01e11 100644 --- 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 bcc8d1c0..5923f36c 100644 --- 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 42a78b45..a35d76a6 100644 --- 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 64158b25..5cd0c2f0 100644 --- 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 cc49f47d..7deb30a1 100644 --- 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 bb5b33fe..0159922c 100644 --- 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 d2e7c8d9..fa5f8b87 100644 --- 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 cc49f47d..7deb30a1 100644 --- 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 7002913f..424ce3a3 100644 --- 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 ee2aa989..4813973e 100644 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 34a3575e..b90448d6 100644 --- 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 d8b6ee5e..446c577b 100644 --- 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 91377b27..b59bd451 100644 --- 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 e08ae800..93184ad7 100644 --- 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 78c9ebae..3ae2f0db 100644 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 6c507a26..af3f68e8 100644 --- 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 ec586582..09272a0a 100644 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 7b7d24df..035aaf43 100644 --- 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 c12f3910..ec6ecd25 100644 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 8466ab74..ac113c78 100644 --- 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 fba78fe5..bcd0d8a0 100644 --- 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 4a8707f7..0d062d1a 100644 --- 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 383bbcb2..9d7c76be 100644 --- 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 b9528140..aa041094 100644 --- 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 2b4815d4..d6fd4b6f 100644 --- 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 b3236da0..5a9543e6 100644 --- 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 0452e5d4..ac78989e 100644 --- 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 fd75ad2e..b3550265 100644 --- 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 ced17d10..dd8f1668 100644 --- 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 6a5e5f37..5d250123 100644 --- 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 a21304a0..909ab533 100644 --- 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 ec20ce32..a0d5572c 100644 --- 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 aeae880f..5ae16e8f 100644 --- 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 3f39db89..89675589 100644 --- 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 c179fadb..39fff1fc 100644 --- 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 b45d52a3..108088ef 100644 --- 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 04289979..77a9cdb7 100644 --- 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 7d6d7ec7..504d42df 100644 --- 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 7fb5b481..d93c66de 100644 --- 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 895185a6..28a02bc9 100644 --- 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); { @@ -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/php20150211_parse_date.ig.c b/re2c/test/php20150211_parse_date.ig.c index 9383ac31..64cc04df 100644 --- 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 7f5aeebb..e3002d1f 100644 --- 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: { @@ -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_pdo_sql_parser.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c index 3b3e0aef..b3aa60c2 100644 --- 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 8abe9151..37e96b90 100644 --- 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 c3c38373..e53d9a0b 100644 --- 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 4300cb3a..2156949e 100644 --- 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 f5878280..cec4173d 100644 --- 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 0ce5453a..92f8bff6 100644 --- 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 320f062b..44eca2a9 100644 --- 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 7d6ed745..141ddd01 100644 --- 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 28d0396d..fbd60024 100644 --- 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 0ea07c8c..4661c1fa 100644 --- 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 1ba93f49..6f391695 100644 --- 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 034c012b..9269dad1 100644 --- 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 755a9797..838100f6 100644 --- 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 69e1dd38..ea391239 100644 --- 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 7b749775..c91359ee 100644 --- 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 249b5f96..d60143d3 100644 --- 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 18157df9..180df806 100644 --- 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 7ba289d5..bdd8efaf 100644 --- 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 d4a6fb9b..5856d766 100644 --- 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 be935108..5ba9553d 100644 --- 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 4ff721d3..a7dd8a0a 100644 --- 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 464513a5..87a50b91 100644 --- 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 477e019a..4b4b3fa1 100644 --- 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 366d2a27..c184225f 100644 --- 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 563f6357..61474f3f 100644 --- 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 fe5c2286..a7a89f91 100644 --- 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 38dbda0f..390dec5f 100644 --- 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 e7ec8d93..4273ab86 100644 --- 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 36e07291..b8b7323c 100644 --- 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 7a1dbdba..18217d66 100644 --- 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 84919ee7..ef3c9bc5 100644 --- 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 72488ba9..932895dd 100644 --- 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 4c4ec3c6..e05bc2e0 100644 --- 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 e9f5440f..f2af2099 100644 --- 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 c3db5a5e..f949f75e 100644 --- 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 628d3a49..d77257a6 100644 --- 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 e15f2bec..0b076cba 100644 --- 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 e88618af..d3d11202 100644 --- 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 096f0975..b8820258 100644 --- 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 e7f61699..b58d556e 100644 --- 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 96f2a840..7ead767a 100644 --- 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 fbcb38aa..ed46150c 100644 --- 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 a9619bf9..14277be6 100644 --- 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 2dcfaa24..415165ae 100644 --- 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 cda1204f..e3103b21 100644 --- 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 48f7c9fa..64f714d0 100644 --- 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 78af9b95..f29a33c9 100644 --- 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 b23f4317..300902ec 100644 --- 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 7a6d9509..9cb08e4e 100644 --- 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 18f9af17..fb9f63f2 100644 --- 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 a0e383f8..eda9c013 100644 --- 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 c00484e6..4448e78a 100644 --- 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 1eb36914..fe8ebf6f 100644 --- 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 16449399..d7050485 100644 --- 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 4fe89a68..605cfad4 100644 --- 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 dfd7012b..d3c17037 100644 --- 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 adf529d1..063deddb 100644 --- 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 ec4d094e..be5739b5 100644 --- 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 d02028c2..e649c9ed 100644 --- 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 79ce879b..04a7acbd 100644 --- 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 7bc4980d..5a65aec1 100644 --- 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 a833d01c..bbed469d 100644 --- 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 9e3cc7a7..3a8651e0 100644 --- 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 d9fb4a06..70a47d53 100644 --- 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 d9fb4a06..70a47d53 100644 --- 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 a898ee40..3ace5d57 100644 --- 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 a898ee40..3ace5d57 100644 --- 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 d5e0e1fd..04f5ce8b 100644 --- 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 43f63c4f..128edcd3 100644 --- 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 7ed885ca..c4854e80 100644 --- 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 8c101b6e..338cbd46 100644 --- 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 ea8c32cc..b4246130 100644 --- 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 f04b0cfd..14e94f4e 100644 --- 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 2d0d0af0..70019373 100644 --- 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 1fe2a092..5d196d44 100644 --- 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 7d736f1e..0877f4c9 100644 --- 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 7d1cd525..0aa8c58a 100644 --- 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 6fd61319..b3154e8f 100644 --- 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 d6971660..140050d3 100644 --- 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 31988d7a..e0964c42 100644 --- 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 c19602cc..f496b423 100644 --- 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 7d14f925..403dd027 100644 --- 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 9c675597..e0a7c7e6 100644 --- 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 cf1bc26d..08dcdbd1 100644 --- 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 e2098345..ed74eb6e 100644 --- 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 68511716..5301d832 100644 --- 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 eeb2afbe..3525a3d0 100644 --- 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 5236ff33..aa307c17 100644 --- 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 50c776d3..bed2209f 100644 --- 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 8aee9d55..4590e9cb 100644 --- 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 5fb0a2fa..373eba3f 100644 --- 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 688955bc..a528c041 100644 --- 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 6a01e9fa..62765a8b 100644 --- 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 137b25cd..1545b28b 100644 --- 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 7d4cbf6e..b4356b4f 100644 --- 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 6e73c5fa..4980cfb2 100644 --- 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 a6ee8078..9fddae99 100644 --- 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 78cc4cfd..28da5e86 100644 --- 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 7e0587c2..31902958 100644 --- 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 94330375..cd5b5e39 100644 --- 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 cd570316..de82962e 100644 --- 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 bc01b1bd..f55e44ad 100644 --- 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 f9add804..74bce5a3 100644 --- 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 779d5de7..ce4c2405 100644 --- 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 b76eacc6..7bfea871 100644 --- 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 533516cf..8c4d749a 100644 --- 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 6291668f..be516c40 100644 --- 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 d9d03a3a..0e09c91b 100644 --- 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 fc3bac4d..7da961ea 100644 --- 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 70839a7d..3659fda8 100644 --- 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 e528501a..20c85088 100644 --- 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 ebfd0ca0..14d0acc5 100644 --- 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 fa572364..2340519c 100644 --- 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 950d7471..541ea711 100644 --- 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 98ab0384..4761edd0 100644 --- 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 d8abdaf8..569905fc 100644 --- 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 ac641bc0..9fb5ba7f 100644 --- 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 d600b1a2..aa05e72f 100644 --- 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 0c9a9f54..b99e1e28 100644 --- 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 7c28cd98..130e45ca 100644 --- 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 df74665a..db664d86 100644 --- 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 32a5002b..92d00618 100644 --- 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 a25a0ef6..891638e3 100644 --- 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 9f045add..7d83c6d3 100644 --- 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 4235a598..52f6b058 100644 --- 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 267710a7..43660278 100644 --- 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 e9c51687..7aab3b66 100644 --- 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 0ec41295..b973e891 100644 --- 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 41e58aef..1cd2e9f9 100644 --- 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 5bc0b4c2..e8ad75cd 100644 --- 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 45dd8872..712259f3 100644 --- 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 28876ac0..af5a7501 100644 --- 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 2d930a78..46abb49a 100644 --- 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 6a467987..773916f3 100644 --- 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 880f1d5f..1b3ebb74 100644 --- 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 dd39bb95..90455c05 100644 --- 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 74b6c8dd..16a32b33 100644 --- 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 dfb0111c..9ed4aa90 100644 --- 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 40d35ef0..35ae73e9 100644 --- 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 65a8c24e..5766c976 100644 --- 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 95e709e0..122802f8 100644 --- 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 3e447fb7..7c23edf1 100644 --- 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 6c982d91..d14da4aa 100644 --- 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 1c5701d6..23e6da2e 100644 --- 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 128587d0..981eb697 100644 --- 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 ffe826a7..6cef5c6c 100644 --- 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 f72349f1..a2fcdb1f 100644 --- 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 91ed679e..1b9087ea 100644 --- 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 41fcb5b2..d69d171d 100644 --- 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 85ce25bb..e082533b 100644 --- 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 946b7c0d..1fc1f4db 100644 --- 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 cf1b94cd..426c8a00 100644 --- 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 ffa04a89..a6f6497d 100644 --- 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 730864e7..59031699 100644 --- 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 ffb9afd3..6b4d9fce 100644 --- 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 9054f3b2..08e15fda 100644 --- 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 77d8c5ac..3e9c8a56 100644 --- 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 b91a60d3..036f91a4 100644 --- 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 fd3f1023..de046c7d 100644 --- 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 e9ac5548..98bfd2a9 100644 --- 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 30013793..cfda1b72 100644 --- 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 161823d4..17e83559 100644 --- 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 120a04eb..d6faba1b 100644 --- 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 08e31a5b..d00c1e8e 100644 --- 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 f151e5ce..2fe9e8d0 100644 --- 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 0576fda6..e6ede98e 100644 --- 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 2f9db7ce..fbd97081 100644 --- 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 1569c3f1..743b392d 100644 --- 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 3779e311..de11fcb2 100644 --- 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 9e9499ac..86df05d5 100644 --- 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 108d75d8..da442858 100644 --- 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 85978242..0660a6bc 100644 --- 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 21a388f8..cb41b5eb 100644 --- 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 875599b6..1fc718b4 100644 --- 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 f3a6160d..b80ed543 100644 --- 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 15db5ff5..62fc6784 100644 --- 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 b2149832..12f0a8ac 100644 --- 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 bc4b4346..d01c028d 100644 --- 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 2c833a90..88f9f548 100644 --- 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 b748ba9a..e9e4a65f 100644 --- 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 286e0c3c..7f366597 100644 --- 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 cd28dcbf..e9b00990 100644 --- 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 8e70dc76..233ec841 100644 --- 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 fb8d2a46..8c5eeceb 100644 --- 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 6d571316..bbe18909 100644 --- 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 ec3d4e50..fa650bf8 100644 --- 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 789c76da..50a16dcb 100644 --- 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 3b01af53..92626cf3 100644 --- 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 467607dc..448d818b 100644 --- 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 775846a1..148dfa4b 100644 --- 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 006f1bbe..95a7157c 100644 --- 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 ebccd384..58d9c170 100644 --- 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 ccea256f..c103f5d6 100644 --- 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 60601a38..9aee7c80 100644 --- 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 3164f2f9..b2fdd5f4 100644 --- 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 46c8fab2..3a0a29e8 100644 --- 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 114c863d..786087f7 100644 --- 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 d0c88668..700ab545 100644 --- 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 36d81481..52f2f0da 100644 --- 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 2f3f9095..e31948b6 100644 --- 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 851feae4..2656e1fb 100644 --- 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 b23f3746..c6c92ac1 100644 --- 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 761ff779..53ba6eb3 100644 --- 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 fbfd12b2..4b7f1ce4 100644 --- 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 4e7a1634..7dfca42e 100644 --- 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 f4e9ef6d..ffd8f61e 100644 --- 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 fb1cbee7..e871f6e8 100644 --- 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 6aa99c3f..68f93142 100644 --- 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 cb89ded2..76da1c2b 100644 --- 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 200ef27d..8aef98ae 100644 --- 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 ee921524..4236c213 100644 --- 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 6a300230..e5f2a8c9 100644 --- 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 4e4edb65..7798dd90 100644 --- 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 c440c6e5..59e966c4 100644 --- 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 519785d6..5efbed16 100644 --- 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 254697e6..01d9786e 100644 --- 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 1bef859f..d3dc4c37 100644 --- 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 c578f26f..1251f31c 100644 --- 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 812557a7..db600cb6 100644 --- 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 f3a76639..d8085595 100644 --- 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 d79a37c2..a97f96c8 100644 --- 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 6fb3970a..63edeefe 100644 --- 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 00c864b0..3378404f 100644 --- 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 bbc11159..34788425 100644 --- 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 070a0275..02306e79 100644 --- 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 d0d36670..bea155e5 100644 --- 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 9e983c87..53f4cb5e 100644 --- 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 d299a793..fd158075 100644 --- 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 2bfb7c36..1186ef9c 100644 --- 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 c6d22639..6049a335 100644 --- 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 3da8f1c6..d03e7bcd 100644 --- 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 6809bb39..1b226f19 100644 --- 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 d5fd4ecb..9654824f 100644 --- 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 249e8419..301182dc 100644 --- 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 6d7c2a7e..739ded01 100644 --- 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; }