From 487225a906bb929146856e95d117e645b2c28dcc Mon Sep 17 00:00:00 2001
From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Wed, 14 Dec 2016 13:35:21 +0000
Subject: [PATCH] Don't peek next input character if all transitions go to
 final state.

A similar heuristic already existed, but it was imprecise and captured
only those cases when final state happened to be next to the one in
question.

A lot of tests were updated; however changes are trivial and I verified
them with skeleton.
---
 re2c/src/codegen/emit_action.cc               | 12 ++++--
 re2c/test/bug128.c                            |  1 -
 re2c/test/bug1297658.c                        |  2 +-
 re2c/test/bug46_infinite_loop.c               |  1 -
 .../bug57_original.bi--case-insensitive.c     | 24 +++++------
 re2c/test/c.c                                 |  4 +-
 re2c/test/cmmap.c                             |  4 +-
 re2c/test/cnokw.c                             |  4 +-
 re2c/test/cunroll.c                           |  6 +--
 .../default_full.x--encoding-policy(fail).c   |  1 -
 ...ault_full.x--encoding-policy(substitute).c |  1 -
 re2c/test/input8.b.c                          |  1 -
 re2c/test/input8.c                            |  1 -
 re2c/test/input8.g.c                          |  1 -
 re2c/test/parse_date.b.c                      | 36 ++++++++---------
 re2c/test/parse_date.c                        | 36 ++++++++---------
 re2c/test/parse_date.db.c                     | 38 +++++++++---------
 re2c/test/parse_date.g.c                      | 36 ++++++++---------
 re2c/test/parse_date.s.c                      | 36 ++++++++---------
 re2c/test/parse_date_1_78.db.c                | 38 +++++++++---------
 ..._zend_language_scanner.igcd--flex-syntax.c |  8 ++--
 ..._language_scanner_crlf.igcd--flex-syntax.c |  8 ++--
 re2c/test/php20150211_json_scanner.igc.c      |  2 +-
 re2c/test/php20150211_parse_date.ig.c         | 40 +++++++++----------
 re2c/test/php20150211_parse_date_crlf.ig.c    | 40 +++++++++----------
 ...0150211_parse_iso_intervals.ig--skeleton.c |  1 -
 .../test/php20150211_parse_iso_intervals.ig.c |  2 +-
 .../php20150211_pdo_sql_parser.ig--skeleton.c |  1 -
 re2c/test/php20150211_pdo_sql_parser.ig.c     |  1 -
 ...0211_pdo_sql_parser_trimmed.ig--skeleton.c |  1 -
 .../php20150211_pdo_sql_parser_trimmed.ig.c   |  1 -
 ...p20150211_phpdbg_lexer.igcd--flex-syntax.c |  4 +-
 ...scanner.igcd--flex-syntax--case-inverted.c |  4 +-
 ...cd--skeleton--flex-syntax--case-inverted.c |  2 -
 ...zend_ini_scanner_trimmed.ic--flex-syntax.c |  4 +-
 ...nd_ini_scanner_trimmed.icwb--flex-syntax.c |  4 +-
 ...d_ini_scanner_trimmed_minimal_wb_bug.iwb.c |  2 +-
 ...scanner.igcd--flex-syntax--case-inverted.c |  6 +--
 ...cd--skeleton--flex-syntax--case-inverted.c |  3 --
 re2c/test/repeater2.c                         | 22 +++++-----
 re2c/test/scanner.--skeleton.c                |  2 -
 re2c/test/scanner.c                           |  4 +-
 re2c/test/scanner.fs.c                        |  4 +-
 re2c/test/scanner.s.c                         |  4 +-
 re2c/test/scanner_re2c.bi.c                   |  4 +-
 re2c/test/scanner_re2c_default.bi.c           |  4 +-
 re2c/test/tags/conf1.i--tags--input(custom).c |  1 -
 re2c/test/tags/conf1.i--tags.c                |  1 -
 re2c/test/tags/conf3.i--tags--input(custom).c |  1 -
 re2c/test/tags/conf3.i--tags.c                |  1 -
 re2c/test/tags/exponential_bottoms.i--tags.c  |  1 -
 re2c/test/tags/fallback1.i--tags.c            |  2 +-
 .../mapping1.i--tags--non-bijective-mapping.c |  1 -
 re2c/test/tags/mapping1.i--tags.c             |  1 -
 re2c/test/tags/minimization.i.c               |  1 -
 re2c/test/tags/topsort2.i--tags.c             |  1 -
 re2c/test/wunreachable_rules.i.c              |  2 -
 57 files changed, 223 insertions(+), 251 deletions(-)

diff --git a/re2c/src/codegen/emit_action.cc b/re2c/src/codegen/emit_action.cc
index 20047bd7..f0b9fc63 100644
--- a/re2c/src/codegen/emit_action.cc
+++ b/re2c/src/codegen/emit_action.cc
@@ -61,14 +61,18 @@ void emit_action(OutputFile &o, uint32_t ind, bool &readCh,
 
 void emit_match(OutputFile &o, uint32_t ind, bool &readCh, const State *s)
 {
-	const bool read_ahead = s
-		&& s->next
-		&& s->next->action.type != Action::RULE;
+	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;
 
 	if (s->fill != 0) {
 		o.wstring(opts->input_api.stmt_skip(ind));
+	} 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) {
-		/* do not read next char if match */
+		// delay reading next char
 		o.wstring(opts->input_api.stmt_skip(ind));
 		readCh = true;
 	} else {
diff --git a/re2c/test/bug128.c b/re2c/test/bug128.c
index f4b5b8e9..9458bae8 100644
--- a/re2c/test/bug128.c
+++ b/re2c/test/bug128.c
@@ -959,7 +959,6 @@ yy138:
 	}
 yy139:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy5;
 }
 #line 7 "bug128.re"
diff --git a/re2c/test/bug1297658.c b/re2c/test/bug1297658.c
index 73fc4175..3bb6fab1 100644
--- a/re2c/test/bug1297658.c
+++ b/re2c/test/bug1297658.c
@@ -106,7 +106,7 @@ yy8:
 	default:	goto yy3;
 	}
 yy9:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy10:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/bug46_infinite_loop.c b/re2c/test/bug46_infinite_loop.c
index b35fa126..1e34d09a 100644
--- a/re2c/test/bug46_infinite_loop.c
+++ b/re2c/test/bug46_infinite_loop.c
@@ -43,7 +43,6 @@ yy6:
 #line 44 "bug46_infinite_loop.c"
 yy7:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy6;
 }
 #line 19 "bug46_infinite_loop.re"
diff --git a/re2c/test/bug57_original.bi--case-insensitive.c b/re2c/test/bug57_original.bi--case-insensitive.c
index ad5bc8ec..d95ca703 100644
--- a/re2c/test/bug57_original.bi--case-insensitive.c
+++ b/re2c/test/bug57_original.bi--case-insensitive.c
@@ -120,7 +120,7 @@ int _scan_autolink_uri(const unsigned char *p)
 yy2:
 	{ return 0; }
 yy3:
-	yych = *++p;
+	++p;
 	goto yy2;
 yy4:
 	yych = *(marker = ++p);
@@ -2527,7 +2527,7 @@ int _scan_autolink_email(const unsigned char *p)
 yy349:
 	{ return 0; }
 yy350:
-	yych = *++p;
+	++p;
 	goto yy349;
 yy351:
 	yych = *(marker = ++p);
@@ -5144,7 +5144,7 @@ int _scan_html_tag(const unsigned char *p)
 yy484:
 	{ return 0; }
 yy485:
-	yych = *++p;
+	++p;
 	goto yy484;
 yy486:
 	yych = *(marker = ++p);
@@ -5705,7 +5705,7 @@ int _scan_html_block_tag(const unsigned char *p)
 yy548:
 	{ return 0; }
 yy549:
-	yych = *++p;
+	++p;
 	goto yy548;
 yy550:
 	yych = *(marker = ++p);
@@ -7583,7 +7583,7 @@ yy791:
 		}
 	}
 yy792:
-	yych = *++p;
+	++p;
 	goto yy790;
 yy793:
 	++p;
@@ -7798,7 +7798,7 @@ int _scan_link_title(const unsigned char *p)
 yy804:
 	{ return 0; }
 yy805:
-	yych = *++p;
+	++p;
 	goto yy804;
 yy806:
 	yyaccept = 0;
@@ -8038,7 +8038,7 @@ int _scan_atx_header_start(const unsigned char *p)
 yy840:
 	{ return 0; }
 yy841:
-	yych = *++p;
+	++p;
 	goto yy840;
 yy842:
 	yych = *(marker = ++p);
@@ -8151,7 +8151,7 @@ int _scan_setext_header_line(const unsigned char *p)
 yy855:
 	{ return 0; }
 yy856:
-	yych = *++p;
+	++p;
 	goto yy855;
 yy857:
 	yych = *(marker = ++p);
@@ -8274,7 +8274,7 @@ int _scan_hrule(const unsigned char *p)
 yy874:
 	{ return 0; }
 yy875:
-	yych = *++p;
+	++p;
 	goto yy874;
 yy876:
 	yych = *(marker = ++p);
@@ -8455,7 +8455,7 @@ int _scan_open_code_fence(const unsigned char *p)
 yy912:
 	{ return 0; }
 yy913:
-	yych = *++p;
+	++p;
 	goto yy912;
 yy914:
 	yych = *(marker = ++p);
@@ -8586,7 +8586,7 @@ int _scan_close_code_fence(const unsigned char *p)
 yy933:
 	{ return 0; }
 yy934:
-	yych = *++p;
+	++p;
 	goto yy933;
 yy935:
 	yych = *(marker = ++p);
@@ -8698,7 +8698,7 @@ int _scan_entity(const unsigned char *p)
 yy954:
 	{ return 0; }
 yy955:
-	yych = *++p;
+	++p;
 	goto yy954;
 yy956:
 	yych = *(marker = ++p);
diff --git a/re2c/test/c.c b/re2c/test/c.c
index 0632c996..8dd0b19d 100644
--- a/re2c/test/c.c
+++ b/re2c/test/c.c
@@ -776,7 +776,7 @@ yy96:
 	default:	goto yy95;
 	}
 yy97:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy34;
 yy98:
 	++YYCURSOR;
@@ -1335,7 +1335,7 @@ yy168:
 	{ RET(ELLIPSIS); }
 #line 1337 "c.c"
 yy170:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy114;
 yy171:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/cmmap.c b/re2c/test/cmmap.c
index 633037a8..1369c759 100644
--- a/re2c/test/cmmap.c
+++ b/re2c/test/cmmap.c
@@ -759,7 +759,7 @@ yy96:
 	default:	goto yy95;
 	}
 yy97:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy34;
 yy98:
 	++YYCURSOR;
@@ -1318,7 +1318,7 @@ yy168:
 	{ RET(ELLIPSIS); }
 #line 1320 "cmmap.c"
 yy170:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy114;
 yy171:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/cnokw.c b/re2c/test/cnokw.c
index 987d1cc2..b482fed2 100644
--- a/re2c/test/cnokw.c
+++ b/re2c/test/cnokw.c
@@ -675,7 +675,7 @@ yy81:
 	default:	goto yy80;
 	}
 yy82:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy34;
 yy83:
 	++YYCURSOR;
@@ -947,7 +947,7 @@ yy126:
 	{ RET(ELLIPSIS); }
 #line 949 "cnokw.c"
 yy128:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy99;
 yy129:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/cunroll.c b/re2c/test/cunroll.c
index a5b6330e..383bbcb2 100644
--- a/re2c/test/cunroll.c
+++ b/re2c/test/cunroll.c
@@ -673,7 +673,7 @@ yy80:
 	default:	goto yy79;
 	}
 yy81:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy34;
 yy82:
 	++YYCURSOR;
@@ -1017,7 +1017,7 @@ yy127:
 	{ RET(ELLIPSIS); }
 #line 1019 "cunroll.c"
 yy129:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy98;
 yy130:
 	yych = *++YYCURSOR;
@@ -1658,7 +1658,7 @@ yy161:
 	{ goto comment; }
 #line 1660 "cunroll.c"
 yy162:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy161;
 yy163:
 	++YYCURSOR;
diff --git a/re2c/test/default_full.x--encoding-policy(fail).c b/re2c/test/default_full.x--encoding-policy(fail).c
index bfcb2c7c..0452e5d4 100644
--- a/re2c/test/default_full.x--encoding-policy(fail).c
+++ b/re2c/test/default_full.x--encoding-policy(fail).c
@@ -24,7 +24,6 @@ yy5:
 #line 25 "default_full.x--encoding-policy(fail).c"
 yy6:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy5;
 }
 #line 4 "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 a1d47629..fd75ad2e 100644
--- a/re2c/test/default_full.x--encoding-policy(substitute).c
+++ b/re2c/test/default_full.x--encoding-policy(substitute).c
@@ -24,7 +24,6 @@ yy5:
 #line 25 "default_full.x--encoding-policy(substitute).c"
 yy6:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy5;
 }
 #line 4 "default_full.x--encoding-policy(substitute).re"
diff --git a/re2c/test/input8.b.c b/re2c/test/input8.b.c
index cbb33ef1..d53dde00 100644
--- a/re2c/test/input8.b.c
+++ b/re2c/test/input8.b.c
@@ -50,7 +50,6 @@ yy11:
 	if (yych >= 0x01) goto yy9;
 yy12:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy7;
 }
 #line 9 "input8.b.re"
diff --git a/re2c/test/input8.c b/re2c/test/input8.c
index ab8e41da..839a63f3 100644
--- a/re2c/test/input8.c
+++ b/re2c/test/input8.c
@@ -63,7 +63,6 @@ yy11:
 	if (yych >= 0x01) goto yy9;
 yy12:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy7;
 }
 #line 9 "input8.re"
diff --git a/re2c/test/input8.g.c b/re2c/test/input8.g.c
index 71f14653..e3b46ec1 100644
--- a/re2c/test/input8.g.c
+++ b/re2c/test/input8.g.c
@@ -50,7 +50,6 @@ yy11:
 	if (yych >= 0x01) goto yy9;
 yy12:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy7;
 }
 #line 9 "input8.g.re"
diff --git a/re2c/test/parse_date.b.c b/re2c/test/parse_date.b.c
index eca8bfb0..aeae880f 100644
--- a/re2c/test/parse_date.b.c
+++ b/re2c/test/parse_date.b.c
@@ -904,7 +904,7 @@ yy9:
 	if (yych <= '9') goto yy58;
 	goto yy5;
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -3020,7 +3020,7 @@ yy101:
 	}
 #line 3022 "parse_date.b.c"
 yy102:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy103:
 	yych = *++YYCURSOR;
@@ -8058,7 +8058,7 @@ yy387:
 		}
 	}
 yy388:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy251;
 yy389:
 	yych = *++YYCURSOR;
@@ -9784,7 +9784,7 @@ yy519:
 	if (yych == 's') goto yy689;
 	goto yy53;
 yy520:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy363;
 yy521:
 	yych = *++YYCURSOR;
@@ -11056,7 +11056,7 @@ yy674:
 	yych = *++YYCURSOR;
 	if (yych != 'I') goto yy505;
 yy675:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy505;
 yy676:
 	yych = *++YYCURSOR;
@@ -11181,7 +11181,7 @@ yy692:
 	if (yych == 'y') goto yy520;
 	goto yy53;
 yy693:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy223;
 yy694:
 	yych = *++YYCURSOR;
@@ -11288,7 +11288,7 @@ yy703:
 	default:	goto yy282;
 	}
 yy704:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy275;
 yy705:
 	yyaccept = 7;
@@ -11342,7 +11342,7 @@ yy710:
 	if (yych <= '9') goto yy801;
 	goto yy53;
 yy711:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy129;
 yy712:
 	yych = *++YYCURSOR;
@@ -11549,7 +11549,7 @@ yy749:
 	if (yych == 'd') goto yy834;
 	goto yy560;
 yy750:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy474;
 yy751:
 	++YYCURSOR;
@@ -11985,7 +11985,7 @@ yy800:
 	if (yych == '0') goto yy878;
 	goto yy586;
 yy801:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy586;
 yy802:
 	++YYCURSOR;
@@ -12362,10 +12362,10 @@ yy834:
 	if (yych == 'a') goto yy903;
 	goto yy560;
 yy835:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy638;
 yy836:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy197;
 yy837:
 	yych = *++YYCURSOR;
@@ -12559,7 +12559,7 @@ yy852:
 		goto yy505;
 	}
 yy853:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy775;
 yy854:
 	yyaccept = 22;
@@ -12818,7 +12818,7 @@ yy878:
 		}
 	}
 yy879:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy803;
 yy880:
 	yych = *++YYCURSOR;
@@ -13415,7 +13415,7 @@ yy954:
 		}
 	}
 yy955:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy855;
 yy956:
 	yyaccept = 22;
@@ -13607,7 +13607,7 @@ yy981:
 	if (yych <= '2') goto yy1000;
 	goto yy53;
 yy982:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy876;
 yy983:
 	yych = *++YYCURSOR;
@@ -13871,7 +13871,7 @@ yy1021:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy1020;
 yy1022:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1020;
 yy1023:
 	yych = *++YYCURSOR;
@@ -14036,7 +14036,7 @@ yy1048:
 	if (yych <= '/') goto yy1043;
 	if (yych >= ':') goto yy1043;
 yy1049:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1043;
 yy1050:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/parse_date.c b/re2c/test/parse_date.c
index eaef8cc0..3f39db89 100644
--- a/re2c/test/parse_date.c
+++ b/re2c/test/parse_date.c
@@ -935,7 +935,7 @@ yy9:
 	default:	goto yy5;
 	}
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -4136,7 +4136,7 @@ yy101:
 	}
 #line 4138 "parse_date.c"
 yy102:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy103:
 	yych = *++YYCURSOR;
@@ -15051,7 +15051,7 @@ yy387:
 	default:	goto yy192;
 	}
 yy388:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy251;
 yy389:
 	yych = *++YYCURSOR;
@@ -17442,7 +17442,7 @@ yy519:
 	default:	goto yy53;
 	}
 yy520:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy363;
 yy521:
 	yych = *++YYCURSOR;
@@ -19122,7 +19122,7 @@ yy674:
 	default:	goto yy505;
 	}
 yy675:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy505;
 yy676:
 	yych = *++YYCURSOR;
@@ -19299,7 +19299,7 @@ yy692:
 	default:	goto yy53;
 	}
 yy693:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy223;
 yy694:
 	yych = *++YYCURSOR;
@@ -19412,7 +19412,7 @@ yy703:
 	default:	goto yy282;
 	}
 yy704:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy275;
 yy705:
 	yyaccept = 7;
@@ -19530,7 +19530,7 @@ yy710:
 	default:	goto yy53;
 	}
 yy711:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy129;
 yy712:
 	yych = *++YYCURSOR;
@@ -19803,7 +19803,7 @@ yy749:
 	default:	goto yy560;
 	}
 yy750:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy474;
 yy751:
 	++YYCURSOR;
@@ -20387,7 +20387,7 @@ yy800:
 	default:	goto yy586;
 	}
 yy801:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy586;
 yy802:
 	++YYCURSOR;
@@ -20901,10 +20901,10 @@ yy834:
 	default:	goto yy560;
 	}
 yy835:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy638;
 yy836:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy197;
 yy837:
 	yych = *++YYCURSOR;
@@ -21079,7 +21079,7 @@ yy852:
 	default:	goto yy505;
 	}
 yy853:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy775;
 yy854:
 	yyaccept = 22;
@@ -21475,7 +21475,7 @@ yy878:
 	default:	goto yy586;
 	}
 yy879:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy803;
 yy880:
 	yych = *++YYCURSOR;
@@ -22436,7 +22436,7 @@ yy954:
 	default:	goto yy855;
 	}
 yy955:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy855;
 yy956:
 	yyaccept = 22;
@@ -22846,7 +22846,7 @@ yy981:
 	default:	goto yy53;
 	}
 yy982:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy876;
 yy983:
 	yych = *++YYCURSOR;
@@ -23471,7 +23471,7 @@ yy1021:
 	default:	goto yy1020;
 	}
 yy1022:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1020;
 yy1023:
 	yych = *++YYCURSOR;
@@ -23787,7 +23787,7 @@ yy1048:
 	default:	goto yy1043;
 	}
 yy1049:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1043;
 yy1050:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/parse_date.db.c b/re2c/test/parse_date.db.c
index 18e534a5..c179fadb 100644
--- a/re2c/test/parse_date.db.c
+++ b/re2c/test/parse_date.db.c
@@ -934,7 +934,7 @@ yy9:
 	goto yy5;
 yy10:
 	YYDEBUG(10, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	YYDEBUG(11, *YYCURSOR);
@@ -3295,7 +3295,7 @@ yy101:
 #line 3296 "parse_date.db.c"
 yy102:
 	YYDEBUG(102, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy103:
 	YYDEBUG(103, *YYCURSOR);
@@ -11467,7 +11467,7 @@ yy534:
 	goto yy53;
 yy535:
 	YYDEBUG(535, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy372;
 yy536:
 	YYDEBUG(536, *YYCURSOR);
@@ -14180,7 +14180,7 @@ yy694:
 	if (yych != 'I') goto yy520;
 yy695:
 	YYDEBUG(695, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy520;
 yy696:
 	YYDEBUG(696, *YYCURSOR);
@@ -14323,7 +14323,7 @@ yy712:
 	goto yy53;
 yy713:
 	YYDEBUG(713, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy230;
 yy714:
 	YYDEBUG(714, *YYCURSOR);
@@ -15206,7 +15206,7 @@ yy760:
 	goto yy53;
 yy761:
 	YYDEBUG(761, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy128;
 yy762:
 	YYDEBUG(762, *YYCURSOR);
@@ -16160,7 +16160,7 @@ yy820:
 	goto yy489;
 yy821:
 	YYDEBUG(821, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy491;
 yy822:
 	YYDEBUG(822, *YYCURSOR);
@@ -17056,7 +17056,7 @@ yy912:
 	goto yy601;
 yy913:
 	YYDEBUG(913, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy601;
 yy914:
 	YYDEBUG(914, *YYCURSOR);
@@ -17522,7 +17522,7 @@ yy948:
 	}
 yy949:
 	YYDEBUG(949, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy683;
 yy950:
 	YYDEBUG(950, *YYCURSOR);
@@ -17532,7 +17532,7 @@ yy950:
 	goto yy53;
 yy951:
 	YYDEBUG(951, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy281;
 yy952:
 	YYDEBUG(952, *YYCURSOR);
@@ -17579,11 +17579,11 @@ yy957:
 	goto yy868;
 yy958:
 	YYDEBUG(958, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy489;
 yy959:
 	YYDEBUG(959, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy204;
 yy960:
 	YYDEBUG(960, *YYCURSOR);
@@ -17794,7 +17794,7 @@ yy975:
 	}
 yy976:
 	YYDEBUG(976, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy845;
 yy977:
 	YYDEBUG(977, *YYCURSOR);
@@ -18118,7 +18118,7 @@ yy1001:
 	}
 yy1002:
 	YYDEBUG(1002, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy916;
 yy1003:
 	YYDEBUG(1003, *YYCURSOR);
@@ -18261,7 +18261,7 @@ yy1021:
 	goto yy868;
 yy1022:
 	YYDEBUG(1022, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy640;
 yy1023:
 	YYDEBUG(1023, *YYCURSOR);
@@ -18808,7 +18808,7 @@ yy1079:
 	}
 yy1080:
 	YYDEBUG(1080, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy978;
 yy1081:
 	YYDEBUG(1081, *YYCURSOR);
@@ -19027,7 +19027,7 @@ yy1106:
 	goto yy53;
 yy1107:
 	YYDEBUG(1107, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy999;
 yy1108:
 	YYDEBUG(1108, *YYCURSOR);
@@ -19365,7 +19365,7 @@ yy1146:
 	if (yych != '0') goto yy1145;
 yy1147:
 	YYDEBUG(1147, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1145;
 yy1148:
 	YYDEBUG(1148, *YYCURSOR);
@@ -19603,7 +19603,7 @@ yy1177:
 	if (yych >= ':') goto yy1172;
 yy1178:
 	YYDEBUG(1178, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1172;
 yy1179:
 	YYDEBUG(1179, *YYCURSOR);
diff --git a/re2c/test/parse_date.g.c b/re2c/test/parse_date.g.c
index 41f5577d..b45d52a3 100644
--- a/re2c/test/parse_date.g.c
+++ b/re2c/test/parse_date.g.c
@@ -867,7 +867,7 @@ yy9:
 	if (yych <= '9') goto yy58;
 	goto yy5;
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -2842,7 +2842,7 @@ yy101:
 	}
 #line 2844 "parse_date.g.c"
 yy102:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy103:
 	yych = *++YYCURSOR;
@@ -8017,7 +8017,7 @@ yy387:
 		}
 	}
 yy388:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy251;
 yy389:
 	yych = *++YYCURSOR;
@@ -9766,7 +9766,7 @@ yy519:
 	if (yych == 's') goto yy689;
 	goto yy53;
 yy520:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy363;
 yy521:
 	yych = *++YYCURSOR;
@@ -11069,7 +11069,7 @@ yy674:
 	yych = *++YYCURSOR;
 	if (yych != 'I') goto yy505;
 yy675:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy505;
 yy676:
 	yych = *++YYCURSOR;
@@ -11194,7 +11194,7 @@ yy692:
 	if (yych == 'y') goto yy520;
 	goto yy53;
 yy693:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy223;
 yy694:
 	yych = *++YYCURSOR;
@@ -11301,7 +11301,7 @@ yy703:
 	default:	goto yy282;
 	}
 yy704:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy275;
 yy705:
 	yyaccept = 7;
@@ -11355,7 +11355,7 @@ yy710:
 	if (yych <= '9') goto yy801;
 	goto yy53;
 yy711:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy129;
 yy712:
 	yych = *++YYCURSOR;
@@ -11562,7 +11562,7 @@ yy749:
 	if (yych == 'd') goto yy834;
 	goto yy560;
 yy750:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy474;
 yy751:
 	++YYCURSOR;
@@ -12016,7 +12016,7 @@ yy800:
 	if (yych == '0') goto yy878;
 	goto yy586;
 yy801:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy586;
 yy802:
 	++YYCURSOR;
@@ -12393,10 +12393,10 @@ yy834:
 	if (yych == 'a') goto yy903;
 	goto yy560;
 yy835:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy638;
 yy836:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy197;
 yy837:
 	yych = *++YYCURSOR;
@@ -12590,7 +12590,7 @@ yy852:
 		goto yy505;
 	}
 yy853:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy775;
 yy854:
 	yyaccept = 22;
@@ -12878,7 +12878,7 @@ yy878:
 		}
 	}
 yy879:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy803;
 yy880:
 	yych = *++YYCURSOR;
@@ -13475,7 +13475,7 @@ yy954:
 		}
 	}
 yy955:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy855;
 yy956:
 	yyaccept = 22;
@@ -13667,7 +13667,7 @@ yy981:
 	if (yych <= '2') goto yy1000;
 	goto yy53;
 yy982:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy876;
 yy983:
 	yych = *++YYCURSOR;
@@ -13931,7 +13931,7 @@ yy1021:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy1020;
 yy1022:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1020;
 yy1023:
 	yych = *++YYCURSOR;
@@ -14096,7 +14096,7 @@ yy1048:
 	if (yych <= '/') goto yy1043;
 	if (yych >= ':') goto yy1043;
 yy1049:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1043;
 yy1050:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/parse_date.s.c b/re2c/test/parse_date.s.c
index 03bf2616..04289979 100644
--- a/re2c/test/parse_date.s.c
+++ b/re2c/test/parse_date.s.c
@@ -869,7 +869,7 @@ yy9:
 		goto yy5;
 	}
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -3002,7 +3002,7 @@ yy101:
 	}
 #line 3004 "parse_date.s.c"
 yy102:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy103:
 	yych = *++YYCURSOR;
@@ -8050,7 +8050,7 @@ yy387:
 		}
 	}
 yy388:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy251;
 yy389:
 	yych = *++YYCURSOR;
@@ -9775,7 +9775,7 @@ yy519:
 	if (yych == 's') goto yy689;
 	goto yy53;
 yy520:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy363;
 yy521:
 	yych = *++YYCURSOR;
@@ -11032,7 +11032,7 @@ yy674:
 	yych = *++YYCURSOR;
 	if (yych != 'I') goto yy505;
 yy675:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy505;
 yy676:
 	yych = *++YYCURSOR;
@@ -11157,7 +11157,7 @@ yy692:
 	if (yych == 'y') goto yy520;
 	goto yy53;
 yy693:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy223;
 yy694:
 	yych = *++YYCURSOR;
@@ -11264,7 +11264,7 @@ yy703:
 	default:	goto yy282;
 	}
 yy704:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy275;
 yy705:
 	yyaccept = 7;
@@ -11318,7 +11318,7 @@ yy710:
 	if (yych <= '9') goto yy801;
 	goto yy53;
 yy711:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy129;
 yy712:
 	yych = *++YYCURSOR;
@@ -11525,7 +11525,7 @@ yy749:
 	if (yych == 'd') goto yy834;
 	goto yy560;
 yy750:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy474;
 yy751:
 	++YYCURSOR;
@@ -11951,7 +11951,7 @@ yy800:
 	if (yych == '0') goto yy878;
 	goto yy586;
 yy801:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy586;
 yy802:
 	++YYCURSOR;
@@ -12328,10 +12328,10 @@ yy834:
 	if (yych == 'a') goto yy903;
 	goto yy560;
 yy835:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy638;
 yy836:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy197;
 yy837:
 	yych = *++YYCURSOR;
@@ -12525,7 +12525,7 @@ yy852:
 		goto yy505;
 	}
 yy853:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy775;
 yy854:
 	yyaccept = 22;
@@ -12791,7 +12791,7 @@ yy878:
 		}
 	}
 yy879:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy803;
 yy880:
 	yych = *++YYCURSOR;
@@ -13388,7 +13388,7 @@ yy954:
 		}
 	}
 yy955:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy855;
 yy956:
 	yyaccept = 22;
@@ -13580,7 +13580,7 @@ yy981:
 	if (yych <= '2') goto yy1000;
 	goto yy53;
 yy982:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy876;
 yy983:
 	yych = *++YYCURSOR;
@@ -13844,7 +13844,7 @@ yy1021:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy1020;
 yy1022:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1020;
 yy1023:
 	yych = *++YYCURSOR;
@@ -14009,7 +14009,7 @@ yy1048:
 	if (yych <= '/') goto yy1043;
 	if (yych >= ':') goto yy1043;
 yy1049:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1043;
 yy1050:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/parse_date_1_78.db.c b/re2c/test/parse_date_1_78.db.c
index 60e16157..7d6d7ec7 100644
--- a/re2c/test/parse_date_1_78.db.c
+++ b/re2c/test/parse_date_1_78.db.c
@@ -1026,7 +1026,7 @@ yy9:
 	}
 yy10:
 	YYDEBUG(10, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	YYDEBUG(11, *YYCURSOR);
@@ -3452,7 +3452,7 @@ yy104:
 #line 3453 "parse_date_1_78.db.c"
 yy105:
 	YYDEBUG(105, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy106:
 	YYDEBUG(106, *YYCURSOR);
@@ -12407,7 +12407,7 @@ yy574:
 	goto yy54;
 yy575:
 	YYDEBUG(575, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy393;
 yy576:
 	YYDEBUG(576, *YYCURSOR);
@@ -14915,7 +14915,7 @@ yy743:
 	if (yych != 'I') goto yy560;
 yy744:
 	YYDEBUG(744, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy560;
 yy745:
 	YYDEBUG(745, *YYCURSOR);
@@ -15059,7 +15059,7 @@ yy761:
 	goto yy54;
 yy762:
 	YYDEBUG(762, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy236;
 yy763:
 	YYDEBUG(763, *YYCURSOR);
@@ -15810,7 +15810,7 @@ yy810:
 	}
 yy811:
 	YYDEBUG(811, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy132;
 yy812:
 	YYDEBUG(812, *YYCURSOR);
@@ -16359,7 +16359,7 @@ yy849:
 	goto yy54;
 yy850:
 	YYDEBUG(850, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy528;
 yy851:
 	YYDEBUG(851, *YYCURSOR);
@@ -17069,7 +17069,7 @@ yy915:
 	goto yy651;
 yy916:
 	YYDEBUG(916, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy651;
 yy917:
 	YYDEBUG(917, *YYCURSOR);
@@ -17347,7 +17347,7 @@ yy950:
 	goto yy902;
 yy951:
 	YYDEBUG(951, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy732;
 yy952:
 	YYDEBUG(952, *YYCURSOR);
@@ -17357,7 +17357,7 @@ yy952:
 	goto yy54;
 yy953:
 	YYDEBUG(953, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy288;
 yy954:
 	YYDEBUG(954, *YYCURSOR);
@@ -17454,7 +17454,7 @@ yy963:
 #line 17455 "parse_date_1_78.db.c"
 yy965:
 	YYDEBUG(965, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy209;
 yy966:
 	YYDEBUG(966, *YYCURSOR);
@@ -17692,7 +17692,7 @@ yy983:
 	}
 yy984:
 	YYDEBUG(984, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy877;
 yy985:
 	YYDEBUG(985, *YYCURSOR);
@@ -18317,7 +18317,7 @@ yy1033:
 #line 18318 "parse_date_1_78.db.c"
 yy1034:
 	YYDEBUG(1034, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy682;
 yy1035:
 	YYDEBUG(1035, *YYCURSOR);
@@ -18907,7 +18907,7 @@ yy1085:
 	}
 yy1086:
 	YYDEBUG(1086, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1020;
 yy1087:
 	YYDEBUG(1087, *YYCURSOR);
@@ -19110,7 +19110,7 @@ yy1109:
 	}
 yy1110:
 	YYDEBUG(1110, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy986;
 yy1111:
 	YYDEBUG(1111, *YYCURSOR);
@@ -19469,7 +19469,7 @@ yy1147:
 	}
 yy1148:
 	YYDEBUG(1148, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1010;
 yy1149:
 	YYDEBUG(1149, *YYCURSOR);
@@ -19558,7 +19558,7 @@ yy1155:
 	goto yy54;
 yy1156:
 	YYDEBUG(1156, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1033;
 yy1157:
 	YYDEBUG(1157, *YYCURSOR);
@@ -19863,7 +19863,7 @@ yy1191:
 	if (yych != '0') goto yy1190;
 yy1192:
 	YYDEBUG(1192, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1190;
 yy1193:
 	YYDEBUG(1193, *YYCURSOR);
@@ -20124,7 +20124,7 @@ yy1225:
 	if (yych >= ':') goto yy1218;
 yy1226:
 	YYDEBUG(1226, *YYCURSOR);
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1218;
 yy1227:
 	YYDEBUG(1227, *YYCURSOR);
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 00411238..7fb5b481 100644
--- a/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c
+++ b/re2c/test/php20140822_zend_language_scanner.igcd--flex-syntax.c
@@ -2592,7 +2592,7 @@ yy140:
 		}
 yy141:
 		YYDEBUG(141, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy130;
 yy142:
 		YYDEBUG(142, *YYCURSOR);
@@ -3415,7 +3415,7 @@ yy245:
 }
 yy247:
 		YYDEBUG(247, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy192;
 yy248:
 		YYDEBUG(248, *YYCURSOR);
@@ -3802,7 +3802,7 @@ yy313:
 }
 yy315:
 		YYDEBUG(315, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy199;
 yy316:
 		YYDEBUG(316, *YYCURSOR);
@@ -4029,7 +4029,7 @@ yy344:
 }
 yy346:
 		YYDEBUG(346, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy257;
 yy347:
 		YYDEBUG(347, *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 64adabdf..895185a6 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
@@ -2592,7 +2592,7 @@ yy140:
 		}
 yy141:
 		YYDEBUG(141, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy130;
 yy142:
 		YYDEBUG(142, *YYCURSOR);
@@ -3415,7 +3415,7 @@ yy245:
 }
 yy247:
 		YYDEBUG(247, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy192;
 yy248:
 		YYDEBUG(248, *YYCURSOR);
@@ -3802,7 +3802,7 @@ yy313:
 }
 yy315:
 		YYDEBUG(315, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy199;
 yy316:
 		YYDEBUG(316, *YYCURSOR);
@@ -4029,7 +4029,7 @@ yy344:
 }
 yy346:
 		YYDEBUG(346, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy257;
 yy347:
 		YYDEBUG(347, *YYCURSOR);
diff --git a/re2c/test/php20150211_json_scanner.igc.c b/re2c/test/php20150211_json_scanner.igc.c
index 278a7925..8f15b145 100644
--- a/re2c/test/php20150211_json_scanner.igc.c
+++ b/re2c/test/php20150211_json_scanner.igc.c
@@ -209,7 +209,7 @@ yy8:
 yy9:
 			{ goto std; }
 yy10:
-			yych = *++YYCURSOR;
+			++YYCURSOR;
 			goto yy9;
 yy11:
 			yych = *++YYCURSOR;
diff --git a/re2c/test/php20150211_parse_date.ig.c b/re2c/test/php20150211_parse_date.ig.c
index bde1fded..9383ac31 100644
--- a/re2c/test/php20150211_parse_date.ig.c
+++ b/re2c/test/php20150211_parse_date.ig.c
@@ -965,7 +965,7 @@ yy9:
 		goto *yytarget[yych];
 	}
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -3713,7 +3713,7 @@ yy106:
 		return TIMELIB_RELATIVE;
 	}
 yy107:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy108:
 	yych = *++YYCURSOR;
@@ -16286,7 +16286,7 @@ yy590:
 	if (yych == 's') goto yy781;
 	goto yy56;
 yy591:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy402;
 yy592:
 	yych = *++YYCURSOR;
@@ -17745,7 +17745,7 @@ yy670:
 	if (yych == ':') goto yy486;
 	goto yy669;
 yy671:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy669;
 yy672:
 	yyaccept = 17;
@@ -19615,7 +19615,7 @@ yy766:
 	yych = *++YYCURSOR;
 	if (yych != 'I') goto yy576;
 yy767:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy576;
 yy768:
 	yych = *++YYCURSOR;
@@ -19813,7 +19813,7 @@ yy784:
 	if (yych == 'y') goto yy591;
 	goto yy56;
 yy785:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy240;
 yy786:
 	yych = *++YYCURSOR;
@@ -21635,7 +21635,7 @@ yy872:
 	if (yych <= '9') goto yy988;
 	goto yy56;
 yy873:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy544;
 yy874:
 	++YYCURSOR;
@@ -22320,7 +22320,7 @@ yy933:
 	if (yych == 'y') goto yy951;
 	goto yy925;
 yy934:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy136;
 yy935:
 	yyaccept = 17;
@@ -22376,7 +22376,7 @@ yy940:
 	if (yych == '0') goto yy1039;
 	goto yy673;
 yy941:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy673;
 yy942:
 	yyaccept = 17;
@@ -22679,7 +22679,7 @@ yy975:
 	if (yych == ' ') goto yy810;
 	goto yy925;
 yy976:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy755;
 yy977:
 	yych = *++YYCURSOR;
@@ -22687,7 +22687,7 @@ yy977:
 	if (yych == 'w') goto yy1063;
 	goto yy56;
 yy978:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy294;
 yy979:
 	yych = *++YYCURSOR;
@@ -22790,7 +22790,7 @@ yy988:
 		return TIMELIB_DATE_FULL_POINTED;
 	}
 yy990:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy213;
 yy991:
 	yych = *++YYCURSOR;
@@ -23093,7 +23093,7 @@ yy1008:
 		goto yy576;
 	}
 yy1009:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy900;
 yy1010:
 	yyaccept = 26;
@@ -23974,7 +23974,7 @@ yy1058:
 		goto yy1046;
 	}
 yy1059:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy704;
 yy1060:
 	yyaccept = 18;
@@ -24804,7 +24804,7 @@ yy1115:
 		goto yy56;
 	}
 yy1116:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1046;
 yy1117:
 	yych = *++YYCURSOR;
@@ -25096,7 +25096,7 @@ yy1141:
 		goto *yytarget[yych];
 	}
 yy1142:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1011;
 yy1143:
 	yyaccept = 26;
@@ -25546,7 +25546,7 @@ yy1181:
 		goto yy56;
 	}
 yy1182:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1035;
 yy1183:
 	yych = *++YYCURSOR;
@@ -25814,7 +25814,7 @@ yy1210:
 		goto yy56;
 	}
 yy1211:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1097;
 yy1212:
 	yych = *++YYCURSOR;
@@ -26057,7 +26057,7 @@ yy1232:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy1231;
 yy1233:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1231;
 yy1234:
 	yych = *++YYCURSOR;
@@ -26377,7 +26377,7 @@ yy1266:
 	if (yych <= '/') goto yy1259;
 	if (yych >= ':') goto yy1259;
 yy1267:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1259;
 yy1268:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/php20150211_parse_date_crlf.ig.c b/re2c/test/php20150211_parse_date_crlf.ig.c
index 2c7c7634..7f5aeebb 100644
--- a/re2c/test/php20150211_parse_date_crlf.ig.c
+++ b/re2c/test/php20150211_parse_date_crlf.ig.c
@@ -965,7 +965,7 @@ yy9:
 		goto *yytarget[yych];
 	}
 yy10:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy11:
 	yyaccept = 1;
@@ -3713,7 +3713,7 @@ yy106:
 		return TIMELIB_RELATIVE;
 	}
 yy107:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy18;
 yy108:
 	yych = *++YYCURSOR;
@@ -16286,7 +16286,7 @@ yy590:
 	if (yych == 's') goto yy781;
 	goto yy56;
 yy591:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy402;
 yy592:
 	yych = *++YYCURSOR;
@@ -17745,7 +17745,7 @@ yy670:
 	if (yych == ':') goto yy486;
 	goto yy669;
 yy671:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy669;
 yy672:
 	yyaccept = 17;
@@ -19615,7 +19615,7 @@ yy766:
 	yych = *++YYCURSOR;
 	if (yych != 'I') goto yy576;
 yy767:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy576;
 yy768:
 	yych = *++YYCURSOR;
@@ -19813,7 +19813,7 @@ yy784:
 	if (yych == 'y') goto yy591;
 	goto yy56;
 yy785:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy240;
 yy786:
 	yych = *++YYCURSOR;
@@ -21635,7 +21635,7 @@ yy872:
 	if (yych <= '9') goto yy988;
 	goto yy56;
 yy873:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy544;
 yy874:
 	++YYCURSOR;
@@ -22320,7 +22320,7 @@ yy933:
 	if (yych == 'y') goto yy951;
 	goto yy925;
 yy934:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy136;
 yy935:
 	yyaccept = 17;
@@ -22376,7 +22376,7 @@ yy940:
 	if (yych == '0') goto yy1039;
 	goto yy673;
 yy941:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy673;
 yy942:
 	yyaccept = 17;
@@ -22679,7 +22679,7 @@ yy975:
 	if (yych == ' ') goto yy810;
 	goto yy925;
 yy976:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy755;
 yy977:
 	yych = *++YYCURSOR;
@@ -22687,7 +22687,7 @@ yy977:
 	if (yych == 'w') goto yy1063;
 	goto yy56;
 yy978:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy294;
 yy979:
 	yych = *++YYCURSOR;
@@ -22790,7 +22790,7 @@ yy988:
 		return TIMELIB_DATE_FULL_POINTED;
 	}
 yy990:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy213;
 yy991:
 	yych = *++YYCURSOR;
@@ -23093,7 +23093,7 @@ yy1008:
 		goto yy576;
 	}
 yy1009:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy900;
 yy1010:
 	yyaccept = 26;
@@ -23974,7 +23974,7 @@ yy1058:
 		goto yy1046;
 	}
 yy1059:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy704;
 yy1060:
 	yyaccept = 18;
@@ -24804,7 +24804,7 @@ yy1115:
 		goto yy56;
 	}
 yy1116:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1046;
 yy1117:
 	yych = *++YYCURSOR;
@@ -25096,7 +25096,7 @@ yy1141:
 		goto *yytarget[yych];
 	}
 yy1142:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1011;
 yy1143:
 	yyaccept = 26;
@@ -25546,7 +25546,7 @@ yy1181:
 		goto yy56;
 	}
 yy1182:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1035;
 yy1183:
 	yych = *++YYCURSOR;
@@ -25814,7 +25814,7 @@ yy1210:
 		goto yy56;
 	}
 yy1211:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1097;
 yy1212:
 	yych = *++YYCURSOR;
@@ -26057,7 +26057,7 @@ yy1232:
 	yych = *++YYCURSOR;
 	if (yych != '0') goto yy1231;
 yy1233:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1231;
 yy1234:
 	yych = *++YYCURSOR;
@@ -26377,7 +26377,7 @@ yy1266:
 	if (yych <= '/') goto yy1259;
 	if (yych >= ':') goto yy1259;
 yy1267:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy1259;
 yy1268:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c b/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c
index 69529ea7..ac63738f 100644
--- a/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c
+++ b/re2c/test/php20150211_parse_iso_intervals.ig--skeleton.c
@@ -590,7 +590,6 @@ yy36:
         goto yy10;
 yy37:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy10;
 yy38:
         YYSKIP ();
diff --git a/re2c/test/php20150211_parse_iso_intervals.ig.c b/re2c/test/php20150211_parse_iso_intervals.ig.c
index d189294a..b86ca923 100644
--- a/re2c/test/php20150211_parse_iso_intervals.ig.c
+++ b/re2c/test/php20150211_parse_iso_intervals.ig.c
@@ -709,7 +709,7 @@ yy36:
 	if (yych <= '9') goto yy44;
 	goto yy10;
 yy37:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy10;
 yy38:
 	yych = *++YYCURSOR;
diff --git a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
index 461286e5..3b3e0aef 100644
--- a/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
+++ b/re2c/test/php20150211_pdo_sql_parser.ig--skeleton.c
@@ -481,7 +481,6 @@ yy45:
         goto yy38;
 yy46:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy38;
 
     }
diff --git a/re2c/test/php20150211_pdo_sql_parser.ig.c b/re2c/test/php20150211_pdo_sql_parser.ig.c
index 5fd4fa50..8abe9151 100644
--- a/re2c/test/php20150211_pdo_sql_parser.ig.c
+++ b/re2c/test/php20150211_pdo_sql_parser.ig.c
@@ -355,7 +355,6 @@ yy45:
 	goto yy38;
 yy46:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy38;
 }
 
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 5044e831..c3c38373 100644
--- a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c
+++ b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig--skeleton.c
@@ -488,7 +488,6 @@ yy47:
         goto yy40;
 yy48:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy40;
 
     }
diff --git a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
index 265b0f5c..4300cb3a 100644
--- a/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
+++ b/re2c/test/php20150211_pdo_sql_parser_trimmed.ig.c
@@ -311,7 +311,6 @@ yy47:
 	goto yy40;
 yy48:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy40;
 }
 
diff --git a/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c b/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
index 1ba259e1..f5878280 100644
--- a/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
+++ b/re2c/test/php20150211_phpdbg_lexer.igcd--flex-syntax.c
@@ -202,7 +202,7 @@ yy12:
 		goto yy4;
 yy13:
 		YYDEBUG(13, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy8;
 yy14:
 		YYDEBUG(14, *YYCURSOR);
@@ -1399,7 +1399,7 @@ yy130:
 		goto yy125;
 yy131:
 		YYDEBUG(131, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy129;
 yy132:
 		YYDEBUG(132, *YYCURSOR);
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 c2f8df2f..0ce5453a 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
@@ -1938,7 +1938,7 @@ yy131:
 }
 yy132:
 		YYDEBUG(132, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy131;
 yy133:
 		YYDEBUG(133, *YYCURSOR);
@@ -2358,7 +2358,7 @@ yy166:
 		}
 yy168:
 		YYDEBUG(168, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy157;
 yy169:
 		YYDEBUG(169, *YYCURSOR);
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 bcdd49cd..320f062b 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
@@ -1959,7 +1959,6 @@ yy135:
         continue;
 yy136:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy135;
 yy137:
         YYSKIP ();
@@ -2473,7 +2472,6 @@ yy171:
         }
 yy173:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy162;
 yy174:
         YYSKIP ();
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 c11d0cd6..7d6ed745 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
@@ -870,7 +870,7 @@ yy129:
 yy131:
 	{}
 yy132:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy131;
 yy133:
 	++YYCURSOR;
@@ -1226,7 +1226,7 @@ yy166:
 	default:	goto yy136;
 	}
 yy168:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy157;
 yy169:
 	yych = *++YYCURSOR;
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 a11f22be..28d0396d 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
@@ -1084,7 +1084,7 @@ yy129:
 yy131:
 		{}
 yy132:
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy131;
 yy133:
 		++YYCURSOR;
@@ -1423,7 +1423,7 @@ yy166:
 			}
 		}
 yy168:
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy157;
 yy169:
 		yych = *++YYCURSOR;
diff --git a/re2c/test/php20150211_zend_ini_scanner_trimmed_minimal_wb_bug.iwb.c b/re2c/test/php20150211_zend_ini_scanner_trimmed_minimal_wb_bug.iwb.c
index 43a8bf48..b8639503 100644
--- a/re2c/test/php20150211_zend_ini_scanner_trimmed_minimal_wb_bug.iwb.c
+++ b/re2c/test/php20150211_zend_ini_scanner_trimmed_minimal_wb_bug.iwb.c
@@ -46,7 +46,7 @@
 yy3:
 	{ default action }
 yy4:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy3;
 yy5:
 	++YYCURSOR;
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 6519dd39..0ea07c8c 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
@@ -2290,7 +2290,7 @@ yy103:
 		}
 yy104:
 		YYDEBUG(104, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy93;
 yy105:
 		YYDEBUG(105, *YYCURSOR);
@@ -3549,7 +3549,7 @@ yy207:
 }
 yy209:
 		YYDEBUG(209, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy154;
 yy210:
 		YYDEBUG(210, *YYCURSOR);
@@ -4479,7 +4479,7 @@ yy309:
 }
 yy311:
 		YYDEBUG(311, *YYCURSOR);
-		yych = *++YYCURSOR;
+		++YYCURSOR;
 		goto yy219;
 yy312:
 		YYDEBUG(312, *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 0c0a899e..1ba93f49 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
@@ -1516,7 +1516,6 @@ yy108:
         }
 yy109:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy98;
 yy110:
         YYSKIP ();
@@ -2623,7 +2622,6 @@ yy212:
         continue;
 yy214:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy159;
 yy215:
         YYSKIP ();
@@ -3435,7 +3433,6 @@ yy314:
         continue;
 yy316:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy224;
 yy317:
         YYSKIP ();
diff --git a/re2c/test/repeater2.c b/re2c/test/repeater2.c
index d2959e21..366d2a27 100644
--- a/re2c/test/repeater2.c
+++ b/re2c/test/repeater2.c
@@ -178,14 +178,13 @@ yy38:
 #line 179 "repeater2.c"
 yy39:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy38;
 }
 #line 31 "repeater2.re"
 
 
 
-#line 189 "repeater2.c"
+#line 188 "repeater2.c"
 {
 	YYCTYPE yych;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -199,13 +198,13 @@ yy43:
 	++YYCURSOR;
 #line 34 "repeater2.re"
 	{}
-#line 203 "repeater2.c"
+#line 202 "repeater2.c"
 }
 #line 35 "repeater2.re"
 
 
 
-#line 209 "repeater2.c"
+#line 208 "repeater2.c"
 {
 	YYCTYPE yych;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
@@ -219,13 +218,13 @@ yy48:
 	++YYCURSOR;
 #line 38 "repeater2.re"
 	{}
-#line 223 "repeater2.c"
+#line 222 "repeater2.c"
 }
 #line 39 "repeater2.re"
 
 
 
-#line 229 "repeater2.c"
+#line 228 "repeater2.c"
 {
 	YYCTYPE yych;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
@@ -250,7 +249,7 @@ yy54:
 yy55:
 #line 42 "repeater2.re"
 	{}
-#line 254 "repeater2.c"
+#line 253 "repeater2.c"
 yy56:
 	yych = *++YYCURSOR;
 	switch (yych) {
@@ -265,14 +264,13 @@ yy57:
 	}
 yy58:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy55;
 }
 #line 43 "repeater2.re"
 
 
 
-#line 276 "repeater2.c"
+#line 274 "repeater2.c"
 {
 	YYCTYPE yych;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
@@ -310,13 +308,13 @@ yy66:
 	++YYCURSOR;
 #line 46 "repeater2.re"
 	{}
-#line 314 "repeater2.c"
+#line 312 "repeater2.c"
 }
 #line 47 "repeater2.re"
 
 
 
-#line 320 "repeater2.c"
+#line 318 "repeater2.c"
 {
 	YYCTYPE yych;
 	if ((YYLIMIT - YYCURSOR) < 5) YYFILL(5);
@@ -354,7 +352,7 @@ yy75:
 	++YYCURSOR;
 #line 50 "repeater2.re"
 	{}
-#line 358 "repeater2.c"
+#line 356 "repeater2.c"
 }
 #line 51 "repeater2.re"
 
diff --git a/re2c/test/scanner.--skeleton.c b/re2c/test/scanner.--skeleton.c
index 078f84f9..7a1dbdba 100644
--- a/re2c/test/scanner.--skeleton.c
+++ b/re2c/test/scanner.--skeleton.c
@@ -583,7 +583,6 @@ yy46:
         continue;
 yy47:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy46;
 yy48:
         YYSKIP ();
@@ -1971,7 +1970,6 @@ yy169:
         }
 yy170:
         YYSKIP ();
-        yych = YYPEEK ();
         goto yy151;
 yy171:
         YYSKIP ();
diff --git a/re2c/test/scanner.c b/re2c/test/scanner.c
index 639a3297..84919ee7 100644
--- a/re2c/test/scanner.c
+++ b/re2c/test/scanner.c
@@ -433,7 +433,7 @@ yy46:
 				  RETURN(CLOSE); }
 #line 435 "scanner.c"
 yy47:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy46;
 yy48:
 	++YYCURSOR;
@@ -1357,7 +1357,7 @@ yy169:
 	default:	goto yy156;
 	}
 yy170:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy151;
 yy171:
 	++YYCURSOR;
diff --git a/re2c/test/scanner.fs.c b/re2c/test/scanner.fs.c
index c35d6d58..72488ba9 100644
--- a/re2c/test/scanner.fs.c
+++ b/re2c/test/scanner.fs.c
@@ -405,7 +405,7 @@ yy46:
 				  RETURN(CLOSE); }
 #line 407 "scanner.fs.c"
 yy47:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy46;
 yy48:
 	++YYCURSOR;
@@ -1214,7 +1214,7 @@ yyFillLabel33:
 		}
 	}
 yy170:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy151;
 yy171:
 	++YYCURSOR;
diff --git a/re2c/test/scanner.s.c b/re2c/test/scanner.s.c
index 526d4e33..4c4ec3c6 100644
--- a/re2c/test/scanner.s.c
+++ b/re2c/test/scanner.s.c
@@ -363,7 +363,7 @@ yy46:
 				  RETURN(CLOSE); }
 #line 365 "scanner.s.c"
 yy47:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy46;
 yy48:
 	++YYCURSOR;
@@ -1118,7 +1118,7 @@ yy169:
 		}
 	}
 yy170:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy151;
 yy171:
 	++YYCURSOR;
diff --git a/re2c/test/scanner_re2c.bi.c b/re2c/test/scanner_re2c.bi.c
index f25472b5..e9f5440f 100644
--- a/re2c/test/scanner_re2c.bi.c
+++ b/re2c/test/scanner_re2c.bi.c
@@ -1758,7 +1758,7 @@ yy259:
 					goto code;
 				}
 yy260:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy259;
 yy261:
 	++YYCURSOR;
@@ -2434,7 +2434,7 @@ yy359:
 		}
 	}
 yy360:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy341;
 yy361:
 	++YYCURSOR;
diff --git a/re2c/test/scanner_re2c_default.bi.c b/re2c/test/scanner_re2c_default.bi.c
index d6a5ab40..c3db5a5e 100644
--- a/re2c/test/scanner_re2c_default.bi.c
+++ b/re2c/test/scanner_re2c_default.bi.c
@@ -1758,7 +1758,7 @@ yy259:
 					goto code;
 				}
 yy260:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy259;
 yy261:
 	++YYCURSOR;
@@ -2440,7 +2440,7 @@ yy361:
 		}
 	}
 yy362:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy343;
 yy363:
 	++YYCURSOR;
diff --git a/re2c/test/tags/conf1.i--tags--input(custom).c b/re2c/test/tags/conf1.i--tags--input(custom).c
index e89fd8c2..7a6d9509 100644
--- a/re2c/test/tags/conf1.i--tags--input(custom).c
+++ b/re2c/test/tags/conf1.i--tags--input(custom).c
@@ -284,7 +284,6 @@ yy19:
 	}
 yy20:
 	YYSKIP ();
-	yych = YYPEEK ();
 	goto yy17;
 }
 
diff --git a/re2c/test/tags/conf1.i--tags.c b/re2c/test/tags/conf1.i--tags.c
index db32fc86..18f9af17 100644
--- a/re2c/test/tags/conf1.i--tags.c
+++ b/re2c/test/tags/conf1.i--tags.c
@@ -263,7 +263,6 @@ yy19:
 	}
 yy20:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy17;
 }
 
diff --git a/re2c/test/tags/conf3.i--tags--input(custom).c b/re2c/test/tags/conf3.i--tags--input(custom).c
index 68fc4862..1eb36914 100644
--- a/re2c/test/tags/conf3.i--tags--input(custom).c
+++ b/re2c/test/tags/conf3.i--tags--input(custom).c
@@ -293,7 +293,6 @@ yy19:
 	}
 yy20:
 	YYSKIP ();
-	yych = YYPEEK ();
 	goto yy17;
 }
 
diff --git a/re2c/test/tags/conf3.i--tags.c b/re2c/test/tags/conf3.i--tags.c
index a9850e5f..16449399 100644
--- a/re2c/test/tags/conf3.i--tags.c
+++ b/re2c/test/tags/conf3.i--tags.c
@@ -272,7 +272,6 @@ yy19:
 	}
 yy20:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy17;
 }
 
diff --git a/re2c/test/tags/exponential_bottoms.i--tags.c b/re2c/test/tags/exponential_bottoms.i--tags.c
index 3b1de99a..597a2bad 100644
--- a/re2c/test/tags/exponential_bottoms.i--tags.c
+++ b/re2c/test/tags/exponential_bottoms.i--tags.c
@@ -53,7 +53,6 @@ yy4:
 yy5:
 	++YYCURSOR;
 	yyt1 = NULL;
-	yych = *YYCURSOR;
 	goto yy2;
 }
 
diff --git a/re2c/test/tags/fallback1.i--tags.c b/re2c/test/tags/fallback1.i--tags.c
index e9deac55..97f02112 100644
--- a/re2c/test/tags/fallback1.i--tags.c
+++ b/re2c/test/tags/fallback1.i--tags.c
@@ -65,7 +65,7 @@ yy8:
 	default:	goto yy5;
 	}
 yy9:
-	yych = *++YYCURSOR;
+	++YYCURSOR;
 	goto yy7;
 yy10:
 	++YYCURSOR;
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 d11efafc..d9fb4a06 100644
--- a/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c
+++ b/re2c/test/tags/mapping1.i--tags--non-bijective-mapping.c
@@ -65,7 +65,6 @@ yy9:
 	}
 yy10:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy6;
 }
 
diff --git a/re2c/test/tags/mapping1.i--tags.c b/re2c/test/tags/mapping1.i--tags.c
index d11efafc..d9fb4a06 100644
--- a/re2c/test/tags/mapping1.i--tags.c
+++ b/re2c/test/tags/mapping1.i--tags.c
@@ -65,7 +65,6 @@ yy9:
 	}
 yy10:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy6;
 }
 
diff --git a/re2c/test/tags/minimization.i.c b/re2c/test/tags/minimization.i.c
index 0fa941b5..cd16044a 100644
--- a/re2c/test/tags/minimization.i.c
+++ b/re2c/test/tags/minimization.i.c
@@ -65,7 +65,6 @@ yy14:
 yy15:
 	++YYCURSOR;
 	yyt1 = NULL;
-	yych = *YYCURSOR;
 	goto yy14;
 }
 
diff --git a/re2c/test/tags/topsort2.i--tags.c b/re2c/test/tags/topsort2.i--tags.c
index 92fcd038..e0650ef3 100644
--- a/re2c/test/tags/topsort2.i--tags.c
+++ b/re2c/test/tags/topsort2.i--tags.c
@@ -59,7 +59,6 @@ yy8:
 	goto yy2;
 yy9:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy2;
 }
 
diff --git a/re2c/test/wunreachable_rules.i.c b/re2c/test/wunreachable_rules.i.c
index ec93e39b..6d7c2a7e 100644
--- a/re2c/test/wunreachable_rules.i.c
+++ b/re2c/test/wunreachable_rules.i.c
@@ -22,7 +22,6 @@ yy4:
 	{ 0 }
 yy5:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy4;
 }
 
@@ -56,7 +55,6 @@ yy11:
 	}
 yy12:
 	++YYCURSOR;
-	yych = *YYCURSOR;
 	goto yy10;
 }
 
-- 
2.40.0