From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Fri, 27 Nov 2015 13:58:29 +0000 (+0000)
Subject: Use local re2c (in '$(top_bulddir)') rather than system re2c for 'make bootstrap'.
X-Git-Tag: 0.15.3~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1872278498b2cfa6210edc023d98563049145c6d;p=re2c

Use local re2c (in '$(top_bulddir)') rather than system re2c for 'make bootstrap'.

Correct behaviour was broken by commit 38f526d04415adb7b5e6bca228fc26409833f5c3.
---

diff --git a/re2c/Makefile.am b/re2c/Makefile.am
index 083c1627..a2fde63f 100644
--- a/re2c/Makefile.am
+++ b/re2c/Makefile.am
@@ -214,7 +214,7 @@ $(BOOTSTRAP_PARSER): $(CUSTOM_PARSER)
 .re.cc:
 	@if test -x $(RE2C); \
 	then \
-		$(RE2C) $(RE2CFLAGS) -o $@ $< && \
+		$(top_builddir)/$(RE2C) $(RE2CFLAGS) -o $@ $< && \
 		cp $@ $(top_srcdir)/bootstrap/$@; \
 	else \
 		cp $(top_srcdir)/bootstrap/$@ $@; \
diff --git a/re2c/bootstrap/src/conf/parse_opts.cc b/re2c/bootstrap/src/conf/parse_opts.cc
index 449b1487..19e05cb0 100644
--- a/re2c/bootstrap/src/conf/parse_opts.cc
+++ b/re2c/bootstrap/src/conf/parse_opts.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Mon Nov 23 21:19:03 2015 */
+/* Generated by re2c 0.15.2 on Fri Nov 27 13:55:15 2015*/
 #line 1 "../src/conf/parse_opts.re"
 #include <stdio.h>
 
@@ -69,7 +69,6 @@ opt:
 		128, 128, 128, 128, 128, 128, 128, 128, 
 		128, 128, 128, 128, 128, 128, 128, 128, 
 	};
-
 	yych = (YYCTYPE)*YYCURSOR;
 	if (yych <= 0x00) goto yy2;
 	if (yych == '-') goto yy5;
@@ -82,7 +81,7 @@ yy3:
 		error ("bad option: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 86 "src/conf/parse_opts.cc"
+#line 85 "src/conf/parse_opts.cc"
 yy4:
 	yyaccept = 0;
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -97,7 +96,7 @@ yy5:
 	}
 #line 61 "../src/conf/parse_opts.re"
 	{ goto opt_short; }
-#line 101 "src/conf/parse_opts.cc"
+#line 100 "src/conf/parse_opts.cc"
 yy7:
 	yyaccept = 1;
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
@@ -110,18 +109,18 @@ yy7:
 yy8:
 #line 66 "../src/conf/parse_opts.re"
 	{ option = Warn::W;        goto opt_warn; }
-#line 114 "src/conf/parse_opts.cc"
+#line 113 "src/conf/parse_opts.cc"
 yy9:
 	++YYCURSOR;
 	if ((yych = (YYCTYPE)*YYCURSOR) <= 0x00) goto yy13;
 #line 62 "../src/conf/parse_opts.re"
 	{ goto opt_long; }
-#line 120 "src/conf/parse_opts.cc"
+#line 119 "src/conf/parse_opts.cc"
 yy11:
 	++YYCURSOR;
 #line 58 "../src/conf/parse_opts.re"
 	{ if (!opts.source ("<stdin>")) return EXIT_FAIL; goto opt; }
-#line 125 "src/conf/parse_opts.cc"
+#line 124 "src/conf/parse_opts.cc"
 yy13:
 	++YYCURSOR;
 #line 44 "../src/conf/parse_opts.re"
@@ -138,12 +137,12 @@ yy13:
 		}
 		goto end;
 	}
-#line 142 "src/conf/parse_opts.cc"
+#line 141 "src/conf/parse_opts.cc"
 yy15:
 	++YYCURSOR;
 #line 64 "../src/conf/parse_opts.re"
 	{ warn.set_all ();       goto opt; }
-#line 147 "src/conf/parse_opts.cc"
+#line 146 "src/conf/parse_opts.cc"
 yy17:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 'r') goto yy30;
@@ -169,7 +168,7 @@ yy19:
 yy22:
 #line 67 "../src/conf/parse_opts.re"
 	{ option = Warn::WNO;      goto opt_warn; }
-#line 173 "src/conf/parse_opts.cc"
+#line 172 "src/conf/parse_opts.cc"
 yy23:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'r') goto yy18;
@@ -184,7 +183,7 @@ yy23:
 	++YYCURSOR;
 #line 69 "../src/conf/parse_opts.re"
 	{ option = Warn::WNOERROR; goto opt_warn; }
-#line 188 "src/conf/parse_opts.cc"
+#line 187 "src/conf/parse_opts.cc"
 yy30:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'r') goto yy18;
@@ -198,12 +197,12 @@ yy30:
 	++YYCURSOR;
 #line 68 "../src/conf/parse_opts.re"
 	{ option = Warn::WERROR;   goto opt_warn; }
-#line 202 "src/conf/parse_opts.cc"
+#line 201 "src/conf/parse_opts.cc"
 yy36:
 	++YYCURSOR;
 #line 65 "../src/conf/parse_opts.re"
 	{ warn.set_all_error (); goto opt; }
-#line 207 "src/conf/parse_opts.cc"
+#line 206 "src/conf/parse_opts.cc"
 yy38:
 	++YYCURSOR;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -214,14 +213,14 @@ yy39:
 	++YYCURSOR;
 #line 59 "../src/conf/parse_opts.re"
 	{ if (!opts.source (*argv))     return EXIT_FAIL; goto opt; }
-#line 218 "src/conf/parse_opts.cc"
+#line 217 "src/conf/parse_opts.cc"
 }
 #line 70 "../src/conf/parse_opts.re"
 
 
 opt_warn:
 
-#line 225 "src/conf/parse_opts.cc"
+#line 224 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -241,7 +240,7 @@ yy45:
 		error ("bad warning: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 245 "src/conf/parse_opts.cc"
+#line 244 "src/conf/parse_opts.cc"
 yy46:
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
 	if (yych == 'o') goto yy162;
@@ -310,7 +309,7 @@ yy55:
 	++YYCURSOR;
 #line 84 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::UNREACHABLE_RULES,      option); goto opt; }
-#line 314 "src/conf/parse_opts.cc"
+#line 313 "src/conf/parse_opts.cc"
 yy72:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'f') goto yy52;
@@ -353,7 +352,7 @@ yy72:
 	++YYCURSOR;
 #line 83 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::UNDEFINED_CONTROL_FLOW, option); goto opt; }
-#line 357 "src/conf/parse_opts.cc"
+#line 356 "src/conf/parse_opts.cc"
 yy93:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'l') goto yy52;
@@ -382,7 +381,7 @@ yy93:
 	++YYCURSOR;
 #line 85 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::USELESS_ESCAPE,         option); goto opt; }
-#line 386 "src/conf/parse_opts.cc"
+#line 385 "src/conf/parse_opts.cc"
 yy107:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'a') goto yy52;
@@ -411,7 +410,7 @@ yy107:
 	++YYCURSOR;
 #line 82 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::SWAPPED_RANGE,          option); goto opt; }
-#line 415 "src/conf/parse_opts.cc"
+#line 414 "src/conf/parse_opts.cc"
 yy121:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 't') goto yy52;
@@ -450,7 +449,7 @@ yy121:
 	++YYCURSOR;
 #line 81 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::MATCH_EMPTY_STRING,     option); goto opt; }
-#line 454 "src/conf/parse_opts.cc"
+#line 453 "src/conf/parse_opts.cc"
 yy140:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'p') goto yy52;
@@ -495,7 +494,7 @@ yy140:
 	++YYCURSOR;
 #line 80 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::EMPTY_CHARACTER_CLASS,  option); goto opt; }
-#line 499 "src/conf/parse_opts.cc"
+#line 498 "src/conf/parse_opts.cc"
 yy162:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'n') goto yy52;
@@ -528,14 +527,14 @@ yy162:
 	++YYCURSOR;
 #line 79 "../src/conf/parse_opts.re"
 	{ warn.set (Warn::CONDITION_ORDER,        option); goto opt; }
-#line 532 "src/conf/parse_opts.cc"
+#line 531 "src/conf/parse_opts.cc"
 }
 #line 86 "../src/conf/parse_opts.re"
 
 
 opt_short:
 
-#line 539 "src/conf/parse_opts.cc"
+#line 538 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -605,7 +604,7 @@ yy180:
 	++YYCURSOR;
 #line 95 "../src/conf/parse_opts.re"
 	{ goto opt; }
-#line 609 "src/conf/parse_opts.cc"
+#line 608 "src/conf/parse_opts.cc"
 yy182:
 	++YYCURSOR;
 #line 91 "../src/conf/parse_opts.re"
@@ -613,136 +612,136 @@ yy182:
 		error ("bad short option: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 617 "src/conf/parse_opts.cc"
+#line 616 "src/conf/parse_opts.cc"
 yy184:
 	++YYCURSOR;
 #line 119 "../src/conf/parse_opts.re"
 	{ goto opt_short; }
-#line 622 "src/conf/parse_opts.cc"
+#line 621 "src/conf/parse_opts.cc"
 yy186:
 	++YYCURSOR;
 #line 114 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF8))   { error_encoding (); return EXIT_FAIL; } goto opt_short; }
-#line 627 "src/conf/parse_opts.cc"
+#line 626 "src/conf/parse_opts.cc"
 yy188:
 	++YYCURSOR;
 #line 96 "../src/conf/parse_opts.re"
 	{ usage ();   return EXIT_OK; }
-#line 632 "src/conf/parse_opts.cc"
+#line 631 "src/conf/parse_opts.cc"
 yy190:
 	++YYCURSOR;
 #line 102 "../src/conf/parse_opts.re"
 	{ opts.set_target (opt_t::DOT);      goto opt_short; }
-#line 637 "src/conf/parse_opts.cc"
+#line 636 "src/conf/parse_opts.cc"
 yy192:
 	++YYCURSOR;
 #line 104 "../src/conf/parse_opts.re"
 	{ opts.set_FFlag (true);             goto opt_short; }
-#line 642 "src/conf/parse_opts.cc"
+#line 641 "src/conf/parse_opts.cc"
 yy194:
 	++YYCURSOR;
 #line 109 "../src/conf/parse_opts.re"
 	{ opts.set_target (opt_t::SKELETON); goto opt_short; }
-#line 647 "src/conf/parse_opts.cc"
+#line 646 "src/conf/parse_opts.cc"
 yy196:
 	++YYCURSOR;
 #line 98 "../src/conf/parse_opts.re"
 	{ vernum ();  return EXIT_OK; }
-#line 652 "src/conf/parse_opts.cc"
+#line 651 "src/conf/parse_opts.cc"
 yy198:
 	++YYCURSOR;
 #line 99 "../src/conf/parse_opts.re"
 	{ opts.set_bFlag (true);             goto opt_short; }
-#line 657 "src/conf/parse_opts.cc"
+#line 656 "src/conf/parse_opts.cc"
 yy200:
 	++YYCURSOR;
 #line 100 "../src/conf/parse_opts.re"
 	{ opts.set_cFlag (true);             goto opt_short; }
-#line 662 "src/conf/parse_opts.cc"
+#line 661 "src/conf/parse_opts.cc"
 yy202:
 	++YYCURSOR;
 #line 101 "../src/conf/parse_opts.re"
 	{ opts.set_dFlag (true);             goto opt_short; }
-#line 667 "src/conf/parse_opts.cc"
+#line 666 "src/conf/parse_opts.cc"
 yy204:
 	++YYCURSOR;
 #line 110 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::EBCDIC)) { error_encoding (); return EXIT_FAIL; } goto opt_short; }
-#line 672 "src/conf/parse_opts.cc"
+#line 671 "src/conf/parse_opts.cc"
 yy206:
 	++YYCURSOR;
 #line 103 "../src/conf/parse_opts.re"
 	{ opts.set_fFlag (true);             goto opt_short; }
-#line 677 "src/conf/parse_opts.cc"
+#line 676 "src/conf/parse_opts.cc"
 yy208:
 	++YYCURSOR;
 #line 105 "../src/conf/parse_opts.re"
 	{ opts.set_gFlag (true);             goto opt_short; }
-#line 682 "src/conf/parse_opts.cc"
+#line 681 "src/conf/parse_opts.cc"
 yy210:
 	++YYCURSOR;
 #line 106 "../src/conf/parse_opts.re"
 	{ opts.set_iFlag (true);             goto opt_short; }
-#line 687 "src/conf/parse_opts.cc"
+#line 686 "src/conf/parse_opts.cc"
 yy212:
 	++YYCURSOR;
 	if ((yych = (YYCTYPE)*YYCURSOR) <= 0x00) goto yy230;
 #line 116 "../src/conf/parse_opts.re"
 	{ *argv = YYCURSOR;                                                             goto opt_output; }
-#line 693 "src/conf/parse_opts.cc"
+#line 692 "src/conf/parse_opts.cc"
 yy214:
 	++YYCURSOR;
 #line 107 "../src/conf/parse_opts.re"
 	{ opts.set_rFlag (true);             goto opt_short; }
-#line 698 "src/conf/parse_opts.cc"
+#line 697 "src/conf/parse_opts.cc"
 yy216:
 	++YYCURSOR;
 #line 108 "../src/conf/parse_opts.re"
 	{ opts.set_sFlag (true);             goto opt_short; }
-#line 703 "src/conf/parse_opts.cc"
+#line 702 "src/conf/parse_opts.cc"
 yy218:
 	++YYCURSOR;
 	if ((yych = (YYCTYPE)*YYCURSOR) <= 0x00) goto yy228;
 #line 118 "../src/conf/parse_opts.re"
 	{ *argv = YYCURSOR;                                                                  goto opt_header; }
-#line 709 "src/conf/parse_opts.cc"
+#line 708 "src/conf/parse_opts.cc"
 yy220:
 	++YYCURSOR;
 #line 111 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF32))  { error_encoding (); return EXIT_FAIL; } goto opt_short; }
-#line 714 "src/conf/parse_opts.cc"
+#line 713 "src/conf/parse_opts.cc"
 yy222:
 	++YYCURSOR;
 #line 97 "../src/conf/parse_opts.re"
 	{ version (); return EXIT_OK; }
-#line 719 "src/conf/parse_opts.cc"
+#line 718 "src/conf/parse_opts.cc"
 yy224:
 	++YYCURSOR;
 #line 112 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UCS2))   { error_encoding (); return EXIT_FAIL; } goto opt_short; }
-#line 724 "src/conf/parse_opts.cc"
+#line 723 "src/conf/parse_opts.cc"
 yy226:
 	++YYCURSOR;
 #line 113 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF16))  { error_encoding (); return EXIT_FAIL; } goto opt_short; }
-#line 729 "src/conf/parse_opts.cc"
+#line 728 "src/conf/parse_opts.cc"
 yy228:
 	++YYCURSOR;
 #line 117 "../src/conf/parse_opts.re"
 	{ if (!next (YYCURSOR, argv)) { error_arg ("-t, --type-header"); return EXIT_FAIL; } goto opt_header; }
-#line 734 "src/conf/parse_opts.cc"
+#line 733 "src/conf/parse_opts.cc"
 yy230:
 	++YYCURSOR;
 #line 115 "../src/conf/parse_opts.re"
 	{ if (!next (YYCURSOR, argv)) { error_arg ("-o, --output"); return EXIT_FAIL; } goto opt_output; }
-#line 739 "src/conf/parse_opts.cc"
+#line 738 "src/conf/parse_opts.cc"
 }
 #line 120 "../src/conf/parse_opts.re"
 
 
 opt_long:
 
-#line 746 "src/conf/parse_opts.cc"
+#line 745 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -772,7 +771,7 @@ yy235:
 		error ("bad long option: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 776 "src/conf/parse_opts.cc"
+#line 775 "src/conf/parse_opts.cc"
 yy236:
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
 	if (yych == 'i') goto yy532;
@@ -872,7 +871,7 @@ yy253:
 	++YYCURSOR;
 #line 148 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UCS2))   { error_encoding (); return EXIT_FAIL; } goto opt; }
-#line 876 "src/conf/parse_opts.cc"
+#line 875 "src/conf/parse_opts.cc"
 yy263:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'r') goto yy252;
@@ -896,7 +895,7 @@ yy266:
 	++YYCURSOR;
 #line 130 "../src/conf/parse_opts.re"
 	{ version (); return EXIT_OK; }
-#line 900 "src/conf/parse_opts.cc"
+#line 899 "src/conf/parse_opts.cc"
 yy272:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'm') goto yy252;
@@ -905,7 +904,7 @@ yy272:
 	++YYCURSOR;
 #line 131 "../src/conf/parse_opts.re"
 	{ vernum ();  return EXIT_OK; }
-#line 909 "src/conf/parse_opts.cc"
+#line 908 "src/conf/parse_opts.cc"
 yy276:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 'f') goto yy285;
@@ -926,7 +925,7 @@ yy277:
 	++YYCURSOR;
 #line 147 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF32))  { error_encoding (); return EXIT_FAIL; } goto opt; }
-#line 930 "src/conf/parse_opts.cc"
+#line 929 "src/conf/parse_opts.cc"
 yy285:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != '-') goto yy252;
@@ -944,14 +943,14 @@ yy288:
 	++YYCURSOR;
 #line 150 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF8))   { error_encoding (); return EXIT_FAIL; } goto opt; }
-#line 948 "src/conf/parse_opts.cc"
+#line 947 "src/conf/parse_opts.cc"
 yy291:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych >= 0x01) goto yy252;
 	++YYCURSOR;
 #line 149 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::UTF16))  { error_encoding (); return EXIT_FAIL; } goto opt; }
-#line 955 "src/conf/parse_opts.cc"
+#line 954 "src/conf/parse_opts.cc"
 yy294:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'p') goto yy252;
@@ -976,7 +975,7 @@ yy294:
 	++YYCURSOR;
 #line 152 "../src/conf/parse_opts.re"
 	{ if (!next (YYCURSOR, argv)) { error_arg ("-t, --type-header"); return EXIT_FAIL; } goto opt_header; }
-#line 980 "src/conf/parse_opts.cc"
+#line 979 "src/conf/parse_opts.cc"
 yy306:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 'n') goto yy347;
@@ -1022,7 +1021,7 @@ yy310:
 	++YYCURSOR;
 #line 136 "../src/conf/parse_opts.re"
 	{ opts.set_fFlag (true);             goto opt; }
-#line 1026 "src/conf/parse_opts.cc"
+#line 1025 "src/conf/parse_opts.cc"
 yy324:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 't') goto yy252;
@@ -1053,7 +1052,7 @@ yy324:
 	++YYCURSOR;
 #line 133 "../src/conf/parse_opts.re"
 	{ opts.set_cFlag (true);             goto opt; }
-#line 1057 "src/conf/parse_opts.cc"
+#line 1056 "src/conf/parse_opts.cc"
 yy339:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'l') goto yy252;
@@ -1070,7 +1069,7 @@ yy339:
 	++YYCURSOR;
 #line 145 "../src/conf/parse_opts.re"
 	{ opts.set_target (opt_t::SKELETON); goto opt; }
-#line 1074 "src/conf/parse_opts.cc"
+#line 1073 "src/conf/parse_opts.cc"
 yy347:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'g') goto yy252;
@@ -1093,7 +1092,7 @@ yy347:
 	++YYCURSOR;
 #line 156 "../src/conf/parse_opts.re"
 	{ goto opt; }
-#line 1097 "src/conf/parse_opts.cc"
+#line 1096 "src/conf/parse_opts.cc"
 yy358:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'u') goto yy252;
@@ -1112,7 +1111,7 @@ yy358:
 	++YYCURSOR;
 #line 140 "../src/conf/parse_opts.re"
 	{ opts.set_rFlag (true);             goto opt; }
-#line 1116 "src/conf/parse_opts.cc"
+#line 1115 "src/conf/parse_opts.cc"
 yy367:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 't') goto yy252;
@@ -1127,7 +1126,7 @@ yy367:
 	++YYCURSOR;
 #line 151 "../src/conf/parse_opts.re"
 	{ if (!next (YYCURSOR, argv)) { error_arg ("-o, --output"); return EXIT_FAIL; } goto opt_output; }
-#line 1131 "src/conf/parse_opts.cc"
+#line 1130 "src/conf/parse_opts.cc"
 yy374:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == '-') goto yy386;
@@ -1154,7 +1153,7 @@ yy375:
 	++YYCURSOR;
 #line 141 "../src/conf/parse_opts.re"
 	{ opts.set_sFlag (true);             goto opt; }
-#line 1158 "src/conf/parse_opts.cc"
+#line 1157 "src/conf/parse_opts.cc"
 yy386:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 'd') goto yy388;
@@ -1186,7 +1185,7 @@ yy388:
 	++YYCURSOR;
 #line 139 "../src/conf/parse_opts.re"
 	{ opts.set_iFlag (true);             goto opt; }
-#line 1190 "src/conf/parse_opts.cc"
+#line 1189 "src/conf/parse_opts.cc"
 yy400:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'n') goto yy252;
@@ -1219,7 +1218,7 @@ yy400:
 	++YYCURSOR;
 #line 142 "../src/conf/parse_opts.re"
 	{ opts.set_bNoGenerationDate (true); goto opt; }
-#line 1223 "src/conf/parse_opts.cc"
+#line 1222 "src/conf/parse_opts.cc"
 yy416:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'p') goto yy252;
@@ -1232,7 +1231,7 @@ yy416:
 	++YYCURSOR;
 #line 154 "../src/conf/parse_opts.re"
 	{ goto opt_input; }
-#line 1236 "src/conf/parse_opts.cc"
+#line 1235 "src/conf/parse_opts.cc"
 yy422:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'l') goto yy252;
@@ -1243,7 +1242,7 @@ yy422:
 	++YYCURSOR;
 #line 129 "../src/conf/parse_opts.re"
 	{ usage ();   return EXIT_OK; }
-#line 1247 "src/conf/parse_opts.cc"
+#line 1246 "src/conf/parse_opts.cc"
 yy427:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'e') goto yy252;
@@ -1268,7 +1267,7 @@ yy427:
 	++YYCURSOR;
 #line 137 "../src/conf/parse_opts.re"
 	{ opts.set_FFlag (true);             goto opt; }
-#line 1272 "src/conf/parse_opts.cc"
+#line 1271 "src/conf/parse_opts.cc"
 yy439:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 'i') goto yy460;
@@ -1286,7 +1285,7 @@ yy441:
 	++YYCURSOR;
 #line 146 "../src/conf/parse_opts.re"
 	{ if (!opts.set_encoding (Enc::EBCDIC)) { error_encoding (); return EXIT_FAIL; } goto opt; }
-#line 1290 "src/conf/parse_opts.cc"
+#line 1289 "src/conf/parse_opts.cc"
 yy445:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'o') goto yy252;
@@ -1317,7 +1316,7 @@ yy445:
 	++YYCURSOR;
 #line 153 "../src/conf/parse_opts.re"
 	{ goto opt_encoding_policy; }
-#line 1321 "src/conf/parse_opts.cc"
+#line 1320 "src/conf/parse_opts.cc"
 yy460:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 't') goto yy472;
@@ -1344,7 +1343,7 @@ yy461:
 	++YYCURSOR;
 #line 155 "../src/conf/parse_opts.re"
 	{ goto opt_empty_class; }
-#line 1348 "src/conf/parse_opts.cc"
+#line 1347 "src/conf/parse_opts.cc"
 yy472:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != '-') goto yy252;
@@ -1359,7 +1358,7 @@ yy472:
 	++YYCURSOR;
 #line 135 "../src/conf/parse_opts.re"
 	{ opts.set_target (opt_t::DOT);      goto opt; }
-#line 1363 "src/conf/parse_opts.cc"
+#line 1362 "src/conf/parse_opts.cc"
 yy479:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'b') goto yy252;
@@ -1386,7 +1385,7 @@ yy479:
 	++YYCURSOR;
 #line 134 "../src/conf/parse_opts.re"
 	{ opts.set_dFlag (true);             goto opt; }
-#line 1390 "src/conf/parse_opts.cc"
+#line 1389 "src/conf/parse_opts.cc"
 yy492:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych == 's') goto yy508;
@@ -1421,7 +1420,7 @@ yy493:
 	++YYCURSOR;
 #line 138 "../src/conf/parse_opts.re"
 	{ opts.set_gFlag (true);             goto opt; }
-#line 1425 "src/conf/parse_opts.cc"
+#line 1424 "src/conf/parse_opts.cc"
 yy508:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'e') goto yy252;
@@ -1459,7 +1458,7 @@ yy514:
 	++YYCURSOR;
 #line 143 "../src/conf/parse_opts.re"
 	{ opts.set_bCaseInsensitive (true);  goto opt; }
-#line 1463 "src/conf/parse_opts.cc"
+#line 1462 "src/conf/parse_opts.cc"
 yy525:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'r') goto yy252;
@@ -1474,7 +1473,7 @@ yy525:
 	++YYCURSOR;
 #line 144 "../src/conf/parse_opts.re"
 	{ opts.set_bCaseInverted (true);     goto opt; }
-#line 1478 "src/conf/parse_opts.cc"
+#line 1477 "src/conf/parse_opts.cc"
 yy532:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 't') goto yy252;
@@ -1499,14 +1498,14 @@ yy532:
 	++YYCURSOR;
 #line 132 "../src/conf/parse_opts.re"
 	{ opts.set_bFlag (true);             goto opt; }
-#line 1503 "src/conf/parse_opts.cc"
+#line 1502 "src/conf/parse_opts.cc"
 }
 #line 157 "../src/conf/parse_opts.re"
 
 
 opt_output:
 
-#line 1510 "src/conf/parse_opts.cc"
+#line 1509 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	static const unsigned char yybm[] = {
@@ -1553,9 +1552,9 @@ yy546:
 		error ("bad argument to option -o, --output: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 1557 "src/conf/parse_opts.cc"
+#line 1556 "src/conf/parse_opts.cc"
 yy548:
-	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
+	yych = (YYCTYPE)*++YYCURSOR;
 	goto yy550;
 yy549:
 	++YYCURSOR;
@@ -1567,14 +1566,14 @@ yy550:
 	++YYCURSOR;
 #line 166 "../src/conf/parse_opts.re"
 	{ if (!opts.output (*argv)) return EXIT_FAIL; goto opt; }
-#line 1571 "src/conf/parse_opts.cc"
+#line 1570 "src/conf/parse_opts.cc"
 }
 #line 167 "../src/conf/parse_opts.re"
 
 
 opt_header:
 
-#line 1578 "src/conf/parse_opts.cc"
+#line 1577 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	static const unsigned char yybm[] = {
@@ -1621,9 +1620,9 @@ yy555:
 		error ("bad argument to option -t, --type-header: %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 1625 "src/conf/parse_opts.cc"
+#line 1624 "src/conf/parse_opts.cc"
 yy557:
-	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
+	yych = (YYCTYPE)*++YYCURSOR;
 	goto yy559;
 yy558:
 	++YYCURSOR;
@@ -1635,7 +1634,7 @@ yy559:
 	++YYCURSOR;
 #line 176 "../src/conf/parse_opts.re"
 	{ opts.set_header_file (*argv); goto opt; }
-#line 1639 "src/conf/parse_opts.cc"
+#line 1638 "src/conf/parse_opts.cc"
 }
 #line 177 "../src/conf/parse_opts.re"
 
@@ -1647,7 +1646,7 @@ opt_encoding_policy:
 		return EXIT_FAIL;
 	}
 
-#line 1651 "src/conf/parse_opts.cc"
+#line 1650 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -1664,7 +1663,7 @@ yy565:
 		error ("bad argument to option --encoding-policy (expected: ignore | substitute | fail): %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 1668 "src/conf/parse_opts.cc"
+#line 1667 "src/conf/parse_opts.cc"
 yy566:
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
 	if (yych == 'a') goto yy588;
@@ -1701,7 +1700,7 @@ yy571:
 	++YYCURSOR;
 #line 192 "../src/conf/parse_opts.re"
 	{ opts.set_encoding_policy (Enc::POLICY_SUBSTITUTE); goto opt; }
-#line 1705 "src/conf/parse_opts.cc"
+#line 1704 "src/conf/parse_opts.cc"
 yy581:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'n') goto yy570;
@@ -1716,7 +1715,7 @@ yy581:
 	++YYCURSOR;
 #line 191 "../src/conf/parse_opts.re"
 	{ opts.set_encoding_policy (Enc::POLICY_IGNORE);     goto opt; }
-#line 1720 "src/conf/parse_opts.cc"
+#line 1719 "src/conf/parse_opts.cc"
 yy588:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'i') goto yy570;
@@ -1727,7 +1726,7 @@ yy588:
 	++YYCURSOR;
 #line 193 "../src/conf/parse_opts.re"
 	{ opts.set_encoding_policy (Enc::POLICY_FAIL);       goto opt; }
-#line 1731 "src/conf/parse_opts.cc"
+#line 1730 "src/conf/parse_opts.cc"
 }
 #line 194 "../src/conf/parse_opts.re"
 
@@ -1739,7 +1738,7 @@ opt_input:
 		return EXIT_FAIL;
 	}
 
-#line 1743 "src/conf/parse_opts.cc"
+#line 1742 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -1754,7 +1753,7 @@ yy596:
 		error ("bad argument to option --input (expected: default | custom): %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 1758 "src/conf/parse_opts.cc"
+#line 1757 "src/conf/parse_opts.cc"
 yy597:
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
 	if (yych == 'u') goto yy608;
@@ -1781,7 +1780,7 @@ yy601:
 	++YYCURSOR;
 #line 208 "../src/conf/parse_opts.re"
 	{ opts.set_input_api (InputAPI::DEFAULT); goto opt; }
-#line 1785 "src/conf/parse_opts.cc"
+#line 1784 "src/conf/parse_opts.cc"
 yy608:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 's') goto yy600;
@@ -1796,7 +1795,7 @@ yy608:
 	++YYCURSOR;
 #line 209 "../src/conf/parse_opts.re"
 	{ opts.set_input_api (InputAPI::CUSTOM);  goto opt; }
-#line 1800 "src/conf/parse_opts.cc"
+#line 1799 "src/conf/parse_opts.cc"
 }
 #line 210 "../src/conf/parse_opts.re"
 
@@ -1808,7 +1807,7 @@ opt_empty_class:
 		return EXIT_FAIL;
 	}
 
-#line 1812 "src/conf/parse_opts.cc"
+#line 1811 "src/conf/parse_opts.cc"
 {
 	YYCTYPE yych;
 	yych = (YYCTYPE)*YYCURSOR;
@@ -1821,7 +1820,7 @@ yy618:
 		error ("bad argument to option --empty-class (expected: match-empty | match-none | error): %s", *argv);
 		return EXIT_FAIL;
 	}
-#line 1825 "src/conf/parse_opts.cc"
+#line 1824 "src/conf/parse_opts.cc"
 yy619:
 	yych = (YYCTYPE)*(YYMARKER = ++YYCURSOR);
 	if (yych == 'r') goto yy640;
@@ -1861,7 +1860,7 @@ yy628:
 	++YYCURSOR;
 #line 225 "../src/conf/parse_opts.re"
 	{ opts.set_empty_class_policy (EMPTY_CLASS_MATCH_NONE);  goto opt; }
-#line 1865 "src/conf/parse_opts.cc"
+#line 1864 "src/conf/parse_opts.cc"
 yy634:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'p') goto yy622;
@@ -1874,7 +1873,7 @@ yy634:
 	++YYCURSOR;
 #line 224 "../src/conf/parse_opts.re"
 	{ opts.set_empty_class_policy (EMPTY_CLASS_MATCH_EMPTY); goto opt; }
-#line 1878 "src/conf/parse_opts.cc"
+#line 1877 "src/conf/parse_opts.cc"
 yy640:
 	yych = (YYCTYPE)*++YYCURSOR;
 	if (yych != 'r') goto yy622;
@@ -1887,7 +1886,7 @@ yy640:
 	++YYCURSOR;
 #line 226 "../src/conf/parse_opts.re"
 	{ opts.set_empty_class_policy (EMPTY_CLASS_ERROR);       goto opt; }
-#line 1891 "src/conf/parse_opts.cc"
+#line 1890 "src/conf/parse_opts.cc"
 }
 #line 227 "../src/conf/parse_opts.re"
 
diff --git a/re2c/bootstrap/src/parse/lex.cc b/re2c/bootstrap/src/parse/lex.cc
index 224a4d49..2bf00301 100644
--- a/re2c/bootstrap/src/parse/lex.cc
+++ b/re2c/bootstrap/src/parse/lex.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.15.2 on Fri Nov 27 12:31:17 2015*/
+/* Generated by re2c 0.15.2 on Fri Nov 27 13:55:12 2015*/
 #line 1 "../src/parse/lex.re"
 #include <stdlib.h>
 #include <string.h>
diff --git a/re2c/bootstrap/src/parse/lex_conf.cc b/re2c/bootstrap/src/parse/lex_conf.cc
index eb2779f7..0dbe26be 100644
--- a/re2c/bootstrap/src/parse/lex_conf.cc
+++ b/re2c/bootstrap/src/parse/lex_conf.cc
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.14.3 on Mon Nov 23 21:19:03 2015 */
+/* Generated by re2c 0.15.2 on Fri Nov 27 13:55:14 2015*/
 #line 1 "../src/parse/lex_conf.re"
 #include "src/parse/scanner.h"
 #include "src/util/s_to_n32_unsafe.h"
@@ -52,7 +52,6 @@ void Scanner::lex_conf ()
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
-
 	if ((lim - cur) < 27) fill(27);
 	yych = (unsigned char)*cur;
 	switch (yych) {
@@ -71,7 +70,7 @@ yy2:
 yy3:
 #line 35 "../src/parse/lex_conf.re"
 	{ fatal ((tok - pos) - tchar, "unrecognized configuration"); }
-#line 75 "src/parse/lex_conf.cc"
+#line 74 "src/parse/lex_conf.cc"
 yy4:
 	yyaccept = 0;
 	yych = (unsigned char)*(ptr = ++cur);
@@ -209,7 +208,7 @@ yy23:
 	++cur;
 #line 134 "../src/parse/lex_conf.re"
 	{ opts.set_fill_use     (lex_conf_number () != 0); return; }
-#line 213 "src/parse/lex_conf.cc"
+#line 212 "src/parse/lex_conf.cc"
 yy30:
 	yych = (unsigned char)*++cur;
 	if (yych != 'r') goto yy13;
@@ -228,7 +227,7 @@ yy30:
 	++cur;
 #line 136 "../src/parse/lex_conf.re"
 	{ opts.set_fill_arg_use (lex_conf_number () != 0); return; }
-#line 232 "src/parse/lex_conf.cc"
+#line 231 "src/parse/lex_conf.cc"
 yy39:
 	yych = (unsigned char)*++cur;
 	if (yych != 'e') goto yy13;
@@ -239,7 +238,7 @@ yy39:
 	++cur;
 #line 138 "../src/parse/lex_conf.re"
 	{ opts.set_fill_check   (lex_conf_number () != 0); return; }
-#line 243 "src/parse/lex_conf.cc"
+#line 242 "src/parse/lex_conf.cc"
 yy44:
 	yych = (unsigned char)*++cur;
 	if (yych != ':') goto yy13;
@@ -271,7 +270,7 @@ yy47:
 	++cur;
 #line 130 "../src/parse/lex_conf.re"
 	{ opts.set_yychConversion (lex_conf_number () != 0); return; }
-#line 275 "src/parse/lex_conf.cc"
+#line 274 "src/parse/lex_conf.cc"
 yy58:
 	yych = (unsigned char)*++cur;
 	if (yych != 'i') goto yy13;
@@ -280,7 +279,7 @@ yy58:
 	++cur;
 #line 131 "../src/parse/lex_conf.re"
 	{ opts.set_bEmitYYCh      (lex_conf_number () != 0); return; }
-#line 284 "src/parse/lex_conf.cc"
+#line 283 "src/parse/lex_conf.cc"
 yy62:
 	yych = (unsigned char)*++cur;
 	if (yych != ':') goto yy13;
@@ -293,7 +292,7 @@ yy62:
 	++cur;
 #line 88 "../src/parse/lex_conf.re"
 	{ opts.set_yybmHexTable (lex_conf_number () != 0); return; }
-#line 297 "src/parse/lex_conf.cc"
+#line 296 "src/parse/lex_conf.cc"
 yy68:
 	yych = (unsigned char)*++cur;
 	if (yych != 'r') goto yy13;
@@ -356,12 +355,12 @@ yy82:
 	++cur;
 #line 85 "../src/parse/lex_conf.re"
 	{ opts.set_yyaccept        (lex_conf_string ()); return; }
-#line 360 "src/parse/lex_conf.cc"
+#line 359 "src/parse/lex_conf.cc"
 yy89:
 	++cur;
 #line 87 "../src/parse/lex_conf.re"
 	{ opts.set_yybm         (lex_conf_string ()); return; }
-#line 365 "src/parse/lex_conf.cc"
+#line 364 "src/parse/lex_conf.cc"
 yy91:
 	yych = (unsigned char)*++cur;
 	if (yych != 'r') goto yy13;
@@ -374,7 +373,7 @@ yy91:
 	++cur;
 #line 99 "../src/parse/lex_conf.re"
 	{ opts.set_yytarget (lex_conf_string ()); return; }
-#line 378 "src/parse/lex_conf.cc"
+#line 377 "src/parse/lex_conf.cc"
 yy97:
 	yych = (unsigned char)*++cur;
 	if (yych == 'a') goto yy100;
@@ -383,7 +382,7 @@ yy98:
 	++cur;
 #line 129 "../src/parse/lex_conf.re"
 	{ opts.set_yych           (lex_conf_string ()); return; }
-#line 387 "src/parse/lex_conf.cc"
+#line 386 "src/parse/lex_conf.cc"
 yy100:
 	yych = (unsigned char)*++cur;
 	if (yych != 'b') goto yy13;
@@ -394,7 +393,7 @@ yy100:
 	++cur;
 #line 74 "../src/parse/lex_conf.re"
 	{ opts.set_yyctable         (lex_conf_string ()); return; }
-#line 398 "src/parse/lex_conf.cc"
+#line 397 "src/parse/lex_conf.cc"
 yy105:
 	yych = (unsigned char)*++cur;
 	if (yych != 'a') goto yy13;
@@ -407,7 +406,7 @@ yy105:
 	++cur;
 #line 147 "../src/parse/lex_conf.re"
 	{ lex_conf_string (); return; }
-#line 411 "src/parse/lex_conf.cc"
+#line 410 "src/parse/lex_conf.cc"
 yy111:
 	yych = (unsigned char)*++cur;
 	if (yych != 'a') goto yy13;
@@ -452,7 +451,7 @@ yy118:
 	++cur;
 #line 84 "../src/parse/lex_conf.re"
 	{ opts.set_bUseStateNext   (lex_conf_number () != 0); return; }
-#line 456 "src/parse/lex_conf.cc"
+#line 455 "src/parse/lex_conf.cc"
 yy128:
 	yych = (unsigned char)*++cur;
 	if (yych != 'o') goto yy13;
@@ -463,7 +462,7 @@ yy128:
 	++cur;
 #line 83 "../src/parse/lex_conf.re"
 	{ opts.set_bUseStateAbort  (lex_conf_number () != 0); return; }
-#line 467 "src/parse/lex_conf.cc"
+#line 466 "src/parse/lex_conf.cc"
 yy133:
 	yych = (unsigned char)*++cur;
 	if (yych != 'l') goto yy13;
@@ -475,9 +474,9 @@ yy133:
 	if (yych != 'e') goto yy13;
 	yych = (unsigned char)*++cur;
 	if (yych != 'l') goto yy13;
-	ctx = cur + 1;
 	yyaccept = 1;
 	yych = (unsigned char)*(ptr = ++cur);
+	ctx = cur;
 	if (yybm[0+yych] & 64) {
 		goto yy140;
 	}
@@ -485,7 +484,7 @@ yy133:
 yy139:
 #line 144 "../src/parse/lex_conf.re"
 	{ out.set_user_start_label (lex_conf_string ()); return; }
-#line 489 "src/parse/lex_conf.cc"
+#line 488 "src/parse/lex_conf.cc"
 yy140:
 	++cur;
 	if (lim <= cur) fill(1);
@@ -522,7 +521,7 @@ yy145:
 	cur = ctx;
 #line 143 "../src/parse/lex_conf.re"
 	{ out.set_force_start_label (lex_conf_number () != 0); return; }
-#line 526 "src/parse/lex_conf.cc"
+#line 525 "src/parse/lex_conf.cc"
 yy146:
 	yych = (unsigned char)*++cur;
 	if (yych <= '0') goto yy13;
@@ -571,7 +570,7 @@ yy158:
 	++cur;
 #line 82 "../src/parse/lex_conf.re"
 	{ opts.set_yynext          (lex_conf_string ()); return; }
-#line 575 "src/parse/lex_conf.cc"
+#line 574 "src/parse/lex_conf.cc"
 yy163:
 	yych = (unsigned char)*++cur;
 	if (yych != 'l') goto yy13;
@@ -590,7 +589,7 @@ yy163:
 	++cur;
 #line 81 "../src/parse/lex_conf.re"
 	{ opts.set_yyfilllabel     (lex_conf_string ()); return; }
-#line 594 "src/parse/lex_conf.cc"
+#line 593 "src/parse/lex_conf.cc"
 yy172:
 	yych = (unsigned char)*++cur;
 	if (yych != 'e') goto yy13;
@@ -603,7 +602,7 @@ yy172:
 	++cur;
 #line 140 "../src/parse/lex_conf.re"
 	{ opts.set_labelPrefix (lex_conf_string ()); return; }
-#line 607 "src/parse/lex_conf.cc"
+#line 606 "src/parse/lex_conf.cc"
 yy178:
 	yych = (unsigned char)*++cur;
 	if (yych != 'd') goto yy13;
@@ -636,7 +635,7 @@ yy185:
 	++cur;
 #line 114 "../src/parse/lex_conf.re"
 	{ opts.set_indString (lex_conf_string ()); return; }
-#line 640 "src/parse/lex_conf.cc"
+#line 639 "src/parse/lex_conf.cc"
 yy192:
 	yych = (unsigned char)*++cur;
 	if (yych != 'p') goto yy13;
@@ -651,7 +650,7 @@ yy192:
 		opts.set_topIndent (static_cast<uint32_t> (n));
 		return;
 	}
-#line 655 "src/parse/lex_conf.cc"
+#line 654 "src/parse/lex_conf.cc"
 yy195:
 	yych = (unsigned char)*++cur;
 	if (yych != 'a') goto yy13;
@@ -699,7 +698,7 @@ yy200:
 		}
 		return;
 	}
-#line 703 "src/parse/lex_conf.cc"
+#line 702 "src/parse/lex_conf.cc"
 yy202:
 	yych = (unsigned char)*++cur;
 	if (yych != 'f') goto yy13;
@@ -801,7 +800,7 @@ yy223:
 yy228:
 #line 76 "../src/parse/lex_conf.re"
 	{ opts.set_state_get       (lex_conf_string ()); return; }
-#line 805 "src/parse/lex_conf.cc"
+#line 804 "src/parse/lex_conf.cc"
 yy229:
 	yych = (unsigned char)*++cur;
 	if (yych != 'n') goto yy13;
@@ -816,7 +815,7 @@ yy229:
 	++cur;
 #line 77 "../src/parse/lex_conf.re"
 	{ opts.set_state_get_naked (lex_conf_number () != 0); return; }
-#line 820 "src/parse/lex_conf.cc"
+#line 819 "src/parse/lex_conf.cc"
 yy236:
 	yych = (unsigned char)*++cur;
 	if (yych != 'N') goto yy13;
@@ -838,7 +837,7 @@ yy236:
 yy244:
 #line 63 "../src/parse/lex_conf.re"
 	{ opts.set_cond_get         (lex_conf_string ()); return; }
-#line 842 "src/parse/lex_conf.cc"
+#line 841 "src/parse/lex_conf.cc"
 yy245:
 	yych = (unsigned char)*++cur;
 	if (yych != 'n') goto yy13;
@@ -853,7 +852,7 @@ yy245:
 	++cur;
 #line 64 "../src/parse/lex_conf.re"
 	{ opts.set_cond_get_naked   (lex_conf_number () != 0); return; }
-#line 857 "src/parse/lex_conf.cc"
+#line 856 "src/parse/lex_conf.cc"
 yy252:
 	yych = (unsigned char)*++cur;
 	if (yych != 'R') goto yy13;
@@ -866,7 +865,7 @@ yy252:
 	++cur;
 #line 102 "../src/parse/lex_conf.re"
 	{ opts.set_yymarker    (lex_conf_string ()); return; }
-#line 870 "src/parse/lex_conf.cc"
+#line 869 "src/parse/lex_conf.cc"
 yy258:
 	yych = (unsigned char)*++cur;
 	if (yych != 'E') goto yy13;
@@ -875,7 +874,7 @@ yy258:
 	++cur;
 #line 106 "../src/parse/lex_conf.re"
 	{ opts.set_yypeek       (lex_conf_string ()); return; }
-#line 879 "src/parse/lex_conf.cc"
+#line 878 "src/parse/lex_conf.cc"
 yy262:
 	yych = (unsigned char)*++cur;
 	if (yych == 'T') goto yy267;
@@ -888,7 +887,7 @@ yy263:
 	++cur;
 #line 107 "../src/parse/lex_conf.re"
 	{ opts.set_yyskip       (lex_conf_string ()); return; }
-#line 892 "src/parse/lex_conf.cc"
+#line 891 "src/parse/lex_conf.cc"
 yy267:
 	yych = (unsigned char)*++cur;
 	if (yych == 'C') goto yy268;
@@ -914,7 +913,7 @@ yy269:
 yy274:
 #line 78 "../src/parse/lex_conf.re"
 	{ opts.set_state_set       (lex_conf_string ()); return; }
-#line 918 "src/parse/lex_conf.cc"
+#line 917 "src/parse/lex_conf.cc"
 yy275:
 	yych = (unsigned char)*++cur;
 	if (yych == 's') goto yy283;
@@ -933,7 +932,7 @@ yy276:
 	++cur;
 #line 79 "../src/parse/lex_conf.re"
 	{ opts.set_state_set_naked (lex_conf_number () != 0); return; }
-#line 937 "src/parse/lex_conf.cc"
+#line 936 "src/parse/lex_conf.cc"
 yy283:
 	yych = (unsigned char)*++cur;
 	if (yych != 't') goto yy13;
@@ -946,7 +945,7 @@ yy283:
 	++cur;
 #line 80 "../src/parse/lex_conf.re"
 	{ opts.set_state_set_arg   (lex_conf_string ()); return; }
-#line 950 "src/parse/lex_conf.cc"
+#line 949 "src/parse/lex_conf.cc"
 yy289:
 	yych = (unsigned char)*++cur;
 	if (yych != 'N') goto yy13;
@@ -969,7 +968,7 @@ yy289:
 yy297:
 #line 65 "../src/parse/lex_conf.re"
 	{ opts.set_cond_set         (lex_conf_string ()); return; }
-#line 973 "src/parse/lex_conf.cc"
+#line 972 "src/parse/lex_conf.cc"
 yy298:
 	yych = (unsigned char)*++cur;
 	if (yych == 'n') goto yy305;
@@ -986,7 +985,7 @@ yy299:
 	++cur;
 #line 66 "../src/parse/lex_conf.re"
 	{ opts.set_cond_set_arg     (lex_conf_string ()); return; }
-#line 990 "src/parse/lex_conf.cc"
+#line 989 "src/parse/lex_conf.cc"
 yy305:
 	yych = (unsigned char)*++cur;
 	if (yych != 'a') goto yy13;
@@ -999,7 +998,7 @@ yy305:
 	++cur;
 #line 67 "../src/parse/lex_conf.re"
 	{ opts.set_cond_set_naked   (lex_conf_number () != 0); return; }
-#line 1003 "src/parse/lex_conf.cc"
+#line 1002 "src/parse/lex_conf.cc"
 yy311:
 	yych = (unsigned char)*++cur;
 	if (yych != 'C') goto yy13;
@@ -1015,7 +1014,7 @@ yy311:
 yy316:
 #line 108 "../src/parse/lex_conf.re"
 	{ opts.set_yybackup     (lex_conf_string ()); return; }
-#line 1019 "src/parse/lex_conf.cc"
+#line 1018 "src/parse/lex_conf.cc"
 yy317:
 	yych = (unsigned char)*++cur;
 	if (yych != 'T') goto yy13;
@@ -1024,7 +1023,7 @@ yy317:
 	++cur;
 #line 109 "../src/parse/lex_conf.re"
 	{ opts.set_yybackupctx  (lex_conf_string ()); return; }
-#line 1028 "src/parse/lex_conf.cc"
+#line 1027 "src/parse/lex_conf.cc"
 yy321:
 	yych = (unsigned char)*++cur;
 	if (yych != 'S') goto yy13;
@@ -1042,7 +1041,7 @@ yy321:
 yy327:
 #line 110 "../src/parse/lex_conf.re"
 	{ opts.set_yyrestore    (lex_conf_string ()); return; }
-#line 1046 "src/parse/lex_conf.cc"
+#line 1045 "src/parse/lex_conf.cc"
 yy328:
 	yych = (unsigned char)*++cur;
 	if (yych != 'T') goto yy13;
@@ -1051,7 +1050,7 @@ yy328:
 	++cur;
 #line 111 "../src/parse/lex_conf.re"
 	{ opts.set_yyrestorectx (lex_conf_string ()); return; }
-#line 1055 "src/parse/lex_conf.cc"
+#line 1054 "src/parse/lex_conf.cc"
 yy332:
 	yych = (unsigned char)*++cur;
 	if (yych == 'M') goto yy341;
@@ -1072,7 +1071,7 @@ yy333:
 	++cur;
 #line 112 "../src/parse/lex_conf.re"
 	{ opts.set_yylessthan   (lex_conf_string ()); return; }
-#line 1076 "src/parse/lex_conf.cc"
+#line 1075 "src/parse/lex_conf.cc"
 yy341:
 	yych = (unsigned char)*++cur;
 	if (yych != 'I') goto yy13;
@@ -1081,7 +1080,7 @@ yy341:
 	++cur;
 #line 104 "../src/parse/lex_conf.re"
 	{ opts.set_yylimit     (lex_conf_string ()); return; }
-#line 1085 "src/parse/lex_conf.cc"
+#line 1084 "src/parse/lex_conf.cc"
 yy345:
 	yych = (unsigned char)*++cur;
 	if (yych != 'B') goto yy13;
@@ -1092,7 +1091,7 @@ yy345:
 	++cur;
 #line 126 "../src/parse/lex_conf.re"
 	{ opts.set_yydebug (lex_conf_string ()); return; }
-#line 1096 "src/parse/lex_conf.cc"
+#line 1095 "src/parse/lex_conf.cc"
 yy350:
 	yych = (unsigned char)*++cur;
 	if (yych == 'N') goto yy370;
@@ -1125,14 +1124,14 @@ yy354:
 	++cur;
 #line 103 "../src/parse/lex_conf.re"
 	{ opts.set_yyctxmarker (lex_conf_string ()); return; }
-#line 1129 "src/parse/lex_conf.cc"
+#line 1128 "src/parse/lex_conf.cc"
 yy362:
 	yych = (unsigned char)*++cur;
 	if (yych != 'E') goto yy13;
 	++cur;
 #line 128 "../src/parse/lex_conf.re"
 	{ opts.set_yyctype        (lex_conf_string ()); return; }
-#line 1136 "src/parse/lex_conf.cc"
+#line 1135 "src/parse/lex_conf.cc"
 yy365:
 	yych = (unsigned char)*++cur;
 	if (yych != 'S') goto yy13;
@@ -1143,7 +1142,7 @@ yy365:
 	++cur;
 #line 101 "../src/parse/lex_conf.re"
 	{ opts.set_yycursor    (lex_conf_string ()); return; }
-#line 1147 "src/parse/lex_conf.cc"
+#line 1146 "src/parse/lex_conf.cc"
 yy370:
 	yych = (unsigned char)*++cur;
 	if (yych != 'D') goto yy13;
@@ -1158,7 +1157,7 @@ yy370:
 	++cur;
 #line 62 "../src/parse/lex_conf.re"
 	{ opts.set_yycondtype       (lex_conf_string ()); return; }
-#line 1162 "src/parse/lex_conf.cc"
+#line 1161 "src/parse/lex_conf.cc"
 yy377:
 	yych = (unsigned char)*++cur;
 	if (yych != 'L') goto yy13;
@@ -1171,7 +1170,7 @@ yy377:
 yy380:
 #line 133 "../src/parse/lex_conf.re"
 	{ opts.set_fill         (lex_conf_string ()); return; }
-#line 1175 "src/parse/lex_conf.cc"
+#line 1174 "src/parse/lex_conf.cc"
 yy381:
 	yych = (unsigned char)*++cur;
 	if (yych == 'n') goto yy387;
@@ -1186,7 +1185,7 @@ yy382:
 	++cur;
 #line 135 "../src/parse/lex_conf.re"
 	{ opts.set_fill_arg     (lex_conf_string ()); return; }
-#line 1190 "src/parse/lex_conf.cc"
+#line 1189 "src/parse/lex_conf.cc"
 yy387:
 	yych = (unsigned char)*++cur;
 	if (yych != 'a') goto yy13;
@@ -1199,7 +1198,7 @@ yy387:
 	++cur;
 #line 137 "../src/parse/lex_conf.re"
 	{ opts.set_fill_naked   (lex_conf_number () != 0); return; }
-#line 1203 "src/parse/lex_conf.cc"
+#line 1202 "src/parse/lex_conf.cc"
 yy393:
 	yych = (unsigned char)*++cur;
 	if (yych == 'o') goto yy441;
@@ -1250,7 +1249,7 @@ yy401:
 yy408:
 #line 70 "../src/parse/lex_conf.re"
 	{ opts.set_condDivider      (lex_conf_string ()); return; }
-#line 1254 "src/parse/lex_conf.cc"
+#line 1253 "src/parse/lex_conf.cc"
 yy409:
 	yych = (unsigned char)*++cur;
 	if (yych != 'c') goto yy13;
@@ -1263,7 +1262,7 @@ yy409:
 	++cur;
 #line 71 "../src/parse/lex_conf.re"
 	{ opts.set_condDividerParam (lex_conf_string ()); return; }
-#line 1267 "src/parse/lex_conf.cc"
+#line 1266 "src/parse/lex_conf.cc"
 yy415:
 	yych = (unsigned char)*++cur;
 	if (yych != 't') goto yy13;
@@ -1275,7 +1274,7 @@ yy415:
 yy418:
 #line 72 "../src/parse/lex_conf.re"
 	{ opts.set_condGoto         (lex_conf_string ()); return; }
-#line 1279 "src/parse/lex_conf.cc"
+#line 1278 "src/parse/lex_conf.cc"
 yy419:
 	yych = (unsigned char)*++cur;
 	if (yych != 'c') goto yy13;
@@ -1288,7 +1287,7 @@ yy419:
 	++cur;
 #line 73 "../src/parse/lex_conf.re"
 	{ opts.set_condGotoParam    (lex_conf_string ()); return; }
-#line 1292 "src/parse/lex_conf.cc"
+#line 1291 "src/parse/lex_conf.cc"
 yy425:
 	yych = (unsigned char)*++cur;
 	if (yych != 'u') goto yy13;
@@ -1309,7 +1308,7 @@ yy425:
 	++cur;
 #line 69 "../src/parse/lex_conf.re"
 	{ opts.set_condEnumPrefix   (lex_conf_string ()); return; }
-#line 1313 "src/parse/lex_conf.cc"
+#line 1312 "src/parse/lex_conf.cc"
 yy435:
 	yych = (unsigned char)*++cur;
 	if (yych != 'e') goto yy13;
@@ -1322,7 +1321,7 @@ yy435:
 	++cur;
 #line 68 "../src/parse/lex_conf.re"
 	{ opts.set_condPrefix       (lex_conf_string ()); return; }
-#line 1326 "src/parse/lex_conf.cc"
+#line 1325 "src/parse/lex_conf.cc"
 yy441:
 	yych = (unsigned char)*++cur;
 	if (yych != 't') goto yy13;
@@ -1359,7 +1358,7 @@ yy441:
 		opts.set_cGotoThreshold (static_cast<uint32_t> (n));
 		return;
 	}
-#line 1363 "src/parse/lex_conf.cc"
+#line 1362 "src/parse/lex_conf.cc"
 }
 #line 148 "../src/parse/lex_conf.re"
 
@@ -1368,7 +1367,7 @@ yy441:
 void Scanner::lex_conf_assign ()
 {
 
-#line 1372 "src/parse/lex_conf.cc"
+#line 1371 "src/parse/lex_conf.cc"
 {
 	unsigned char yych;
 	static const unsigned char yybm[] = {
@@ -1417,7 +1416,7 @@ void Scanner::lex_conf_assign ()
 yy458:
 #line 154 "../src/parse/lex_conf.re"
 	{ fatal ("missing '=' in configuration"); }
-#line 1421 "src/parse/lex_conf.cc"
+#line 1420 "src/parse/lex_conf.cc"
 yy459:
 	yych = (unsigned char)*(ptr = ++cur);
 	if (yych <= 0x1F) {
@@ -1435,7 +1434,7 @@ yy460:
 yy461:
 #line 155 "../src/parse/lex_conf.re"
 	{ return; }
-#line 1439 "src/parse/lex_conf.cc"
+#line 1438 "src/parse/lex_conf.cc"
 yy462:
 	++cur;
 	if (lim <= cur) fill(1);
@@ -1465,7 +1464,7 @@ yy464:
 void Scanner::lex_conf_semicolon ()
 {
 
-#line 1469 "src/parse/lex_conf.cc"
+#line 1468 "src/parse/lex_conf.cc"
 {
 	unsigned char yych;
 	static const unsigned char yybm[] = {
@@ -1514,7 +1513,7 @@ void Scanner::lex_conf_semicolon ()
 yy470:
 #line 162 "../src/parse/lex_conf.re"
 	{ fatal ("missing ending ';' in configuration"); }
-#line 1518 "src/parse/lex_conf.cc"
+#line 1517 "src/parse/lex_conf.cc"
 yy471:
 	yych = (unsigned char)*(ptr = ++cur);
 	if (yybm[0+yych] & 128) {
@@ -1527,7 +1526,7 @@ yy472:
 yy473:
 #line 163 "../src/parse/lex_conf.re"
 	{ return; }
-#line 1531 "src/parse/lex_conf.cc"
+#line 1530 "src/parse/lex_conf.cc"
 yy474:
 	yych = (unsigned char)*++cur;
 	goto yy473;
@@ -1551,7 +1550,7 @@ int32_t Scanner::lex_conf_number ()
 	lex_conf_assign ();
 	tok = cur;
 
-#line 1555 "src/parse/lex_conf.cc"
+#line 1554 "src/parse/lex_conf.cc"
 {
 	unsigned char yych;
 	static const unsigned char yybm[] = {
@@ -1610,7 +1609,7 @@ yy482:
 		lex_conf_semicolon ();
 		return n;
 	}
-#line 1614 "src/parse/lex_conf.cc"
+#line 1613 "src/parse/lex_conf.cc"
 yy483:
 	yych = (unsigned char)*++cur;
 	if (yych <= '0') goto yy480;
@@ -1634,7 +1633,7 @@ std::string Scanner::lex_conf_string ()
 	std::string s;
 	tok = cur;
 
-#line 1638 "src/parse/lex_conf.cc"
+#line 1637 "src/parse/lex_conf.cc"
 {
 	unsigned char yych;
 	static const unsigned char yybm[] = {
@@ -1694,7 +1693,7 @@ yy488:
 		s = std::string(tok, tok_len());
 		goto end;
 	}
-#line 1698 "src/parse/lex_conf.cc"
+#line 1697 "src/parse/lex_conf.cc"
 yy489:
 	++cur;
 #line 191 "../src/parse/lex_conf.re"
@@ -1712,7 +1711,7 @@ yy489:
 			}
 		}
 	}
-#line 1716 "src/parse/lex_conf.cc"
+#line 1715 "src/parse/lex_conf.cc"
 yy491:
 	++cur;
 	if (lim <= cur) fill(1);