From eb8b720b855cbdfc4b9185ee28b44e6e028dd07e Mon Sep 17 00:00:00 2001
From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Sat, 21 Jan 2006 01:08:06 +0000
Subject: [PATCH] - Fix #line info generation once more # A generic&automatic
 solution is on it's way

---
 code.cc           |   8 ++-
 test/bug1054496.c |   8 +--
 test/bug1163046.c |   6 +-
 test/bug1187785.c |   4 +-
 test/bug1390174.c |   4 +-
 test/c.c          | 180 +++++++++++++++++++++++-----------------------
 test/cmmap.c      | 180 +++++++++++++++++++++++-----------------------
 test/cnokw.c      | 116 +++++++++++++++---------------
 test/config3.c    |  26 +++----
 test/ctx.c        |  10 +--
 test/cunroll.c    | 148 +++++++++++++++++++-------------------
 test/input10.c    |   4 +-
 test/input11.c    |   8 +--
 test/modula.c     | 168 +++++++++++++++++++++----------------------
 test/push.c       |  40 +++++------
 test/repeater.c   |  12 ++--
 test/sample.c     |  10 +--
 test/scanner.c    |  56 +++++++--------
 18 files changed, 495 insertions(+), 493 deletions(-)

diff --git a/code.cc b/code.cc
index 250bdcda..24b5e1c6 100644
--- a/code.cc
+++ b/code.cc
@@ -493,9 +493,9 @@ void Rule::emit(std::ostream &o, uint ind, bool &) const
 	o << rule->code->text;
 	// Counting the oline's is done by SubStr::out()
 	o << "\n";
+	++oline;
 	if (!iFlag)
 	{
-		++oline;
 		o << "#line " << oline++ << " \"" << outputFileName << "\"\n";
 		//    o << "\n#line " << rule->code->line
 		//      << "\n\t" << rule->code->text << "\n";
@@ -589,6 +589,7 @@ bool genCases(std::ostream &o, uint ind, uint lb, Span *s, bool &newLine, uint m
 	if (!newLine)
 	{
 		o << "\n";
+		++oline;
 	}
 	newLine = true;
 	if (lb < s->ub)
@@ -643,6 +644,7 @@ void Go::genSwitch(std::ostream &o, uint ind, const State *from, const State *ne
 		if (dFlag)
 		{
 			o << indent(ind) << "YYDEBUG(-1, yych);\n";
+			++oline;
 		}
 
 		if (readCh)
@@ -1394,8 +1396,8 @@ void DFA::emit(std::ostream &o, uint ind)
 	vFillIndexes = orgVFillIndexes;
 	oline = nOrgOline;
 
-	oline++;
 	o << "\n";
+	++oline;
 	if (!iFlag)
 	{
 		o << "#line " << oline++ << " \"" << outputFileName << "\"\n";
@@ -1421,7 +1423,7 @@ void DFA::emit(std::ostream &o, uint ind)
 	if (bUsedCtxMarker)
 	{
 		o << indent(ind) << "YYCTYPE *yyctxmarker = YYCURSOR;\n";
-		oline++;
+		++oline;
 	}
 
 	if (hasFillLabels == true)
diff --git a/test/bug1054496.c b/test/bug1054496.c
index b31c02ac..7a4c8711 100755
--- a/test/bug1054496.c
+++ b/test/bug1054496.c
@@ -91,12 +91,12 @@ yy2:
 yy3:
 #line 25 "bug1054496.re"
 	{ goto cont; }
-#line 93 "<stdout>"
+#line 95 "<stdout>"
 yy4:
 	++YYCURSOR;
 #line 24 "bug1054496.re"
 	{ RET(TAG_EOI); }
-#line 98 "<stdout>"
+#line 100 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -160,7 +160,7 @@ yy7:
 yy8:
 #line 22 "bug1054496.re"
 	{ RET(TAG_A); }
-#line 161 "<stdout>"
+#line 164 "<stdout>"
 yy9:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -223,7 +223,7 @@ yy9:
 yy11:
 #line 23 "bug1054496.re"
 	{ RET(TAG_TAG); }
-#line 223 "<stdout>"
+#line 227 "<stdout>"
 }
 #line 26 "bug1054496.re"
 
diff --git a/test/bug1163046.c b/test/bug1163046.c
index df3e40d6..8800c0b3 100755
--- a/test/bug1163046.c
+++ b/test/bug1163046.c
@@ -39,7 +39,7 @@ yy2:
 yy3:
 #line 23 "bug1163046.re"
 	{ goto next; }
-#line 42 "<stdout>"
+#line 43 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -47,7 +47,7 @@ yy5:
 	++YYCURSOR;
 #line 25 "bug1163046.re"
 	{ return false; }
-#line 50 "<stdout>"
+#line 51 "<stdout>"
 yy7:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -350,7 +350,7 @@ yy51:
 		if (token == start || *(token - 1) == '\n')
 		return true; else goto next;
 	}
-#line 321 "<stdout>"
+#line 354 "<stdout>"
 }
 #line 26 "bug1163046.re"
 
diff --git a/test/bug1187785.c b/test/bug1187785.c
index 362f3d41..de99df19 100755
--- a/test/bug1187785.c
+++ b/test/bug1187785.c
@@ -294,7 +294,7 @@ yy2:
 yy3:
 #line 23 "bug1187785.re"
 	{ goto cont; }
-#line 297 "<stdout>"
+#line 298 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -569,7 +569,7 @@ yy8:
 	++YYCURSOR;
 #line 22 "bug1187785.re"
 	{ RET(1); }
-#line 571 "<stdout>"
+#line 573 "<stdout>"
 }
 #line 24 "bug1187785.re"
 
diff --git a/test/bug1390174.c b/test/bug1390174.c
index 7e70aa50..e55603be 100755
--- a/test/bug1390174.c
+++ b/test/bug1390174.c
@@ -40,13 +40,13 @@ yy2:
 yy3:
 #line 19 "bug1390174.re"
 	{RET(0);}
-#line 42 "<stdout>"
+#line 44 "<stdout>"
 yy4:
 	++YYCURSOR;
 yy5:
 #line 18 "bug1390174.re"
 	{RET(1);}
-#line 48 "<stdout>"
+#line 50 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
diff --git a/test/c.c b/test/c.c
index d32b46b0..fe3246e9 100644
--- a/test/c.c
+++ b/test/c.c
@@ -240,7 +240,7 @@ yy2:
 yy3:
 #line 222 "c.re"
 	{ RET('/'); }
-#line 237 "<stdout>"
+#line 244 "<stdout>"
 yy4:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -250,7 +250,7 @@ yy4:
 yy5:
 #line 171 "c.re"
 	{ RET(ID); }
-#line 247 "<stdout>"
+#line 254 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -363,7 +363,7 @@ yy21:
 yy22:
 #line 175 "c.re"
 	{ RET(ICON); }
-#line 356 "<stdout>"
+#line 367 "<stdout>"
 yy23:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -381,7 +381,7 @@ yy25:
 		printf("unexpected character: %c\n", *s->tok);
 		goto std;
 	    }
-#line 374 "<stdout>"
+#line 385 "<stdout>"
 yy26:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -402,7 +402,7 @@ yy26:
 yy27:
 #line 215 "c.re"
 	{ RET('.'); }
-#line 395 "<stdout>"
+#line 406 "<stdout>"
 yy28:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -420,7 +420,7 @@ yy29:
 yy30:
 #line 225 "c.re"
 	{ RET('>'); }
-#line 413 "<stdout>"
+#line 424 "<stdout>"
 yy31:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -431,7 +431,7 @@ yy31:
 yy32:
 #line 224 "c.re"
 	{ RET('<'); }
-#line 424 "<stdout>"
+#line 435 "<stdout>"
 yy33:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -442,7 +442,7 @@ yy33:
 yy34:
 #line 220 "c.re"
 	{ RET('+'); }
-#line 435 "<stdout>"
+#line 446 "<stdout>"
 yy35:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -454,7 +454,7 @@ yy35:
 yy36:
 #line 219 "c.re"
 	{ RET('-'); }
-#line 447 "<stdout>"
+#line 458 "<stdout>"
 yy37:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -464,7 +464,7 @@ yy37:
 yy38:
 #line 221 "c.re"
 	{ RET('*'); }
-#line 457 "<stdout>"
+#line 468 "<stdout>"
 yy39:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -474,7 +474,7 @@ yy39:
 yy40:
 #line 223 "c.re"
 	{ RET('%'); }
-#line 467 "<stdout>"
+#line 478 "<stdout>"
 yy41:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -485,7 +485,7 @@ yy41:
 yy42:
 #line 216 "c.re"
 	{ RET('&'); }
-#line 478 "<stdout>"
+#line 489 "<stdout>"
 yy43:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -495,7 +495,7 @@ yy43:
 yy44:
 #line 226 "c.re"
 	{ RET('^'); }
-#line 488 "<stdout>"
+#line 499 "<stdout>"
 yy45:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -506,7 +506,7 @@ yy45:
 yy46:
 #line 227 "c.re"
 	{ RET('|'); }
-#line 499 "<stdout>"
+#line 510 "<stdout>"
 yy47:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -516,7 +516,7 @@ yy47:
 yy48:
 #line 210 "c.re"
 	{ RET('='); }
-#line 509 "<stdout>"
+#line 520 "<stdout>"
 yy49:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -526,62 +526,62 @@ yy49:
 yy50:
 #line 217 "c.re"
 	{ RET('!'); }
-#line 519 "<stdout>"
+#line 530 "<stdout>"
 yy51:
 	++YYCURSOR;
 #line 205 "c.re"
 	{ RET(';'); }
-#line 524 "<stdout>"
+#line 535 "<stdout>"
 yy53:
 	++YYCURSOR;
 #line 206 "c.re"
 	{ RET('{'); }
-#line 529 "<stdout>"
+#line 540 "<stdout>"
 yy55:
 	++YYCURSOR;
 #line 207 "c.re"
 	{ RET('}'); }
-#line 534 "<stdout>"
+#line 545 "<stdout>"
 yy57:
 	++YYCURSOR;
 #line 208 "c.re"
 	{ RET(','); }
-#line 539 "<stdout>"
+#line 550 "<stdout>"
 yy59:
 	++YYCURSOR;
 #line 209 "c.re"
 	{ RET(':'); }
-#line 544 "<stdout>"
+#line 555 "<stdout>"
 yy61:
 	++YYCURSOR;
 #line 211 "c.re"
 	{ RET('('); }
-#line 549 "<stdout>"
+#line 560 "<stdout>"
 yy63:
 	++YYCURSOR;
 #line 212 "c.re"
 	{ RET(')'); }
-#line 554 "<stdout>"
+#line 565 "<stdout>"
 yy65:
 	++YYCURSOR;
 #line 213 "c.re"
 	{ RET('['); }
-#line 559 "<stdout>"
+#line 570 "<stdout>"
 yy67:
 	++YYCURSOR;
 #line 214 "c.re"
 	{ RET(']'); }
-#line 564 "<stdout>"
+#line 575 "<stdout>"
 yy69:
 	++YYCURSOR;
 #line 218 "c.re"
 	{ RET('~'); }
-#line 569 "<stdout>"
+#line 580 "<stdout>"
 yy71:
 	++YYCURSOR;
 #line 228 "c.re"
 	{ RET('?'); }
-#line 574 "<stdout>"
+#line 585 "<stdout>"
 yy73:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -589,7 +589,7 @@ yy73:
 yy74:
 #line 231 "c.re"
 	{ goto std; }
-#line 582 "<stdout>"
+#line 593 "<stdout>"
 yy75:
 	++YYCURSOR;
 #line 234 "c.re"
@@ -598,7 +598,7 @@ yy75:
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 591 "<stdout>"
+#line 602 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy25;
@@ -618,77 +618,77 @@ yy80:
 	++YYCURSOR;
 #line 204 "c.re"
 	{ RET(NEQ); }
-#line 609 "<stdout>"
+#line 622 "<stdout>"
 yy82:
 	++YYCURSOR;
 #line 203 "c.re"
 	{ RET(EQL); }
-#line 614 "<stdout>"
+#line 627 "<stdout>"
 yy84:
 	++YYCURSOR;
 #line 200 "c.re"
 	{ RET(OROR); }
-#line 619 "<stdout>"
+#line 632 "<stdout>"
 yy86:
 	++YYCURSOR;
 #line 193 "c.re"
 	{ RET(OREQ); }
-#line 624 "<stdout>"
+#line 637 "<stdout>"
 yy88:
 	++YYCURSOR;
 #line 192 "c.re"
 	{ RET(XOREQ); }
-#line 629 "<stdout>"
+#line 642 "<stdout>"
 yy90:
 	++YYCURSOR;
 #line 199 "c.re"
 	{ RET(ANDAND); }
-#line 634 "<stdout>"
+#line 647 "<stdout>"
 yy92:
 	++YYCURSOR;
 #line 191 "c.re"
 	{ RET(ANDEQ); }
-#line 639 "<stdout>"
+#line 652 "<stdout>"
 yy94:
 	++YYCURSOR;
 #line 190 "c.re"
 	{ RET(MODEQ); }
-#line 644 "<stdout>"
+#line 657 "<stdout>"
 yy96:
 	++YYCURSOR;
 #line 188 "c.re"
 	{ RET(MULEQ); }
-#line 649 "<stdout>"
+#line 662 "<stdout>"
 yy98:
 	++YYCURSOR;
 #line 198 "c.re"
 	{ RET(DEREF); }
-#line 654 "<stdout>"
+#line 667 "<stdout>"
 yy100:
 	++YYCURSOR;
 #line 197 "c.re"
 	{ RET(DECR); }
-#line 659 "<stdout>"
+#line 672 "<stdout>"
 yy102:
 	++YYCURSOR;
 #line 187 "c.re"
 	{ RET(SUBEQ); }
-#line 664 "<stdout>"
+#line 677 "<stdout>"
 yy104:
 	++YYCURSOR;
 #line 196 "c.re"
 	{ RET(INCR); }
-#line 669 "<stdout>"
+#line 682 "<stdout>"
 yy106:
 	++YYCURSOR;
 #line 186 "c.re"
 	{ RET(ADDEQ); }
-#line 674 "<stdout>"
+#line 687 "<stdout>"
 yy108:
 	++YYCURSOR;
 #line 201 "c.re"
 	{ RET(LEQ); }
-#line 679 "<stdout>"
+#line 692 "<stdout>"
 yy110:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -698,17 +698,17 @@ yy110:
 yy111:
 #line 195 "c.re"
 	{ RET(LSHIFT); }
-#line 689 "<stdout>"
+#line 702 "<stdout>"
 yy112:
 	++YYCURSOR;
 #line 185 "c.re"
 	{ RET(LSHIFTEQ); }
-#line 694 "<stdout>"
+#line 707 "<stdout>"
 yy114:
 	++YYCURSOR;
 #line 202 "c.re"
 	{ RET(GEQ); }
-#line 699 "<stdout>"
+#line 712 "<stdout>"
 yy116:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -718,12 +718,12 @@ yy116:
 yy117:
 #line 194 "c.re"
 	{ RET(RSHIFT); }
-#line 709 "<stdout>"
+#line 722 "<stdout>"
 yy118:
 	++YYCURSOR;
 #line 184 "c.re"
 	{ RET(RSHIFTEQ); }
-#line 714 "<stdout>"
+#line 727 "<stdout>"
 yy120:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -774,7 +774,7 @@ yy124:
 	++YYCURSOR;
 #line 181 "c.re"
 	{ RET(SCON); }
-#line 756 "<stdout>"
+#line 778 "<stdout>"
 yy126:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -887,7 +887,7 @@ yy132:
 yy134:
 #line 178 "c.re"
 	{ RET(FCON); }
-#line 861 "<stdout>"
+#line 891 "<stdout>"
 yy135:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -948,7 +948,7 @@ yy140:
 	++YYCURSOR;
 #line 183 "c.re"
 	{ RET(ELLIPSIS); }
-#line 918 "<stdout>"
+#line 952 "<stdout>"
 yy142:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1566,7 +1566,7 @@ yy184:
 yy185:
 #line 169 "c.re"
 	{ RET(WHILE); }
-#line 1476 "<stdout>"
+#line 1570 "<stdout>"
 yy186:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1681,7 +1681,7 @@ yy193:
 yy194:
 #line 168 "c.re"
 	{ RET(VOLATILE); }
-#line 1588 "<stdout>"
+#line 1685 "<stdout>"
 yy195:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1753,7 +1753,7 @@ yy195:
 yy196:
 #line 167 "c.re"
 	{ RET(VOID); }
-#line 1657 "<stdout>"
+#line 1757 "<stdout>"
 yy197:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1868,7 +1868,7 @@ yy204:
 yy205:
 #line 166 "c.re"
 	{ RET(UNSIGNED); }
-#line 1769 "<stdout>"
+#line 1872 "<stdout>"
 yy206:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1946,7 +1946,7 @@ yy207:
 yy208:
 #line 165 "c.re"
 	{ RET(UNION); }
-#line 1844 "<stdout>"
+#line 1950 "<stdout>"
 yy209:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2048,7 +2048,7 @@ yy214:
 yy215:
 #line 164 "c.re"
 	{ RET(TYPEDEF); }
-#line 1943 "<stdout>"
+#line 2052 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2164,7 +2164,7 @@ yy223:
 yy224:
 #line 163 "c.re"
 	{ RET(SWITCH); }
-#line 2056 "<stdout>"
+#line 2168 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2260,7 +2260,7 @@ yy229:
 yy230:
 #line 162 "c.re"
 	{ RET(STRUCT); }
-#line 2149 "<stdout>"
+#line 2264 "<stdout>"
 yy231:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2344,7 +2344,7 @@ yy233:
 yy234:
 #line 161 "c.re"
 	{ RET(STATIC); }
-#line 2230 "<stdout>"
+#line 2348 "<stdout>"
 yy235:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2440,7 +2440,7 @@ yy239:
 yy240:
 #line 160 "c.re"
 	{ RET(SIZEOF); }
-#line 2323 "<stdout>"
+#line 2444 "<stdout>"
 yy241:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2524,7 +2524,7 @@ yy243:
 yy244:
 #line 159 "c.re"
 	{ RET(SIGNED); }
-#line 2404 "<stdout>"
+#line 2528 "<stdout>"
 yy245:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2608,7 +2608,7 @@ yy247:
 yy248:
 #line 158 "c.re"
 	{ RET(SHORT); }
-#line 2485 "<stdout>"
+#line 2612 "<stdout>"
 yy249:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2711,7 +2711,7 @@ yy254:
 yy255:
 #line 157 "c.re"
 	{ RET(RETURN); }
-#line 2585 "<stdout>"
+#line 2715 "<stdout>"
 yy256:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2807,7 +2807,7 @@ yy260:
 yy261:
 #line 156 "c.re"
 	{ RET(REGISTER); }
-#line 2678 "<stdout>"
+#line 2811 "<stdout>"
 yy262:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2891,7 +2891,7 @@ yy264:
 yy265:
 #line 155 "c.re"
 	{ RET(LONG); }
-#line 2759 "<stdout>"
+#line 2895 "<stdout>"
 yy266:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2963,7 +2963,7 @@ yy266:
 yy267:
 #line 153 "c.re"
 	{ RET(IF); }
-#line 2828 "<stdout>"
+#line 2967 "<stdout>"
 yy268:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3041,7 +3041,7 @@ yy269:
 yy270:
 #line 154 "c.re"
 	{ RET(INT); }
-#line 2903 "<stdout>"
+#line 3045 "<stdout>"
 yy271:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3125,7 +3125,7 @@ yy273:
 yy274:
 #line 152 "c.re"
 	{ RET(GOTO); }
-#line 2984 "<stdout>"
+#line 3129 "<stdout>"
 yy275:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3209,7 +3209,7 @@ yy277:
 yy278:
 #line 151 "c.re"
 	{ RET(FOR); }
-#line 3065 "<stdout>"
+#line 3213 "<stdout>"
 yy279:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3293,7 +3293,7 @@ yy281:
 yy282:
 #line 150 "c.re"
 	{ RET(FLOAT); }
-#line 3146 "<stdout>"
+#line 3297 "<stdout>"
 yy283:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3401,7 +3401,7 @@ yy289:
 yy290:
 #line 149 "c.re"
 	{ RET(EXTERN); }
-#line 3251 "<stdout>"
+#line 3405 "<stdout>"
 yy291:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3479,7 +3479,7 @@ yy292:
 yy293:
 #line 148 "c.re"
 	{ RET(ENUM); }
-#line 3326 "<stdout>"
+#line 3483 "<stdout>"
 yy294:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3557,7 +3557,7 @@ yy295:
 yy296:
 #line 147 "c.re"
 	{ RET(ELSE); }
-#line 3401 "<stdout>"
+#line 3561 "<stdout>"
 yy297:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3635,7 +3635,7 @@ yy298:
 yy299:
 #line 145 "c.re"
 	{ RET(DO); }
-#line 3475 "<stdout>"
+#line 3639 "<stdout>"
 yy300:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3725,7 +3725,7 @@ yy303:
 yy304:
 #line 146 "c.re"
 	{ RET(DOUBLE); }
-#line 3562 "<stdout>"
+#line 3729 "<stdout>"
 yy305:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3821,7 +3821,7 @@ yy309:
 yy310:
 #line 144 "c.re"
 	{ RET(DEFAULT); }
-#line 3655 "<stdout>"
+#line 3825 "<stdout>"
 yy311:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3948,7 +3948,7 @@ yy320:
 yy321:
 #line 143 "c.re"
 	{ RET(CONTINUE); }
-#line 3779 "<stdout>"
+#line 3952 "<stdout>"
 yy322:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -4020,7 +4020,7 @@ yy322:
 yy323:
 #line 142 "c.re"
 	{ RET(CONST); }
-#line 3848 "<stdout>"
+#line 4024 "<stdout>"
 yy324:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4098,7 +4098,7 @@ yy325:
 yy326:
 #line 141 "c.re"
 	{ RET(CHAR); }
-#line 3923 "<stdout>"
+#line 4102 "<stdout>"
 yy327:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4176,7 +4176,7 @@ yy328:
 yy329:
 #line 140 "c.re"
 	{ RET(CASE); }
-#line 3998 "<stdout>"
+#line 4180 "<stdout>"
 yy330:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4266,7 +4266,7 @@ yy333:
 yy334:
 #line 139 "c.re"
 	{ RET(BREAK); }
-#line 4085 "<stdout>"
+#line 4270 "<stdout>"
 yy335:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4350,24 +4350,24 @@ yy337:
 yy338:
 #line 138 "c.re"
 	{ RET(AUTO); }
-#line 4166 "<stdout>"
+#line 4354 "<stdout>"
 yy339:
 	++YYCURSOR;
 #line 189 "c.re"
 	{ RET(DIVEQ); }
-#line 4171 "<stdout>"
+#line 4359 "<stdout>"
 yy341:
 	++YYCURSOR;
 #line 136 "c.re"
 	{ goto comment; }
-#line 4176 "<stdout>"
+#line 4364 "<stdout>"
 }
 #line 245 "c.re"
 
 
 comment:
 
-#line 4183 "<stdout>"
+#line 4371 "<stdout>"
 {
 	YYCTYPE yych;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -4386,7 +4386,7 @@ yy345:
 yy346:
 #line 256 "c.re"
 	{ goto comment; }
-#line 4202 "<stdout>"
+#line 4390 "<stdout>"
 yy347:
 	++YYCURSOR;
 #line 251 "c.re"
@@ -4395,7 +4395,7 @@ yy347:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4211 "<stdout>"
+#line 4399 "<stdout>"
 yy349:
 	yych = *++YYCURSOR;
 	goto yy346;
@@ -4403,7 +4403,7 @@ yy350:
 	++YYCURSOR;
 #line 249 "c.re"
 	{ goto std; }
-#line 4219 "<stdout>"
+#line 4407 "<stdout>"
 }
 #line 257 "c.re"
 
diff --git a/test/cmmap.c b/test/cmmap.c
index dbff8783..377401c7 100644
--- a/test/cmmap.c
+++ b/test/cmmap.c
@@ -223,7 +223,7 @@ yy2:
 yy3:
 #line 205 "cmmap.re"
 	{ RET('/'); }
-#line 220 "<stdout>"
+#line 227 "<stdout>"
 yy4:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -233,7 +233,7 @@ yy4:
 yy5:
 #line 154 "cmmap.re"
 	{ RET(ID); }
-#line 230 "<stdout>"
+#line 237 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -346,7 +346,7 @@ yy21:
 yy22:
 #line 158 "cmmap.re"
 	{ RET(ICON); }
-#line 339 "<stdout>"
+#line 350 "<stdout>"
 yy23:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -364,7 +364,7 @@ yy25:
 		printf("unexpected character: %c\n", *s->tok);
 		goto std;
 	    }
-#line 357 "<stdout>"
+#line 368 "<stdout>"
 yy26:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -385,7 +385,7 @@ yy26:
 yy27:
 #line 198 "cmmap.re"
 	{ RET('.'); }
-#line 378 "<stdout>"
+#line 389 "<stdout>"
 yy28:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -403,7 +403,7 @@ yy29:
 yy30:
 #line 208 "cmmap.re"
 	{ RET('>'); }
-#line 396 "<stdout>"
+#line 407 "<stdout>"
 yy31:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -414,7 +414,7 @@ yy31:
 yy32:
 #line 207 "cmmap.re"
 	{ RET('<'); }
-#line 407 "<stdout>"
+#line 418 "<stdout>"
 yy33:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -425,7 +425,7 @@ yy33:
 yy34:
 #line 203 "cmmap.re"
 	{ RET('+'); }
-#line 418 "<stdout>"
+#line 429 "<stdout>"
 yy35:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -437,7 +437,7 @@ yy35:
 yy36:
 #line 202 "cmmap.re"
 	{ RET('-'); }
-#line 430 "<stdout>"
+#line 441 "<stdout>"
 yy37:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -447,7 +447,7 @@ yy37:
 yy38:
 #line 204 "cmmap.re"
 	{ RET('*'); }
-#line 440 "<stdout>"
+#line 451 "<stdout>"
 yy39:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -457,7 +457,7 @@ yy39:
 yy40:
 #line 206 "cmmap.re"
 	{ RET('%'); }
-#line 450 "<stdout>"
+#line 461 "<stdout>"
 yy41:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -468,7 +468,7 @@ yy41:
 yy42:
 #line 199 "cmmap.re"
 	{ RET('&'); }
-#line 461 "<stdout>"
+#line 472 "<stdout>"
 yy43:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -478,7 +478,7 @@ yy43:
 yy44:
 #line 209 "cmmap.re"
 	{ RET('^'); }
-#line 471 "<stdout>"
+#line 482 "<stdout>"
 yy45:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -489,7 +489,7 @@ yy45:
 yy46:
 #line 210 "cmmap.re"
 	{ RET('|'); }
-#line 482 "<stdout>"
+#line 493 "<stdout>"
 yy47:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -499,7 +499,7 @@ yy47:
 yy48:
 #line 193 "cmmap.re"
 	{ RET('='); }
-#line 492 "<stdout>"
+#line 503 "<stdout>"
 yy49:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -509,62 +509,62 @@ yy49:
 yy50:
 #line 200 "cmmap.re"
 	{ RET('!'); }
-#line 502 "<stdout>"
+#line 513 "<stdout>"
 yy51:
 	++YYCURSOR;
 #line 188 "cmmap.re"
 	{ RET(';'); }
-#line 507 "<stdout>"
+#line 518 "<stdout>"
 yy53:
 	++YYCURSOR;
 #line 189 "cmmap.re"
 	{ RET('{'); }
-#line 512 "<stdout>"
+#line 523 "<stdout>"
 yy55:
 	++YYCURSOR;
 #line 190 "cmmap.re"
 	{ RET('}'); }
-#line 517 "<stdout>"
+#line 528 "<stdout>"
 yy57:
 	++YYCURSOR;
 #line 191 "cmmap.re"
 	{ RET(','); }
-#line 522 "<stdout>"
+#line 533 "<stdout>"
 yy59:
 	++YYCURSOR;
 #line 192 "cmmap.re"
 	{ RET(':'); }
-#line 527 "<stdout>"
+#line 538 "<stdout>"
 yy61:
 	++YYCURSOR;
 #line 194 "cmmap.re"
 	{ RET('('); }
-#line 532 "<stdout>"
+#line 543 "<stdout>"
 yy63:
 	++YYCURSOR;
 #line 195 "cmmap.re"
 	{ RET(')'); }
-#line 537 "<stdout>"
+#line 548 "<stdout>"
 yy65:
 	++YYCURSOR;
 #line 196 "cmmap.re"
 	{ RET('['); }
-#line 542 "<stdout>"
+#line 553 "<stdout>"
 yy67:
 	++YYCURSOR;
 #line 197 "cmmap.re"
 	{ RET(']'); }
-#line 547 "<stdout>"
+#line 558 "<stdout>"
 yy69:
 	++YYCURSOR;
 #line 201 "cmmap.re"
 	{ RET('~'); }
-#line 552 "<stdout>"
+#line 563 "<stdout>"
 yy71:
 	++YYCURSOR;
 #line 211 "cmmap.re"
 	{ RET('?'); }
-#line 557 "<stdout>"
+#line 568 "<stdout>"
 yy73:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -572,7 +572,7 @@ yy73:
 yy74:
 #line 214 "cmmap.re"
 	{ goto std; }
-#line 565 "<stdout>"
+#line 576 "<stdout>"
 yy75:
 	++YYCURSOR;
 #line 217 "cmmap.re"
@@ -581,7 +581,7 @@ yy75:
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 574 "<stdout>"
+#line 585 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy25;
@@ -601,77 +601,77 @@ yy80:
 	++YYCURSOR;
 #line 187 "cmmap.re"
 	{ RET(NEQ); }
-#line 592 "<stdout>"
+#line 605 "<stdout>"
 yy82:
 	++YYCURSOR;
 #line 186 "cmmap.re"
 	{ RET(EQL); }
-#line 597 "<stdout>"
+#line 610 "<stdout>"
 yy84:
 	++YYCURSOR;
 #line 183 "cmmap.re"
 	{ RET(OROR); }
-#line 602 "<stdout>"
+#line 615 "<stdout>"
 yy86:
 	++YYCURSOR;
 #line 176 "cmmap.re"
 	{ RET(OREQ); }
-#line 607 "<stdout>"
+#line 620 "<stdout>"
 yy88:
 	++YYCURSOR;
 #line 175 "cmmap.re"
 	{ RET(XOREQ); }
-#line 612 "<stdout>"
+#line 625 "<stdout>"
 yy90:
 	++YYCURSOR;
 #line 182 "cmmap.re"
 	{ RET(ANDAND); }
-#line 617 "<stdout>"
+#line 630 "<stdout>"
 yy92:
 	++YYCURSOR;
 #line 174 "cmmap.re"
 	{ RET(ANDEQ); }
-#line 622 "<stdout>"
+#line 635 "<stdout>"
 yy94:
 	++YYCURSOR;
 #line 173 "cmmap.re"
 	{ RET(MODEQ); }
-#line 627 "<stdout>"
+#line 640 "<stdout>"
 yy96:
 	++YYCURSOR;
 #line 171 "cmmap.re"
 	{ RET(MULEQ); }
-#line 632 "<stdout>"
+#line 645 "<stdout>"
 yy98:
 	++YYCURSOR;
 #line 181 "cmmap.re"
 	{ RET(DEREF); }
-#line 637 "<stdout>"
+#line 650 "<stdout>"
 yy100:
 	++YYCURSOR;
 #line 180 "cmmap.re"
 	{ RET(DECR); }
-#line 642 "<stdout>"
+#line 655 "<stdout>"
 yy102:
 	++YYCURSOR;
 #line 170 "cmmap.re"
 	{ RET(SUBEQ); }
-#line 647 "<stdout>"
+#line 660 "<stdout>"
 yy104:
 	++YYCURSOR;
 #line 179 "cmmap.re"
 	{ RET(INCR); }
-#line 652 "<stdout>"
+#line 665 "<stdout>"
 yy106:
 	++YYCURSOR;
 #line 169 "cmmap.re"
 	{ RET(ADDEQ); }
-#line 657 "<stdout>"
+#line 670 "<stdout>"
 yy108:
 	++YYCURSOR;
 #line 184 "cmmap.re"
 	{ RET(LEQ); }
-#line 662 "<stdout>"
+#line 675 "<stdout>"
 yy110:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -681,17 +681,17 @@ yy110:
 yy111:
 #line 178 "cmmap.re"
 	{ RET(LSHIFT); }
-#line 672 "<stdout>"
+#line 685 "<stdout>"
 yy112:
 	++YYCURSOR;
 #line 168 "cmmap.re"
 	{ RET(LSHIFTEQ); }
-#line 677 "<stdout>"
+#line 690 "<stdout>"
 yy114:
 	++YYCURSOR;
 #line 185 "cmmap.re"
 	{ RET(GEQ); }
-#line 682 "<stdout>"
+#line 695 "<stdout>"
 yy116:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -701,12 +701,12 @@ yy116:
 yy117:
 #line 177 "cmmap.re"
 	{ RET(RSHIFT); }
-#line 692 "<stdout>"
+#line 705 "<stdout>"
 yy118:
 	++YYCURSOR;
 #line 167 "cmmap.re"
 	{ RET(RSHIFTEQ); }
-#line 697 "<stdout>"
+#line 710 "<stdout>"
 yy120:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -757,7 +757,7 @@ yy124:
 	++YYCURSOR;
 #line 164 "cmmap.re"
 	{ RET(SCON); }
-#line 739 "<stdout>"
+#line 761 "<stdout>"
 yy126:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -870,7 +870,7 @@ yy132:
 yy134:
 #line 161 "cmmap.re"
 	{ RET(FCON); }
-#line 844 "<stdout>"
+#line 874 "<stdout>"
 yy135:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -931,7 +931,7 @@ yy140:
 	++YYCURSOR;
 #line 166 "cmmap.re"
 	{ RET(ELLIPSIS); }
-#line 901 "<stdout>"
+#line 935 "<stdout>"
 yy142:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1549,7 +1549,7 @@ yy184:
 yy185:
 #line 152 "cmmap.re"
 	{ RET(WHILE); }
-#line 1459 "<stdout>"
+#line 1553 "<stdout>"
 yy186:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1664,7 +1664,7 @@ yy193:
 yy194:
 #line 151 "cmmap.re"
 	{ RET(VOLATILE); }
-#line 1571 "<stdout>"
+#line 1668 "<stdout>"
 yy195:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1736,7 +1736,7 @@ yy195:
 yy196:
 #line 150 "cmmap.re"
 	{ RET(VOID); }
-#line 1640 "<stdout>"
+#line 1740 "<stdout>"
 yy197:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1851,7 +1851,7 @@ yy204:
 yy205:
 #line 149 "cmmap.re"
 	{ RET(UNSIGNED); }
-#line 1752 "<stdout>"
+#line 1855 "<stdout>"
 yy206:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1929,7 +1929,7 @@ yy207:
 yy208:
 #line 148 "cmmap.re"
 	{ RET(UNION); }
-#line 1827 "<stdout>"
+#line 1933 "<stdout>"
 yy209:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2031,7 +2031,7 @@ yy214:
 yy215:
 #line 147 "cmmap.re"
 	{ RET(TYPEDEF); }
-#line 1926 "<stdout>"
+#line 2035 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2147,7 +2147,7 @@ yy223:
 yy224:
 #line 146 "cmmap.re"
 	{ RET(SWITCH); }
-#line 2039 "<stdout>"
+#line 2151 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2243,7 +2243,7 @@ yy229:
 yy230:
 #line 145 "cmmap.re"
 	{ RET(STRUCT); }
-#line 2132 "<stdout>"
+#line 2247 "<stdout>"
 yy231:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2327,7 +2327,7 @@ yy233:
 yy234:
 #line 144 "cmmap.re"
 	{ RET(STATIC); }
-#line 2213 "<stdout>"
+#line 2331 "<stdout>"
 yy235:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2423,7 +2423,7 @@ yy239:
 yy240:
 #line 143 "cmmap.re"
 	{ RET(SIZEOF); }
-#line 2306 "<stdout>"
+#line 2427 "<stdout>"
 yy241:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2507,7 +2507,7 @@ yy243:
 yy244:
 #line 142 "cmmap.re"
 	{ RET(SIGNED); }
-#line 2387 "<stdout>"
+#line 2511 "<stdout>"
 yy245:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2591,7 +2591,7 @@ yy247:
 yy248:
 #line 141 "cmmap.re"
 	{ RET(SHORT); }
-#line 2468 "<stdout>"
+#line 2595 "<stdout>"
 yy249:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2694,7 +2694,7 @@ yy254:
 yy255:
 #line 140 "cmmap.re"
 	{ RET(RETURN); }
-#line 2568 "<stdout>"
+#line 2698 "<stdout>"
 yy256:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2790,7 +2790,7 @@ yy260:
 yy261:
 #line 139 "cmmap.re"
 	{ RET(REGISTER); }
-#line 2661 "<stdout>"
+#line 2794 "<stdout>"
 yy262:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2874,7 +2874,7 @@ yy264:
 yy265:
 #line 138 "cmmap.re"
 	{ RET(LONG); }
-#line 2742 "<stdout>"
+#line 2878 "<stdout>"
 yy266:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2946,7 +2946,7 @@ yy266:
 yy267:
 #line 136 "cmmap.re"
 	{ RET(IF); }
-#line 2811 "<stdout>"
+#line 2950 "<stdout>"
 yy268:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3024,7 +3024,7 @@ yy269:
 yy270:
 #line 137 "cmmap.re"
 	{ RET(INT); }
-#line 2886 "<stdout>"
+#line 3028 "<stdout>"
 yy271:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3108,7 +3108,7 @@ yy273:
 yy274:
 #line 135 "cmmap.re"
 	{ RET(GOTO); }
-#line 2967 "<stdout>"
+#line 3112 "<stdout>"
 yy275:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3192,7 +3192,7 @@ yy277:
 yy278:
 #line 134 "cmmap.re"
 	{ RET(FOR); }
-#line 3048 "<stdout>"
+#line 3196 "<stdout>"
 yy279:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3276,7 +3276,7 @@ yy281:
 yy282:
 #line 133 "cmmap.re"
 	{ RET(FLOAT); }
-#line 3129 "<stdout>"
+#line 3280 "<stdout>"
 yy283:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3384,7 +3384,7 @@ yy289:
 yy290:
 #line 132 "cmmap.re"
 	{ RET(EXTERN); }
-#line 3234 "<stdout>"
+#line 3388 "<stdout>"
 yy291:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3462,7 +3462,7 @@ yy292:
 yy293:
 #line 131 "cmmap.re"
 	{ RET(ENUM); }
-#line 3309 "<stdout>"
+#line 3466 "<stdout>"
 yy294:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3540,7 +3540,7 @@ yy295:
 yy296:
 #line 130 "cmmap.re"
 	{ RET(ELSE); }
-#line 3384 "<stdout>"
+#line 3544 "<stdout>"
 yy297:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3618,7 +3618,7 @@ yy298:
 yy299:
 #line 128 "cmmap.re"
 	{ RET(DO); }
-#line 3458 "<stdout>"
+#line 3622 "<stdout>"
 yy300:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3708,7 +3708,7 @@ yy303:
 yy304:
 #line 129 "cmmap.re"
 	{ RET(DOUBLE); }
-#line 3545 "<stdout>"
+#line 3712 "<stdout>"
 yy305:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3804,7 +3804,7 @@ yy309:
 yy310:
 #line 127 "cmmap.re"
 	{ RET(DEFAULT); }
-#line 3638 "<stdout>"
+#line 3808 "<stdout>"
 yy311:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3931,7 +3931,7 @@ yy320:
 yy321:
 #line 126 "cmmap.re"
 	{ RET(CONTINUE); }
-#line 3762 "<stdout>"
+#line 3935 "<stdout>"
 yy322:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -4003,7 +4003,7 @@ yy322:
 yy323:
 #line 125 "cmmap.re"
 	{ RET(CONST); }
-#line 3831 "<stdout>"
+#line 4007 "<stdout>"
 yy324:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4081,7 +4081,7 @@ yy325:
 yy326:
 #line 124 "cmmap.re"
 	{ RET(CHAR); }
-#line 3906 "<stdout>"
+#line 4085 "<stdout>"
 yy327:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4159,7 +4159,7 @@ yy328:
 yy329:
 #line 123 "cmmap.re"
 	{ RET(CASE); }
-#line 3981 "<stdout>"
+#line 4163 "<stdout>"
 yy330:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4249,7 +4249,7 @@ yy333:
 yy334:
 #line 122 "cmmap.re"
 	{ RET(BREAK); }
-#line 4068 "<stdout>"
+#line 4253 "<stdout>"
 yy335:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4333,24 +4333,24 @@ yy337:
 yy338:
 #line 121 "cmmap.re"
 	{ RET(AUTO); }
-#line 4149 "<stdout>"
+#line 4337 "<stdout>"
 yy339:
 	++YYCURSOR;
 #line 172 "cmmap.re"
 	{ RET(DIVEQ); }
-#line 4154 "<stdout>"
+#line 4342 "<stdout>"
 yy341:
 	++YYCURSOR;
 #line 119 "cmmap.re"
 	{ goto comment; }
-#line 4159 "<stdout>"
+#line 4347 "<stdout>"
 }
 #line 228 "cmmap.re"
 
 
 comment:
 
-#line 4166 "<stdout>"
+#line 4354 "<stdout>"
 {
 	YYCTYPE yych;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -4369,7 +4369,7 @@ yy345:
 yy346:
 #line 239 "cmmap.re"
 	{ goto comment; }
-#line 4185 "<stdout>"
+#line 4373 "<stdout>"
 yy347:
 	++YYCURSOR;
 #line 234 "cmmap.re"
@@ -4378,7 +4378,7 @@ yy347:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4194 "<stdout>"
+#line 4382 "<stdout>"
 yy349:
 	yych = *++YYCURSOR;
 	goto yy346;
@@ -4386,7 +4386,7 @@ yy350:
 	++YYCURSOR;
 #line 232 "cmmap.re"
 	{ goto std; }
-#line 4202 "<stdout>"
+#line 4390 "<stdout>"
 }
 #line 240 "cmmap.re"
 
diff --git a/test/cnokw.c b/test/cnokw.c
index b5f08989..fe9d1b29 100644
--- a/test/cnokw.c
+++ b/test/cnokw.c
@@ -240,7 +240,7 @@ yy2:
 yy3:
 #line 189 "cnokw.re"
 	{ RET('/'); }
-#line 240 "<stdout>"
+#line 244 "<stdout>"
 yy4:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -248,7 +248,7 @@ yy4:
 yy5:
 #line 138 "cnokw.re"
 	{ RET(ID); }
-#line 248 "<stdout>"
+#line 252 "<stdout>"
 yy6:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -264,7 +264,7 @@ yy6:
 yy7:
 #line 142 "cnokw.re"
 	{ RET(ICON); }
-#line 260 "<stdout>"
+#line 268 "<stdout>"
 yy8:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -282,7 +282,7 @@ yy10:
 		printf("unexpected character: %c\n", *s->tok);
 		goto std;
 	    }
-#line 278 "<stdout>"
+#line 286 "<stdout>"
 yy11:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -303,7 +303,7 @@ yy11:
 yy12:
 #line 182 "cnokw.re"
 	{ RET('.'); }
-#line 299 "<stdout>"
+#line 307 "<stdout>"
 yy13:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -321,7 +321,7 @@ yy14:
 yy15:
 #line 192 "cnokw.re"
 	{ RET('>'); }
-#line 317 "<stdout>"
+#line 325 "<stdout>"
 yy16:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -332,7 +332,7 @@ yy16:
 yy17:
 #line 191 "cnokw.re"
 	{ RET('<'); }
-#line 328 "<stdout>"
+#line 336 "<stdout>"
 yy18:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -343,7 +343,7 @@ yy18:
 yy19:
 #line 187 "cnokw.re"
 	{ RET('+'); }
-#line 339 "<stdout>"
+#line 347 "<stdout>"
 yy20:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -355,7 +355,7 @@ yy20:
 yy21:
 #line 186 "cnokw.re"
 	{ RET('-'); }
-#line 351 "<stdout>"
+#line 359 "<stdout>"
 yy22:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -365,7 +365,7 @@ yy22:
 yy23:
 #line 188 "cnokw.re"
 	{ RET('*'); }
-#line 361 "<stdout>"
+#line 369 "<stdout>"
 yy24:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -375,7 +375,7 @@ yy24:
 yy25:
 #line 190 "cnokw.re"
 	{ RET('%'); }
-#line 371 "<stdout>"
+#line 379 "<stdout>"
 yy26:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -386,7 +386,7 @@ yy26:
 yy27:
 #line 183 "cnokw.re"
 	{ RET('&'); }
-#line 382 "<stdout>"
+#line 390 "<stdout>"
 yy28:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -396,7 +396,7 @@ yy28:
 yy29:
 #line 193 "cnokw.re"
 	{ RET('^'); }
-#line 392 "<stdout>"
+#line 400 "<stdout>"
 yy30:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -407,7 +407,7 @@ yy30:
 yy31:
 #line 194 "cnokw.re"
 	{ RET('|'); }
-#line 403 "<stdout>"
+#line 411 "<stdout>"
 yy32:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -417,7 +417,7 @@ yy32:
 yy33:
 #line 177 "cnokw.re"
 	{ RET('='); }
-#line 413 "<stdout>"
+#line 421 "<stdout>"
 yy34:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -427,62 +427,62 @@ yy34:
 yy35:
 #line 184 "cnokw.re"
 	{ RET('!'); }
-#line 423 "<stdout>"
+#line 431 "<stdout>"
 yy36:
 	++YYCURSOR;
 #line 172 "cnokw.re"
 	{ RET(';'); }
-#line 428 "<stdout>"
+#line 436 "<stdout>"
 yy38:
 	++YYCURSOR;
 #line 173 "cnokw.re"
 	{ RET('{'); }
-#line 433 "<stdout>"
+#line 441 "<stdout>"
 yy40:
 	++YYCURSOR;
 #line 174 "cnokw.re"
 	{ RET('}'); }
-#line 438 "<stdout>"
+#line 446 "<stdout>"
 yy42:
 	++YYCURSOR;
 #line 175 "cnokw.re"
 	{ RET(','); }
-#line 443 "<stdout>"
+#line 451 "<stdout>"
 yy44:
 	++YYCURSOR;
 #line 176 "cnokw.re"
 	{ RET(':'); }
-#line 448 "<stdout>"
+#line 456 "<stdout>"
 yy46:
 	++YYCURSOR;
 #line 178 "cnokw.re"
 	{ RET('('); }
-#line 453 "<stdout>"
+#line 461 "<stdout>"
 yy48:
 	++YYCURSOR;
 #line 179 "cnokw.re"
 	{ RET(')'); }
-#line 458 "<stdout>"
+#line 466 "<stdout>"
 yy50:
 	++YYCURSOR;
 #line 180 "cnokw.re"
 	{ RET('['); }
-#line 463 "<stdout>"
+#line 471 "<stdout>"
 yy52:
 	++YYCURSOR;
 #line 181 "cnokw.re"
 	{ RET(']'); }
-#line 468 "<stdout>"
+#line 476 "<stdout>"
 yy54:
 	++YYCURSOR;
 #line 185 "cnokw.re"
 	{ RET('~'); }
-#line 473 "<stdout>"
+#line 481 "<stdout>"
 yy56:
 	++YYCURSOR;
 #line 195 "cnokw.re"
 	{ RET('?'); }
-#line 478 "<stdout>"
+#line 486 "<stdout>"
 yy58:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -490,7 +490,7 @@ yy58:
 yy59:
 #line 198 "cnokw.re"
 	{ goto std; }
-#line 486 "<stdout>"
+#line 494 "<stdout>"
 yy60:
 	++YYCURSOR;
 #line 201 "cnokw.re"
@@ -499,7 +499,7 @@ yy60:
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 495 "<stdout>"
+#line 503 "<stdout>"
 yy62:
 	yych = *++YYCURSOR;
 	goto yy10;
@@ -519,77 +519,77 @@ yy65:
 	++YYCURSOR;
 #line 171 "cnokw.re"
 	{ RET(NEQ); }
-#line 513 "<stdout>"
+#line 523 "<stdout>"
 yy67:
 	++YYCURSOR;
 #line 170 "cnokw.re"
 	{ RET(EQL); }
-#line 518 "<stdout>"
+#line 528 "<stdout>"
 yy69:
 	++YYCURSOR;
 #line 167 "cnokw.re"
 	{ RET(OROR); }
-#line 523 "<stdout>"
+#line 533 "<stdout>"
 yy71:
 	++YYCURSOR;
 #line 160 "cnokw.re"
 	{ RET(OREQ); }
-#line 528 "<stdout>"
+#line 538 "<stdout>"
 yy73:
 	++YYCURSOR;
 #line 159 "cnokw.re"
 	{ RET(XOREQ); }
-#line 533 "<stdout>"
+#line 543 "<stdout>"
 yy75:
 	++YYCURSOR;
 #line 166 "cnokw.re"
 	{ RET(ANDAND); }
-#line 538 "<stdout>"
+#line 548 "<stdout>"
 yy77:
 	++YYCURSOR;
 #line 158 "cnokw.re"
 	{ RET(ANDEQ); }
-#line 543 "<stdout>"
+#line 553 "<stdout>"
 yy79:
 	++YYCURSOR;
 #line 157 "cnokw.re"
 	{ RET(MODEQ); }
-#line 548 "<stdout>"
+#line 558 "<stdout>"
 yy81:
 	++YYCURSOR;
 #line 155 "cnokw.re"
 	{ RET(MULEQ); }
-#line 553 "<stdout>"
+#line 563 "<stdout>"
 yy83:
 	++YYCURSOR;
 #line 165 "cnokw.re"
 	{ RET(DEREF); }
-#line 558 "<stdout>"
+#line 568 "<stdout>"
 yy85:
 	++YYCURSOR;
 #line 164 "cnokw.re"
 	{ RET(DECR); }
-#line 563 "<stdout>"
+#line 573 "<stdout>"
 yy87:
 	++YYCURSOR;
 #line 154 "cnokw.re"
 	{ RET(SUBEQ); }
-#line 568 "<stdout>"
+#line 578 "<stdout>"
 yy89:
 	++YYCURSOR;
 #line 163 "cnokw.re"
 	{ RET(INCR); }
-#line 573 "<stdout>"
+#line 583 "<stdout>"
 yy91:
 	++YYCURSOR;
 #line 153 "cnokw.re"
 	{ RET(ADDEQ); }
-#line 578 "<stdout>"
+#line 588 "<stdout>"
 yy93:
 	++YYCURSOR;
 #line 168 "cnokw.re"
 	{ RET(LEQ); }
-#line 583 "<stdout>"
+#line 593 "<stdout>"
 yy95:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -599,17 +599,17 @@ yy95:
 yy96:
 #line 162 "cnokw.re"
 	{ RET(LSHIFT); }
-#line 593 "<stdout>"
+#line 603 "<stdout>"
 yy97:
 	++YYCURSOR;
 #line 152 "cnokw.re"
 	{ RET(LSHIFTEQ); }
-#line 598 "<stdout>"
+#line 608 "<stdout>"
 yy99:
 	++YYCURSOR;
 #line 169 "cnokw.re"
 	{ RET(GEQ); }
-#line 603 "<stdout>"
+#line 613 "<stdout>"
 yy101:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -619,12 +619,12 @@ yy101:
 yy102:
 #line 161 "cnokw.re"
 	{ RET(RSHIFT); }
-#line 613 "<stdout>"
+#line 623 "<stdout>"
 yy103:
 	++YYCURSOR;
 #line 151 "cnokw.re"
 	{ RET(RSHIFTEQ); }
-#line 618 "<stdout>"
+#line 628 "<stdout>"
 yy105:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -675,7 +675,7 @@ yy109:
 	++YYCURSOR;
 #line 148 "cnokw.re"
 	{ RET(SCON); }
-#line 660 "<stdout>"
+#line 679 "<stdout>"
 yy111:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -788,7 +788,7 @@ yy117:
 yy119:
 #line 145 "cnokw.re"
 	{ RET(FCON); }
-#line 765 "<stdout>"
+#line 792 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -849,7 +849,7 @@ yy125:
 	++YYCURSOR;
 #line 150 "cnokw.re"
 	{ RET(ELLIPSIS); }
-#line 822 "<stdout>"
+#line 853 "<stdout>"
 yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1382,19 +1382,19 @@ yy166:
 	++YYCURSOR;
 #line 156 "cnokw.re"
 	{ RET(DIVEQ); }
-#line 1298 "<stdout>"
+#line 1386 "<stdout>"
 yy168:
 	++YYCURSOR;
 #line 136 "cnokw.re"
 	{ goto comment; }
-#line 1303 "<stdout>"
+#line 1391 "<stdout>"
 }
 #line 212 "cnokw.re"
 
 
 comment:
 
-#line 1310 "<stdout>"
+#line 1398 "<stdout>"
 {
 	YYCTYPE yych;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -1413,7 +1413,7 @@ yy172:
 yy173:
 #line 223 "cnokw.re"
 	{ goto comment; }
-#line 1329 "<stdout>"
+#line 1417 "<stdout>"
 yy174:
 	++YYCURSOR;
 #line 218 "cnokw.re"
@@ -1422,7 +1422,7 @@ yy174:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 1338 "<stdout>"
+#line 1426 "<stdout>"
 yy176:
 	yych = *++YYCURSOR;
 	goto yy173;
@@ -1430,7 +1430,7 @@ yy177:
 	++YYCURSOR;
 #line 216 "cnokw.re"
 	{ goto std; }
-#line 1346 "<stdout>"
+#line 1434 "<stdout>"
 }
 #line 224 "cnokw.re"
 
diff --git a/test/config3.c b/test/config3.c
index 30c6ebb4..a5cc784c 100755
--- a/test/config3.c
+++ b/test/config3.c
@@ -1,5 +1,5 @@
 /* Generated by re2c */
-#line 1 "config2.re"
+#line 1 "config3.re"
 #define	NULL		((char*) 0)
 #define	YYCTYPE		char
 #define	YYCURSOR	p
@@ -34,12 +34,12 @@ yy2:
 	yych = *YYCURSOR;
 	goto yy7;
 yy3:
-#line 13 "config2.re"
+#line 13 "config3.re"
 	{ return YYCURSOR; }
 #line 40 "<stdout>"
 yy4:
 	++YYCURSOR;
-#line 14 "config2.re"
+#line 14 "config3.re"
 	{ return NULL; }
 #line 45 "<stdout>"
 yy6:
@@ -61,7 +61,7 @@ yy7:
 	default:	goto yy3;
 	}
 }
-#line 15 "config2.re"
+#line 15 "config3.re"
 
 }
 
@@ -93,12 +93,12 @@ yy10:
 	yych = *YYCURSOR;
 	goto yy15;
 yy11:
-#line 23 "config2.re"
+#line 23 "config3.re"
 	{ return YYCURSOR; }
 #line 99 "<stdout>"
 yy12:
 	++YYCURSOR;
-#line 24 "config2.re"
+#line 24 "config3.re"
 	{ return NULL; }
 #line 104 "<stdout>"
 yy14:
@@ -120,7 +120,7 @@ yy15:
 	default:	goto yy11;
 	}
 }
-#line 25 "config2.re"
+#line 25 "config3.re"
 
 }
 
@@ -152,12 +152,12 @@ yy18:
 	yych = *YYCURSOR;
 	goto yy23;
 yy19:
-#line 33 "config2.re"
+#line 33 "config3.re"
 	{ return YYCURSOR; }
 #line 158 "<stdout>"
 yy20:
 	++YYCURSOR;
-#line 34 "config2.re"
+#line 34 "config3.re"
 	{ return NULL; }
 #line 163 "<stdout>"
 yy22:
@@ -179,7 +179,7 @@ yy23:
 	default:	goto yy19;
 	}
 }
-#line 35 "config2.re"
+#line 35 "config3.re"
 
 }
 
@@ -210,12 +210,12 @@ yy26:
 	yych = *YYCURSOR;
 	goto yy31;
 yy27:
-#line 43 "config2.re"
+#line 43 "config3.re"
 	{ return YYCURSOR; }
 #line 216 "<stdout>"
 yy28:
 	++YYCURSOR;
-#line 44 "config2.re"
+#line 44 "config3.re"
 	{ return NULL; }
 #line 221 "<stdout>"
 yy30:
@@ -237,6 +237,6 @@ yy31:
 	default:	goto yy27;
 	}
 }
-#line 45 "config2.re"
+#line 45 "config3.re"
 
 }
diff --git a/test/ctx.c b/test/ctx.c
index c338779d..b2a52f27 100755
--- a/test/ctx.c
+++ b/test/ctx.c
@@ -90,7 +90,7 @@ yy3:
 	{
 		return UNEXPECTED;
 	}
-#line 92 "<stdout>"
+#line 94 "<stdout>"
 yy4:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -98,7 +98,7 @@ yy4:
 yy5:
 #line 48 "ctx.re"
 	{ return NUMBER;  }
-#line 100 "<stdout>"
+#line 102 "<stdout>"
 yy6:
 	++YYCURSOR;
 yy7:
@@ -109,7 +109,7 @@ yy7:
 		cursor = s.cur;
 		goto std;
 	}
-#line 111 "<stdout>"
+#line 113 "<stdout>"
 yy8:
 	yych = *++YYCURSOR;
 	goto yy7;
@@ -155,7 +155,7 @@ yy14:
 	YYCURSOR = yyctxmarker;
 #line 47 "ctx.re"
 	{ return KEYWORD; }
-#line 157 "<stdout>"
+#line 159 "<stdout>"
 yy15:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -175,7 +175,7 @@ yy16:
 	YYCURSOR = yyctxmarker;
 #line 46 "ctx.re"
 	{ return KEYWORD; }
-#line 177 "<stdout>"
+#line 179 "<stdout>"
 }
 #line 61 "ctx.re"
 
diff --git a/test/cunroll.c b/test/cunroll.c
index b6a1b0c9..a677acff 100644
--- a/test/cunroll.c
+++ b/test/cunroll.c
@@ -240,7 +240,7 @@ yy2:
 yy3:
 #line 200 "cunroll.re"
 	{ RET('/'); }
-#line 240 "<stdout>"
+#line 244 "<stdout>"
 yy4:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -312,7 +312,7 @@ yy4:
 yy5:
 #line 141 "cunroll.re"
 	{ RET(ID); }
-#line 309 "<stdout>"
+#line 316 "<stdout>"
 yy6:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -328,7 +328,7 @@ yy6:
 yy7:
 #line 153 "cunroll.re"
 	{ RET(ICON); }
-#line 321 "<stdout>"
+#line 332 "<stdout>"
 yy8:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -346,7 +346,7 @@ yy10:
 		printf("unexpected character: %c\n", *s->tok);
 		goto std;
 	    }
-#line 339 "<stdout>"
+#line 350 "<stdout>"
 yy11:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -367,7 +367,7 @@ yy11:
 yy12:
 #line 193 "cunroll.re"
 	{ RET('.'); }
-#line 360 "<stdout>"
+#line 371 "<stdout>"
 yy13:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -385,7 +385,7 @@ yy14:
 yy15:
 #line 203 "cunroll.re"
 	{ RET('>'); }
-#line 378 "<stdout>"
+#line 389 "<stdout>"
 yy16:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -396,7 +396,7 @@ yy16:
 yy17:
 #line 202 "cunroll.re"
 	{ RET('<'); }
-#line 389 "<stdout>"
+#line 400 "<stdout>"
 yy18:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -407,7 +407,7 @@ yy18:
 yy19:
 #line 198 "cunroll.re"
 	{ RET('+'); }
-#line 400 "<stdout>"
+#line 411 "<stdout>"
 yy20:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -419,7 +419,7 @@ yy20:
 yy21:
 #line 197 "cunroll.re"
 	{ RET('-'); }
-#line 412 "<stdout>"
+#line 423 "<stdout>"
 yy22:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -429,7 +429,7 @@ yy22:
 yy23:
 #line 199 "cunroll.re"
 	{ RET('*'); }
-#line 422 "<stdout>"
+#line 433 "<stdout>"
 yy24:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -439,7 +439,7 @@ yy24:
 yy25:
 #line 201 "cunroll.re"
 	{ RET('%'); }
-#line 432 "<stdout>"
+#line 443 "<stdout>"
 yy26:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -450,7 +450,7 @@ yy26:
 yy27:
 #line 194 "cunroll.re"
 	{ RET('&'); }
-#line 443 "<stdout>"
+#line 454 "<stdout>"
 yy28:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -460,7 +460,7 @@ yy28:
 yy29:
 #line 204 "cunroll.re"
 	{ RET('^'); }
-#line 453 "<stdout>"
+#line 464 "<stdout>"
 yy30:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -471,7 +471,7 @@ yy30:
 yy31:
 #line 205 "cunroll.re"
 	{ RET('|'); }
-#line 464 "<stdout>"
+#line 475 "<stdout>"
 yy32:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -481,7 +481,7 @@ yy32:
 yy33:
 #line 188 "cunroll.re"
 	{ RET('='); }
-#line 474 "<stdout>"
+#line 485 "<stdout>"
 yy34:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -491,62 +491,62 @@ yy34:
 yy35:
 #line 195 "cunroll.re"
 	{ RET('!'); }
-#line 484 "<stdout>"
+#line 495 "<stdout>"
 yy36:
 	++YYCURSOR;
 #line 183 "cunroll.re"
 	{ RET(';'); }
-#line 489 "<stdout>"
+#line 500 "<stdout>"
 yy38:
 	++YYCURSOR;
 #line 184 "cunroll.re"
 	{ RET('{'); }
-#line 494 "<stdout>"
+#line 505 "<stdout>"
 yy40:
 	++YYCURSOR;
 #line 185 "cunroll.re"
 	{ RET('}'); }
-#line 499 "<stdout>"
+#line 510 "<stdout>"
 yy42:
 	++YYCURSOR;
 #line 186 "cunroll.re"
 	{ RET(','); }
-#line 504 "<stdout>"
+#line 515 "<stdout>"
 yy44:
 	++YYCURSOR;
 #line 187 "cunroll.re"
 	{ RET(':'); }
-#line 509 "<stdout>"
+#line 520 "<stdout>"
 yy46:
 	++YYCURSOR;
 #line 189 "cunroll.re"
 	{ RET('('); }
-#line 514 "<stdout>"
+#line 525 "<stdout>"
 yy48:
 	++YYCURSOR;
 #line 190 "cunroll.re"
 	{ RET(')'); }
-#line 519 "<stdout>"
+#line 530 "<stdout>"
 yy50:
 	++YYCURSOR;
 #line 191 "cunroll.re"
 	{ RET('['); }
-#line 524 "<stdout>"
+#line 535 "<stdout>"
 yy52:
 	++YYCURSOR;
 #line 192 "cunroll.re"
 	{ RET(']'); }
-#line 529 "<stdout>"
+#line 540 "<stdout>"
 yy54:
 	++YYCURSOR;
 #line 196 "cunroll.re"
 	{ RET('~'); }
-#line 534 "<stdout>"
+#line 545 "<stdout>"
 yy56:
 	++YYCURSOR;
 #line 206 "cunroll.re"
 	{ RET('?'); }
-#line 539 "<stdout>"
+#line 550 "<stdout>"
 yy58:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -554,7 +554,7 @@ yy58:
 yy59:
 #line 209 "cunroll.re"
 	{ goto std; }
-#line 547 "<stdout>"
+#line 558 "<stdout>"
 yy60:
 	++YYCURSOR;
 #line 212 "cunroll.re"
@@ -563,7 +563,7 @@ yy60:
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 556 "<stdout>"
+#line 567 "<stdout>"
 yy62:
 	yych = *++YYCURSOR;
 	goto yy10;
@@ -583,77 +583,77 @@ yy65:
 	++YYCURSOR;
 #line 182 "cunroll.re"
 	{ RET(NEQ); }
-#line 574 "<stdout>"
+#line 587 "<stdout>"
 yy67:
 	++YYCURSOR;
 #line 181 "cunroll.re"
 	{ RET(EQL); }
-#line 579 "<stdout>"
+#line 592 "<stdout>"
 yy69:
 	++YYCURSOR;
 #line 178 "cunroll.re"
 	{ RET(OROR); }
-#line 584 "<stdout>"
+#line 597 "<stdout>"
 yy71:
 	++YYCURSOR;
 #line 171 "cunroll.re"
 	{ RET(OREQ); }
-#line 589 "<stdout>"
+#line 602 "<stdout>"
 yy73:
 	++YYCURSOR;
 #line 170 "cunroll.re"
 	{ RET(XOREQ); }
-#line 594 "<stdout>"
+#line 607 "<stdout>"
 yy75:
 	++YYCURSOR;
 #line 177 "cunroll.re"
 	{ RET(ANDAND); }
-#line 599 "<stdout>"
+#line 612 "<stdout>"
 yy77:
 	++YYCURSOR;
 #line 169 "cunroll.re"
 	{ RET(ANDEQ); }
-#line 604 "<stdout>"
+#line 617 "<stdout>"
 yy79:
 	++YYCURSOR;
 #line 168 "cunroll.re"
 	{ RET(MODEQ); }
-#line 609 "<stdout>"
+#line 622 "<stdout>"
 yy81:
 	++YYCURSOR;
 #line 166 "cunroll.re"
 	{ RET(MULEQ); }
-#line 614 "<stdout>"
+#line 627 "<stdout>"
 yy83:
 	++YYCURSOR;
 #line 176 "cunroll.re"
 	{ RET(DEREF); }
-#line 619 "<stdout>"
+#line 632 "<stdout>"
 yy85:
 	++YYCURSOR;
 #line 175 "cunroll.re"
 	{ RET(DECR); }
-#line 624 "<stdout>"
+#line 637 "<stdout>"
 yy87:
 	++YYCURSOR;
 #line 165 "cunroll.re"
 	{ RET(SUBEQ); }
-#line 629 "<stdout>"
+#line 642 "<stdout>"
 yy89:
 	++YYCURSOR;
 #line 174 "cunroll.re"
 	{ RET(INCR); }
-#line 634 "<stdout>"
+#line 647 "<stdout>"
 yy91:
 	++YYCURSOR;
 #line 164 "cunroll.re"
 	{ RET(ADDEQ); }
-#line 639 "<stdout>"
+#line 652 "<stdout>"
 yy93:
 	++YYCURSOR;
 #line 179 "cunroll.re"
 	{ RET(LEQ); }
-#line 644 "<stdout>"
+#line 657 "<stdout>"
 yy95:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -663,17 +663,17 @@ yy95:
 yy96:
 #line 173 "cunroll.re"
 	{ RET(LSHIFT); }
-#line 654 "<stdout>"
+#line 667 "<stdout>"
 yy97:
 	++YYCURSOR;
 #line 163 "cunroll.re"
 	{ RET(LSHIFTEQ); }
-#line 659 "<stdout>"
+#line 672 "<stdout>"
 yy99:
 	++YYCURSOR;
 #line 180 "cunroll.re"
 	{ RET(GEQ); }
-#line 664 "<stdout>"
+#line 677 "<stdout>"
 yy101:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -683,12 +683,12 @@ yy101:
 yy102:
 #line 172 "cunroll.re"
 	{ RET(RSHIFT); }
-#line 674 "<stdout>"
+#line 687 "<stdout>"
 yy103:
 	++YYCURSOR;
 #line 162 "cunroll.re"
 	{ RET(RSHIFTEQ); }
-#line 679 "<stdout>"
+#line 692 "<stdout>"
 yy105:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -739,7 +739,7 @@ yy109:
 	++YYCURSOR;
 #line 159 "cunroll.re"
 	{ RET(SCON); }
-#line 721 "<stdout>"
+#line 743 "<stdout>"
 yy111:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -852,7 +852,7 @@ yy117:
 yy119:
 #line 156 "cunroll.re"
 	{ RET(FCON); }
-#line 826 "<stdout>"
+#line 856 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -913,7 +913,7 @@ yy125:
 	++YYCURSOR;
 #line 161 "cunroll.re"
 	{ RET(ELLIPSIS); }
-#line 883 "<stdout>"
+#line 917 "<stdout>"
 yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1442,7 +1442,7 @@ yy164:
 yy165:
 #line 142 "cunroll.re"
 	{ RET(ID); }
-#line 1355 "<stdout>"
+#line 1446 "<stdout>"
 yy166:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1514,7 +1514,7 @@ yy166:
 yy167:
 #line 143 "cunroll.re"
 	{ RET(ID); }
-#line 1424 "<stdout>"
+#line 1518 "<stdout>"
 yy168:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1586,7 +1586,7 @@ yy168:
 yy169:
 #line 144 "cunroll.re"
 	{ RET(ID); }
-#line 1493 "<stdout>"
+#line 1590 "<stdout>"
 yy170:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1658,7 +1658,7 @@ yy170:
 yy171:
 #line 145 "cunroll.re"
 	{ RET(ID); }
-#line 1562 "<stdout>"
+#line 1662 "<stdout>"
 yy172:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1730,7 +1730,7 @@ yy172:
 yy173:
 #line 146 "cunroll.re"
 	{ RET(ID); }
-#line 1631 "<stdout>"
+#line 1734 "<stdout>"
 yy174:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1802,7 +1802,7 @@ yy174:
 yy175:
 #line 147 "cunroll.re"
 	{ RET(ID); }
-#line 1700 "<stdout>"
+#line 1806 "<stdout>"
 yy176:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1874,7 +1874,7 @@ yy176:
 yy177:
 #line 148 "cunroll.re"
 	{ RET(ID); }
-#line 1769 "<stdout>"
+#line 1878 "<stdout>"
 yy178:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -1948,24 +1948,24 @@ yy178:
 yy180:
 #line 149 "cunroll.re"
 	{ RET(ID); }
-#line 1840 "<stdout>"
+#line 1952 "<stdout>"
 yy181:
 	++YYCURSOR;
 #line 167 "cunroll.re"
 	{ RET(DIVEQ); }
-#line 1845 "<stdout>"
+#line 1957 "<stdout>"
 yy183:
 	++YYCURSOR;
 #line 138 "cunroll.re"
 	{ goto comment; }
-#line 1850 "<stdout>"
+#line 1962 "<stdout>"
 }
 #line 223 "cunroll.re"
 
 
 comment:
 
-#line 1857 "<stdout>"
+#line 1969 "<stdout>"
 {
 	YYCTYPE yych;
 	if((YYLIMIT - YYCURSOR) < 8) YYFILL(8);
@@ -1985,7 +1985,7 @@ yy187:
 yy188:
 #line 242 "cunroll.re"
 	{ goto comment; }
-#line 1877 "<stdout>"
+#line 1989 "<stdout>"
 yy189:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2000,7 +2000,7 @@ yy190:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 1891 "<stdout>"
+#line 2004 "<stdout>"
 yy191:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2011,7 +2011,7 @@ yy191:
 yy192:
 #line 234 "cunroll.re"
 	{ goto comment; }
-#line 1901 "<stdout>"
+#line 2015 "<stdout>"
 yy193:
 	yych = *++YYCURSOR;
 	goto yy188;
@@ -2025,7 +2025,7 @@ yy194:
 yy195:
 #line 235 "cunroll.re"
 	{ goto comment; }
-#line 1914 "<stdout>"
+#line 2029 "<stdout>"
 yy196:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2036,7 +2036,7 @@ yy196:
 yy197:
 #line 236 "cunroll.re"
 	{ goto comment; }
-#line 1924 "<stdout>"
+#line 2040 "<stdout>"
 yy198:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2047,7 +2047,7 @@ yy198:
 yy199:
 #line 237 "cunroll.re"
 	{ goto comment; }
-#line 1934 "<stdout>"
+#line 2051 "<stdout>"
 yy200:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2058,7 +2058,7 @@ yy200:
 yy201:
 #line 238 "cunroll.re"
 	{ goto comment; }
-#line 1944 "<stdout>"
+#line 2062 "<stdout>"
 yy202:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2069,7 +2069,7 @@ yy202:
 yy203:
 #line 239 "cunroll.re"
 	{ goto comment; }
-#line 1954 "<stdout>"
+#line 2073 "<stdout>"
 yy204:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2080,17 +2080,17 @@ yy204:
 yy205:
 #line 240 "cunroll.re"
 	{ goto comment; }
-#line 1964 "<stdout>"
+#line 2084 "<stdout>"
 yy206:
 	++YYCURSOR;
 #line 241 "cunroll.re"
 	{ goto comment; }
-#line 1969 "<stdout>"
+#line 2089 "<stdout>"
 yy208:
 	++YYCURSOR;
 #line 227 "cunroll.re"
 	{ goto std; }
-#line 1974 "<stdout>"
+#line 2094 "<stdout>"
 }
 #line 243 "cunroll.re"
 
diff --git a/test/input10.c b/test/input10.c
index 604983fc..9afb190f 100755
--- a/test/input10.c
+++ b/test/input10.c
@@ -27,12 +27,12 @@ yy2:
 	++YYCURSOR;
 #line 8 "input10.re"
 	{ return 1; }
-#line 29 "<stdout>"
+#line 31 "<stdout>"
 yy4:
 	++YYCURSOR;
 #line 10 "input10.re"
 	{ return -1; }
-#line 34 "<stdout>"
+#line 36 "<stdout>"
 }
 #line 12 "input10.re"
 
diff --git a/test/input11.c b/test/input11.c
index cdc0e951..ab43e830 100755
--- a/test/input11.c
+++ b/test/input11.c
@@ -83,7 +83,7 @@ yy2:
 yy3:
 #line 10 "input11.re"
 	{ return 1; }
-#line 85 "<stdout>"
+#line 87 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy14;
@@ -92,7 +92,7 @@ yy5:
 yy6:
 #line 11 "input11.re"
 	{ return 2; }
-#line 94 "<stdout>"
+#line 96 "<stdout>"
 yy7:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -110,7 +110,7 @@ yy7:
 yy8:
 #line 13 "input11.re"
 	{ return -1; }
-#line 112 "<stdout>"
+#line 114 "<stdout>"
 yy9:
 	yych = *++YYCURSOR;
 	goto yy12;
@@ -361,7 +361,7 @@ yy20:
 yy22:
 #line 9 "input11.re"
 	{ return 0; }
-#line 356 "<stdout>"
+#line 365 "<stdout>"
 }
 #line 15 "input11.re"
 
diff --git a/test/modula.c b/test/modula.c
index 1a359078..5d39ac81 100644
--- a/test/modula.c
+++ b/test/modula.c
@@ -172,7 +172,7 @@ yy2:
 yy3:
 #line 79 "modula.re"
 	{RETURN(9);}
-#line 172 "<stdout>"
+#line 176 "<stdout>"
 yy4:
 	yyctxmarker = YYCURSOR + 1;
 	yyaccept = 0;
@@ -181,7 +181,7 @@ yy4:
 yy5:
 #line 69 "modula.re"
 	{RETURN(1);}
-#line 181 "<stdout>"
+#line 185 "<stdout>"
 yy6:
 	yyctxmarker = YYCURSOR + 1;
 	yyaccept = 0;
@@ -200,7 +200,7 @@ yy8:
 		printf("unexpected character: %c\n", *s->tok);
 		goto std;
 	    }
-#line 200 "<stdout>"
+#line 204 "<stdout>"
 yy9:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -212,37 +212,37 @@ yy10:
 	++YYCURSOR;
 #line 77 "modula.re"
 	{RETURN(7);}
-#line 212 "<stdout>"
+#line 216 "<stdout>"
 yy12:
 	++YYCURSOR;
 #line 78 "modula.re"
 	{RETURN(8);}
-#line 217 "<stdout>"
+#line 221 "<stdout>"
 yy14:
 	++YYCURSOR;
 #line 80 "modula.re"
 	{RETURN(10);}
-#line 222 "<stdout>"
+#line 226 "<stdout>"
 yy16:
 	++YYCURSOR;
 #line 81 "modula.re"
 	{RETURN(11);}
-#line 227 "<stdout>"
+#line 231 "<stdout>"
 yy18:
 	++YYCURSOR;
 #line 82 "modula.re"
 	{RETURN(12);}
-#line 232 "<stdout>"
+#line 236 "<stdout>"
 yy20:
 	++YYCURSOR;
 #line 83 "modula.re"
 	{RETURN(13);}
-#line 237 "<stdout>"
+#line 241 "<stdout>"
 yy22:
 	++YYCURSOR;
 #line 84 "modula.re"
 	{RETURN(14);}
-#line 242 "<stdout>"
+#line 246 "<stdout>"
 yy24:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -252,12 +252,12 @@ yy24:
 yy25:
 #line 85 "modula.re"
 	{RETURN(15);}
-#line 252 "<stdout>"
+#line 256 "<stdout>"
 yy26:
 	++YYCURSOR;
 #line 87 "modula.re"
 	{RETURN(17);}
-#line 257 "<stdout>"
+#line 261 "<stdout>"
 yy28:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -267,12 +267,12 @@ yy28:
 yy29:
 #line 88 "modula.re"
 	{RETURN(18);}
-#line 267 "<stdout>"
+#line 271 "<stdout>"
 yy30:
 	++YYCURSOR;
 #line 90 "modula.re"
 	{RETURN(20);}
-#line 272 "<stdout>"
+#line 276 "<stdout>"
 yy32:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -283,12 +283,12 @@ yy32:
 yy33:
 #line 91 "modula.re"
 	{RETURN(21);}
-#line 283 "<stdout>"
+#line 287 "<stdout>"
 yy34:
 	++YYCURSOR;
 #line 94 "modula.re"
 	{RETURN(24);}
-#line 288 "<stdout>"
+#line 292 "<stdout>"
 yy36:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -298,42 +298,42 @@ yy36:
 yy37:
 #line 95 "modula.re"
 	{RETURN(25);}
-#line 298 "<stdout>"
+#line 302 "<stdout>"
 yy38:
 	++YYCURSOR;
 #line 97 "modula.re"
 	{RETURN(27);}
-#line 303 "<stdout>"
+#line 307 "<stdout>"
 yy40:
 	++YYCURSOR;
 #line 98 "modula.re"
 	{RETURN(28);}
-#line 308 "<stdout>"
+#line 312 "<stdout>"
 yy42:
 	++YYCURSOR;
 #line 99 "modula.re"
 	{RETURN(29);}
-#line 313 "<stdout>"
+#line 317 "<stdout>"
 yy44:
 	++YYCURSOR;
 #line 100 "modula.re"
 	{RETURN(30);}
-#line 318 "<stdout>"
+#line 322 "<stdout>"
 yy46:
 	++YYCURSOR;
 #line 101 "modula.re"
 	{RETURN(31);}
-#line 323 "<stdout>"
+#line 327 "<stdout>"
 yy48:
 	++YYCURSOR;
 #line 102 "modula.re"
 	{RETURN(32);}
-#line 328 "<stdout>"
+#line 332 "<stdout>"
 yy50:
 	++YYCURSOR;
 #line 103 "modula.re"
 	{RETURN(33);}
-#line 333 "<stdout>"
+#line 337 "<stdout>"
 yy52:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -344,7 +344,7 @@ yy52:
 yy53:
 #line 146 "modula.re"
 	{RETURN(74);}
-#line 344 "<stdout>"
+#line 348 "<stdout>"
 yy54:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -477,7 +477,7 @@ yy73:
 yy74:
 #line 148 "modula.re"
 	{ goto std; }
-#line 477 "<stdout>"
+#line 481 "<stdout>"
 yy75:
 	++YYCURSOR;
 #line 151 "modula.re"
@@ -486,7 +486,7 @@ yy75:
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 486 "<stdout>"
+#line 490 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy8;
@@ -658,7 +658,7 @@ yy85:
 yy86:
 #line 144 "modula.re"
 	{RETURN(73);}
-#line 653 "<stdout>"
+#line 662 "<stdout>"
 yy87:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -741,7 +741,7 @@ yy89:
 yy90:
 #line 143 "modula.re"
 	{RETURN(72);}
-#line 734 "<stdout>"
+#line 745 "<stdout>"
 yy91:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -818,7 +818,7 @@ yy92:
 yy93:
 #line 142 "modula.re"
 	{RETURN(71);}
-#line 809 "<stdout>"
+#line 822 "<stdout>"
 yy94:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -907,7 +907,7 @@ yy97:
 yy98:
 #line 141 "modula.re"
 	{RETURN(70);}
-#line 896 "<stdout>"
+#line 911 "<stdout>"
 yy99:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -984,7 +984,7 @@ yy100:
 yy101:
 #line 139 "modula.re"
 	{RETURN(68);}
-#line 971 "<stdout>"
+#line 988 "<stdout>"
 yy102:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1067,7 +1067,7 @@ yy104:
 yy105:
 #line 140 "modula.re"
 	{RETURN(69);}
-#line 1052 "<stdout>"
+#line 1071 "<stdout>"
 yy106:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1144,7 +1144,7 @@ yy107:
 yy108:
 #line 138 "modula.re"
 	{RETURN(67);}
-#line 1127 "<stdout>"
+#line 1148 "<stdout>"
 yy109:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1221,7 +1221,7 @@ yy110:
 yy111:
 #line 137 "modula.re"
 	{RETURN(66);}
-#line 1202 "<stdout>"
+#line 1225 "<stdout>"
 yy112:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1330,7 +1330,7 @@ yy118:
 yy119:
 #line 136 "modula.re"
 	{RETURN(65);}
-#line 1309 "<stdout>"
+#line 1334 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1413,7 +1413,7 @@ yy122:
 yy123:
 #line 135 "modula.re"
 	{RETURN(64);}
-#line 1390 "<stdout>"
+#line 1417 "<stdout>"
 yy124:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1496,7 +1496,7 @@ yy126:
 yy127:
 #line 134 "modula.re"
 	{RETURN(63);}
-#line 1471 "<stdout>"
+#line 1500 "<stdout>"
 yy128:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1609,7 +1609,7 @@ yy135:
 yy136:
 #line 133 "modula.re"
 	{RETURN(62);}
-#line 1582 "<stdout>"
+#line 1613 "<stdout>"
 yy137:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1728,7 +1728,7 @@ yy145:
 yy146:
 #line 132 "modula.re"
 	{RETURN(61);}
-#line 1699 "<stdout>"
+#line 1732 "<stdout>"
 yy147:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1823,7 +1823,7 @@ yy151:
 yy152:
 #line 131 "modula.re"
 	{RETURN(60);}
-#line 1792 "<stdout>"
+#line 1827 "<stdout>"
 yy153:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1894,7 +1894,7 @@ yy153:
 yy154:
 #line 129 "modula.re"
 	{RETURN(58);}
-#line 1861 "<stdout>"
+#line 1898 "<stdout>"
 yy155:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1965,7 +1965,7 @@ yy155:
 yy156:
 #line 130 "modula.re"
 	{RETURN(59);}
-#line 1930 "<stdout>"
+#line 1969 "<stdout>"
 yy157:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2042,7 +2042,7 @@ yy158:
 yy159:
 #line 128 "modula.re"
 	{RETURN(57);}
-#line 2005 "<stdout>"
+#line 2046 "<stdout>"
 yy160:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2119,7 +2119,7 @@ yy161:
 yy162:
 #line 126 "modula.re"
 	{RETURN(55);}
-#line 2079 "<stdout>"
+#line 2123 "<stdout>"
 yy163:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2202,7 +2202,7 @@ yy165:
 yy166:
 #line 127 "modula.re"
 	{RETURN(56);}
-#line 2160 "<stdout>"
+#line 2206 "<stdout>"
 yy167:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2285,7 +2285,7 @@ yy169:
 yy170:
 #line 125 "modula.re"
 	{RETURN(54);}
-#line 2241 "<stdout>"
+#line 2289 "<stdout>"
 yy171:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2356,7 +2356,7 @@ yy171:
 yy172:
 #line 121 "modula.re"
 	{RETURN(50);}
-#line 2310 "<stdout>"
+#line 2360 "<stdout>"
 yy173:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2433,7 +2433,7 @@ yy174:
 yy175:
 #line 124 "modula.re"
 	{RETURN(53);}
-#line 2385 "<stdout>"
+#line 2437 "<stdout>"
 yy176:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2529,7 +2529,7 @@ yy180:
 yy181:
 #line 123 "modula.re"
 	{RETURN(52);}
-#line 2479 "<stdout>"
+#line 2533 "<stdout>"
 yy182:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2654,7 +2654,7 @@ yy191:
 yy192:
 #line 122 "modula.re"
 	{RETURN(51);}
-#line 2602 "<stdout>"
+#line 2658 "<stdout>"
 yy193:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2743,7 +2743,7 @@ yy196:
 yy197:
 #line 120 "modula.re"
 	{RETURN(49);}
-#line 2689 "<stdout>"
+#line 2747 "<stdout>"
 yy198:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2814,7 +2814,7 @@ yy198:
 yy199:
 #line 119 "modula.re"
 	{RETURN(48);}
-#line 2758 "<stdout>"
+#line 2818 "<stdout>"
 yy200:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2928,7 +2928,7 @@ yy207:
 yy208:
 #line 118 "modula.re"
 	{RETURN(47);}
-#line 2870 "<stdout>"
+#line 2932 "<stdout>"
 yy209:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2999,7 +2999,7 @@ yy209:
 yy210:
 #line 117 "modula.re"
 	{RETURN(46);}
-#line 2939 "<stdout>"
+#line 3003 "<stdout>"
 yy211:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3070,7 +3070,7 @@ yy211:
 yy212:
 #line 116 "modula.re"
 	{RETURN(45);}
-#line 3008 "<stdout>"
+#line 3074 "<stdout>"
 yy213:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3148,7 +3148,7 @@ yy214:
 yy215:
 #line 114 "modula.re"
 	{RETURN(43);}
-#line 3084 "<stdout>"
+#line 3152 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3225,7 +3225,7 @@ yy217:
 yy218:
 #line 115 "modula.re"
 	{RETURN(44);}
-#line 3159 "<stdout>"
+#line 3229 "<stdout>"
 yy219:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3308,7 +3308,7 @@ yy221:
 yy222:
 #line 113 "modula.re"
 	{RETURN(42);}
-#line 3240 "<stdout>"
+#line 3312 "<stdout>"
 yy223:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3379,7 +3379,7 @@ yy223:
 yy224:
 #line 112 "modula.re"
 	{RETURN(41);}
-#line 3309 "<stdout>"
+#line 3383 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3492,7 +3492,7 @@ yy232:
 yy233:
 #line 111 "modula.re"
 	{RETURN(40);}
-#line 3420 "<stdout>"
+#line 3496 "<stdout>"
 yy234:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3587,7 +3587,7 @@ yy238:
 yy239:
 #line 110 "modula.re"
 	{RETURN(39);}
-#line 3513 "<stdout>"
+#line 3591 "<stdout>"
 yy240:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3664,7 +3664,7 @@ yy241:
 yy242:
 #line 109 "modula.re"
 	{RETURN(38);}
-#line 3588 "<stdout>"
+#line 3668 "<stdout>"
 yy243:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3741,7 +3741,7 @@ yy244:
 yy245:
 #line 108 "modula.re"
 	{RETURN(37);}
-#line 3663 "<stdout>"
+#line 3745 "<stdout>"
 yy246:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3824,7 +3824,7 @@ yy248:
 yy249:
 #line 107 "modula.re"
 	{RETURN(36);}
-#line 3744 "<stdout>"
+#line 3828 "<stdout>"
 yy250:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3919,7 +3919,7 @@ yy254:
 yy255:
 #line 106 "modula.re"
 	{RETURN(35);}
-#line 3837 "<stdout>"
+#line 3923 "<stdout>"
 yy256:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3990,32 +3990,32 @@ yy256:
 yy257:
 #line 105 "modula.re"
 	{RETURN(34);}
-#line 3906 "<stdout>"
+#line 3994 "<stdout>"
 yy258:
 	++YYCURSOR;
 #line 96 "modula.re"
 	{RETURN(26);}
-#line 3911 "<stdout>"
+#line 3999 "<stdout>"
 yy260:
 	++YYCURSOR;
 #line 93 "modula.re"
 	{RETURN(23);}
-#line 3916 "<stdout>"
+#line 4004 "<stdout>"
 yy262:
 	++YYCURSOR;
 #line 92 "modula.re"
 	{RETURN(22);}
-#line 3921 "<stdout>"
+#line 4009 "<stdout>"
 yy264:
 	++YYCURSOR;
 #line 89 "modula.re"
 	{RETURN(19);}
-#line 3926 "<stdout>"
+#line 4014 "<stdout>"
 yy266:
 	++YYCURSOR;
 #line 86 "modula.re"
 	{RETURN(16);}
-#line 3931 "<stdout>"
+#line 4019 "<stdout>"
 yy268:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -4039,7 +4039,7 @@ yy271:
 	++YYCURSOR;
 #line 75 "modula.re"
 	{RETURN(6);}
-#line 3955 "<stdout>"
+#line 4043 "<stdout>"
 yy273:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -4060,7 +4060,7 @@ yy275:
 yy276:
 #line 74 "modula.re"
 	{RETURN(5);}
-#line 3976 "<stdout>"
+#line 4064 "<stdout>"
 yy277:
 	yyctxmarker = YYCURSOR + 1;
 	yyaccept = 0;
@@ -4117,13 +4117,13 @@ yy281:
 	++YYCURSOR;
 #line 73 "modula.re"
 	{RETURN(4);}
-#line 4032 "<stdout>"
+#line 4121 "<stdout>"
 yy283:
 	++YYCURSOR;
 	YYCURSOR = yyctxmarker;
 #line 70 "modula.re"
 	{RETURN(1);}
-#line 4038 "<stdout>"
+#line 4127 "<stdout>"
 yy285:
 	yyaccept = 2;
 	YYMARKER = ++YYCURSOR;
@@ -4247,7 +4247,7 @@ yy293:
 yy294:
 #line 71 "modula.re"
 	{RETURN(2);}
-#line 4159 "<stdout>"
+#line 4251 "<stdout>"
 yy295:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -4274,18 +4274,18 @@ yy295:
 yy296:
 #line 72 "modula.re"
 	{RETURN(3);}
-#line 4185 "<stdout>"
+#line 4278 "<stdout>"
 yy297:
 	++YYCURSOR;
 #line 67 "modula.re"
 	{ depth = 1; goto comment; }
-#line 4190 "<stdout>"
+#line 4283 "<stdout>"
 }
 #line 162 "modula.re"
 
 comment:
 
-#line 4196 "<stdout>"
+#line 4289 "<stdout>"
 {
 	YYCTYPE yych;
 	YYCTYPE *yyctxmarker = YYCURSOR;
@@ -4306,7 +4306,7 @@ yy301:
 yy302:
 #line 179 "modula.re"
 	{ goto comment; }
-#line 4217 "<stdout>"
+#line 4310 "<stdout>"
 yy303:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4321,7 +4321,7 @@ yy304:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4232 "<stdout>"
+#line 4325 "<stdout>"
 yy306:
 	yych = *++YYCURSOR;
 	goto yy302;
@@ -4329,7 +4329,7 @@ yy307:
 	++YYCURSOR;
 #line 172 "modula.re"
 	{ ++depth; goto comment; }
-#line 4240 "<stdout>"
+#line 4333 "<stdout>"
 yy309:
 	++YYCURSOR;
 #line 166 "modula.re"
@@ -4339,7 +4339,7 @@ yy309:
 		else
 		    goto comment;
 	    }
-#line 4250 "<stdout>"
+#line 4343 "<stdout>"
 }
 #line 180 "modula.re"
 
diff --git a/test/push.c b/test/push.c
index ff59ed70..ee3af401 100755
--- a/test/push.c
+++ b/test/push.c
@@ -324,7 +324,7 @@ yy2:
 yy3:
 #line 246 "push.re"
 	{ SEND(kIdentifier);     }
-#line 320 "<stdout>"
+#line 328 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -374,62 +374,62 @@ yy12:
 yy13:
 #line 247 "push.re"
 	{ SEND(kDecimalConstant);}
-#line 370 "<stdout>"
+#line 378 "<stdout>"
 yy14:
 	++YYCURSOR;
 #line 249 "push.re"
 	{ SEND(kEqual);          }
-#line 375 "<stdout>"
+#line 383 "<stdout>"
 yy16:
 	++YYCURSOR;
 #line 250 "push.re"
 	{ SEND(kLeftParen);      }
-#line 380 "<stdout>"
+#line 388 "<stdout>"
 yy18:
 	++YYCURSOR;
 #line 251 "push.re"
 	{ SEND(kRightParen);     }
-#line 385 "<stdout>"
+#line 393 "<stdout>"
 yy20:
 	++YYCURSOR;
 #line 252 "push.re"
 	{ SEND(kMinus);          }
-#line 390 "<stdout>"
+#line 398 "<stdout>"
 yy22:
 	++YYCURSOR;
 #line 253 "push.re"
 	{ SEND(kPlus);           }
-#line 395 "<stdout>"
+#line 403 "<stdout>"
 yy24:
 	++YYCURSOR;
 #line 254 "push.re"
 	{ SEND(kStar);           }
-#line 400 "<stdout>"
+#line 408 "<stdout>"
 yy26:
 	++YYCURSOR;
 #line 255 "push.re"
 	{ SEND(kSlash);          }
-#line 405 "<stdout>"
+#line 413 "<stdout>"
 yy28:
 	++YYCURSOR;
 #line 257 "push.re"
 	{ SKIP();                }
-#line 410 "<stdout>"
+#line 418 "<stdout>"
 yy30:
 	++YYCURSOR;
 #line 258 "push.re"
 	{ SKIP();                }
-#line 415 "<stdout>"
+#line 423 "<stdout>"
 yy32:
 	++YYCURSOR;
 #line 259 "push.re"
 	{ send(kEOF); return 1;  }
-#line 420 "<stdout>"
+#line 428 "<stdout>"
 yy34:
 	++YYCURSOR;
 #line 260 "push.re"
 	{ SEND(kUnknown);        }
-#line 425 "<stdout>"
+#line 433 "<stdout>"
 yy36:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -614,7 +614,7 @@ yy44:
 yy45:
 #line 245 "push.re"
 	{ SEND(kReturn);         }
-#line 604 "<stdout>"
+#line 618 "<stdout>"
 yy46:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -704,7 +704,7 @@ yy49:
 yy50:
 #line 244 "push.re"
 	{ SEND(kWhile);          }
-#line 691 "<stdout>"
+#line 708 "<stdout>"
 yy51:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -794,7 +794,7 @@ yy54:
 yy55:
 #line 243 "push.re"
 	{ SEND(kBreak);          }
-#line 778 "<stdout>"
+#line 798 "<stdout>"
 yy56:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -878,7 +878,7 @@ yy58:
 yy59:
 #line 242 "push.re"
 	{ SEND(kGoto);           }
-#line 859 "<stdout>"
+#line 882 "<stdout>"
 yy60:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -962,7 +962,7 @@ yy62:
 yy63:
 #line 241 "push.re"
 	{ SEND(kElse);           }
-#line 940 "<stdout>"
+#line 966 "<stdout>"
 yy64:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1040,7 +1040,7 @@ yy65:
 yy66:
 #line 240 "push.re"
 	{ SEND(kFor);            }
-#line 1015 "<stdout>"
+#line 1044 "<stdout>"
 yy67:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1112,7 +1112,7 @@ yy67:
 yy68:
 #line 239 "push.re"
 	{ SEND(kIf);             }
-#line 1084 "<stdout>"
+#line 1116 "<stdout>"
 }
 #line 261 "push.re"
 
diff --git a/test/repeater.c b/test/repeater.c
index 8f6aaeb3..e18e8dd5 100644
--- a/test/repeater.c
+++ b/test/repeater.c
@@ -41,7 +41,7 @@ yy2:
 yy3:
 #line 22 "repeater.re"
 	{RET(5);}
-#line 43 "<stdout>"
+#line 45 "<stdout>"
 yy4:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -54,7 +54,7 @@ yy4:
 yy5:
 #line 23 "repeater.re"
 	{RET(0);}
-#line 55 "<stdout>"
+#line 58 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -79,7 +79,7 @@ yy10:
 	++YYCURSOR;
 #line 18 "repeater.re"
 	{RET(1);}
-#line 79 "<stdout>"
+#line 83 "<stdout>"
 yy12:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -92,7 +92,7 @@ yy13:
 	++YYCURSOR;
 #line 19 "repeater.re"
 	{RET(2);}
-#line 91 "<stdout>"
+#line 96 "<stdout>"
 yy15:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -113,7 +113,7 @@ yy17:
 	++YYCURSOR;
 #line 21 "repeater.re"
 	{RET(4);}
-#line 110 "<stdout>"
+#line 117 "<stdout>"
 yy19:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -124,7 +124,7 @@ yy20:
 	++YYCURSOR;
 #line 20 "repeater.re"
 	{RET(3);}
-#line 121 "<stdout>"
+#line 128 "<stdout>"
 yy22:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
diff --git a/test/sample.c b/test/sample.c
index b34e53c5..8062e754 100644
--- a/test/sample.c
+++ b/test/sample.c
@@ -56,7 +56,7 @@ yy2:
 yy3:
 #line 3 "sample.re"
 	{return ID;}
-#line 59 "<stdout>"
+#line 60 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy18;
@@ -70,7 +70,7 @@ yy5:
 yy6:
 #line 4 "sample.re"
 	{return DEC;}
-#line 73 "<stdout>"
+#line 74 "<stdout>"
 yy7:
 	yych = *++YYCURSOR;
 	goto yy11;
@@ -78,7 +78,7 @@ yy8:
 	++YYCURSOR;
 #line 6 "sample.re"
 	{return ERR;}
-#line 81 "<stdout>"
+#line 82 "<stdout>"
 yy10:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -149,7 +149,7 @@ yy14:
 yy16:
 #line 5 "sample.re"
 	{return HEX;}
-#line 150 "<stdout>"
+#line 153 "<stdout>"
 yy17:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -236,7 +236,7 @@ yy22:
 yy23:
 #line 2 "sample.re"
 	{return PRINT;}
-#line 237 "<stdout>"
+#line 240 "<stdout>"
 }
 #line 7 "sample.re"
 
diff --git a/test/scanner.c b/test/scanner.c
index 0ddb1a12..cc0deaaa 100644
--- a/test/scanner.c
+++ b/test/scanner.c
@@ -265,7 +265,7 @@ yy18:
 	{ depth = 1;
 				  goto code;
 				}
-#line 262 "<stdout>"
+#line 269 "<stdout>"
 yy19:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -275,7 +275,7 @@ yy19:
 yy20:
 #line 131 "scanner.re"
 	{ RETURN(*tok); }
-#line 272 "<stdout>"
+#line 279 "<stdout>"
 yy21:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -286,7 +286,7 @@ yy22:
 #line 133 "scanner.re"
 	{ yylval.op = *tok;
 				  RETURN(CLOSE); }
-#line 283 "<stdout>"
+#line 290 "<stdout>"
 yy23:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -297,7 +297,7 @@ yy23:
 yy24:
 #line 122 "scanner.re"
 	{ fatal("unterminated string constant (missing \")"); }
-#line 294 "<stdout>"
+#line 301 "<stdout>"
 yy25:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -308,7 +308,7 @@ yy25:
 yy26:
 #line 123 "scanner.re"
 	{ fatal("unterminated string constant (missing ')"); }
-#line 305 "<stdout>"
+#line 312 "<stdout>"
 yy27:
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -319,7 +319,7 @@ yy27:
 yy28:
 #line 129 "scanner.re"
 	{ fatal("unterminated range (missing ])"); }
-#line 316 "<stdout>"
+#line 323 "<stdout>"
 yy29:
 	yych = *++YYCURSOR;
 	goto yy20;
@@ -335,7 +335,7 @@ yy32:
 	{ cur = cursor;
 				  yylval.symbol = Symbol::find(token());
 				  return ID; }
-#line 332 "<stdout>"
+#line 339 "<stdout>"
 yy33:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -343,7 +343,7 @@ yy33:
 yy34:
 #line 152 "scanner.re"
 	{ goto scan; }
-#line 340 "<stdout>"
+#line 347 "<stdout>"
 yy35:
 	++YYCURSOR;
 #line 154 "scanner.re"
@@ -351,14 +351,14 @@ yy35:
 				  pos = cursor; cline++;
 				  goto scan;
 	    			}
-#line 348 "<stdout>"
+#line 355 "<stdout>"
 yy37:
 	++YYCURSOR;
 #line 159 "scanner.re"
 	{ std::cerr << "unexpected character: " << *tok << std::endl;
 				  goto scan;
 				}
-#line 355 "<stdout>"
+#line 362 "<stdout>"
 yy39:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -472,7 +472,7 @@ yy47:
 	{ cur = cursor;
 				  yylval.regexp = ranToRE(token());
 				  return RANGE; }
-#line 466 "<stdout>"
+#line 476 "<stdout>"
 yy49:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -498,7 +498,7 @@ yy52:
 	{ cur = cursor;
 				  yylval.regexp = strToCaseInsensitiveRE(token());
 				  return STRING; }
-#line 492 "<stdout>"
+#line 502 "<stdout>"
 yy54:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -524,19 +524,19 @@ yy57:
 	{ cur = cursor;
 				  yylval.regexp = strToRE(token());
 				  return STRING; }
-#line 518 "<stdout>"
+#line 528 "<stdout>"
 yy59:
 	++YYCURSOR;
 #line 111 "scanner.re"
 	{ tok = cursor;
 				  RETURN(0); }
-#line 524 "<stdout>"
+#line 534 "<stdout>"
 yy61:
 	++YYCURSOR;
 #line 108 "scanner.re"
 	{ depth = 1;
 				  goto comment; }
-#line 530 "<stdout>"
+#line 540 "<stdout>"
 yy63:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -562,7 +562,7 @@ yy65:
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = atoi((char *)tok+1);
 				  RETURN(CLOSESIZE); }
-#line 556 "<stdout>"
+#line 566 "<stdout>"
 yy67:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -575,7 +575,7 @@ yy68:
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = -1;
 				  RETURN(CLOSESIZE); }
-#line 569 "<stdout>"
+#line 579 "<stdout>"
 yy70:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -601,14 +601,14 @@ yy72:
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1));
 				  RETURN(CLOSESIZE); }
-#line 595 "<stdout>"
+#line 605 "<stdout>"
 }
 #line 162 "scanner.re"
 
 
 code:
 
-#line 602 "<stdout>"
+#line 612 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -631,13 +631,13 @@ yy76:
 					return CODE;
 				  }
 				  goto code; }
-#line 625 "<stdout>"
+#line 635 "<stdout>"
 yy78:
 	++YYCURSOR;
 #line 172 "scanner.re"
 	{ ++depth;
 				  goto code; }
-#line 631 "<stdout>"
+#line 641 "<stdout>"
 yy80:
 	++YYCURSOR;
 #line 174 "scanner.re"
@@ -645,13 +645,13 @@ yy80:
 				  pos = cursor; cline++;
 				  goto code;
 				}
-#line 639 "<stdout>"
+#line 649 "<stdout>"
 yy82:
 	++YYCURSOR;
 yy83:
 #line 178 "scanner.re"
 	{ goto code; }
-#line 645 "<stdout>"
+#line 655 "<stdout>"
 yy84:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -715,7 +715,7 @@ yy92:
 
 comment:
 
-#line 709 "<stdout>"
+#line 719 "<stdout>"
 {
 	YYCTYPE yych;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
@@ -735,7 +735,7 @@ yy95:
 yy96:
 #line 193 "scanner.re"
 	{ goto comment; }
-#line 729 "<stdout>"
+#line 739 "<stdout>"
 yy97:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -749,7 +749,7 @@ yy98:
 				  tok = pos = cursor; cline++;
 				  goto comment;
 				}
-#line 743 "<stdout>"
+#line 753 "<stdout>"
 yy100:
 	yych = *++YYCURSOR;
 	goto yy96;
@@ -758,7 +758,7 @@ yy101:
 #line 187 "scanner.re"
 	{ ++depth;
 				  goto comment; }
-#line 752 "<stdout>"
+#line 762 "<stdout>"
 yy103:
 	++YYCURSOR;
 #line 183 "scanner.re"
@@ -766,7 +766,7 @@ yy103:
 					goto scan;
 				    else
 					goto comment; }
-#line 760 "<stdout>"
+#line 770 "<stdout>"
 }
 #line 194 "scanner.re"
 
-- 
2.40.0