From: helly <helly@642ea486-5414-0410-9d7f-a0204ed87703>
Date: Tue, 17 Jan 2006 21:33:38 +0000 (+0000)
Subject: - Applied #1408326 do not generate goto next state.
X-Git-Tag: 0.13.6~498
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9fd761bc7291cbe4caf0a7d954b4ef13b9806ea;p=re2c

- Applied #1408326 do not generate goto next state.
- Update test result expectations accordingly
# All tests were verified manually (using a #line diff filtering WinMerge
# plugin - written with re2c).
---

diff --git a/CHANGELOG b/CHANGELOG
index 5f955968..d1353ebc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@ Version 0.10.0 (????-??-??)
 - Added support for DOS line endings.
 - Added experimental unicode support.
 - Added config_w32.h to build out of the box on windows (using msvc 2002+).
+- Applied #1408326 do not generate goto next state.
 - Applied #1408282 CharSet initialization fix.
 - Applied #1408278 readsome with MSVC.
 - Applied #1307467 Unicode patch for 0.9.7.
diff --git a/code.cc b/code.cc
index 621ac1fc..190a5709 100644
--- a/code.cc
+++ b/code.cc
@@ -486,7 +486,10 @@ void doLinear(std::ostream &o, uint ind, Span *s, uint n, const State *from, con
 					genIf(o, ind, "!=", s[0].ub, readCh);
 					genGoTo(o, 0, from, bg, readCh);
 				}
-				genGoTo(o, ind, from, next, readCh);
+				if (next->label != from->label + 1)
+				{
+					genGoTo(o, ind, from, next, readCh);
+				}
 				return ;
 			}
 			else
@@ -505,7 +508,10 @@ void doLinear(std::ostream &o, uint ind, Span *s, uint n, const State *from, con
 		if (n == 1)
 		{
 			//	    	if(bg != next){
-			genGoTo(o, ind, from, s[0].to, readCh);
+			if (s[0].to->label != from->label + 1)
+			{
+				genGoTo(o, ind, from, s[0].to, readCh);
+			}
 			//	    	}
 			return ;
 		}
@@ -516,7 +522,10 @@ void doLinear(std::ostream &o, uint ind, Span *s, uint n, const State *from, con
 				genIf(o, ind, ">=", s[0].ub, readCh);
 				genGoTo(o, 0, from, s[1].to, readCh);
 			}
-			genGoTo(o, ind, from, next, readCh);
+			if (next->label != from->label + 1)
+			{
+				genGoTo(o, ind, from, next, readCh);
+			}
 			return ;
 		}
 		else
@@ -531,7 +540,10 @@ void doLinear(std::ostream &o, uint ind, Span *s, uint n, const State *from, con
 		}
 	}
 
-	genGoTo(o, ind, from, next, readCh);
+	if (next->label != from->label + 1)
+	{
+		genGoTo(o, ind, from, next, readCh);
+	}
 }
 
 void Go::genLinear(std::ostream &o, uint ind, const State *from, const State *next, bool &readCh, uint mask) const
diff --git a/test/bug1054496.c b/test/bug1054496.c
index 77f78d09..792920ed 100755
--- a/test/bug1054496.c
+++ b/test/bug1054496.c
@@ -96,11 +96,9 @@ yy3:
 #line 95 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 24 "bug1054496.re"
 	{ RET(TAG_EOI); }
-#line 102 "<stdout>"
+#line 100 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -164,13 +162,11 @@ yy7:
 yy8:
 #line 22 "bug1054496.re"
 	{ RET(TAG_A); }
-#line 165 "<stdout>"
+#line 163 "<stdout>"
 yy9:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy10;
-yy10:
 	switch(yych){
 	case 'A':
 	case 'B':
@@ -229,7 +225,7 @@ yy10:
 yy11:
 #line 23 "bug1054496.re"
 	{ RET(TAG_TAG); }
-#line 229 "<stdout>"
+#line 225 "<stdout>"
 }
 #line 26 "bug1054496.re"
 
diff --git a/test/bug1163046.c b/test/bug1163046.c
index bff986d7..8f224219 100755
--- a/test/bug1163046.c
+++ b/test/bug1163046.c
@@ -47,11 +47,9 @@ yy4:
 	goto yy3;
 yy5:
 	++YYCURSOR;
-	goto yy6;
-yy6:
 #line 25 "bug1163046.re"
 	{ return false; }
-#line 54 "<stdout>"
+#line 52 "<stdout>"
 yy7:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -349,14 +347,12 @@ yy50:
 	}
 yy51:
 	++YYCURSOR;
-	goto yy52;
-yy52:
 #line 18 "bug1163046.re"
 	{
 		if (token == start || *(token - 1) == '\n')
 		return true; else goto next;
 	}
-#line 327 "<stdout>"
+#line 323 "<stdout>"
 }
 #line 26 "bug1163046.re"
 
diff --git a/test/bug1187785.c b/test/bug1187785.c
index e5292112..1166acf1 100755
--- a/test/bug1187785.c
+++ b/test/bug1187785.c
@@ -304,8 +304,6 @@ yy5:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy6;
-yy6:
 	switch(yych){
 	case 0x00:
 	case 0x01:
@@ -571,11 +569,9 @@ yy7:
 	}
 yy8:
 	++YYCURSOR;
-	goto yy9;
-yy9:
 #line 22 "bug1187785.re"
 	{ RET(1); }
-#line 577 "<stdout>"
+#line 573 "<stdout>"
 }
 #line 24 "bug1187785.re"
 
diff --git a/test/bug1297658.c b/test/bug1297658.c
index 146837ab..f02516c3 100644
--- a/test/bug1297658.c
+++ b/test/bug1297658.c
@@ -101,15 +101,13 @@ yy5:
 #line 102 "<stdout>"
 yy6:
 	++YYCURSOR;
-	goto yy7;
-yy7:
 #line 66 "bug1297658.re"
 	{
 		s.line++;
 		if(1||s.cur == s.eof) RET(EOI);
 		goto std;
 	}
-#line 113 "<stdout>"
+#line 111 "<stdout>"
 yy8:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -133,8 +131,6 @@ yy12:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy13;
-yy13:
 	switch(yych){
 	case '.':	goto yy11;
 	case '0':	goto yy12;
diff --git a/test/bug1390174.c b/test/bug1390174.c
index e99f5a03..e2528c77 100755
--- a/test/bug1390174.c
+++ b/test/bug1390174.c
@@ -45,11 +45,10 @@ yy3:
 #line 44 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
 yy5:
 #line 18 "bug1390174.re"
 	{RET(1);}
-#line 51 "<stdout>"
+#line 50 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -60,8 +59,6 @@ yy8:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy9;
-yy9:
 	switch(yych){
 	case 0x0A:	goto yy7;
 	case 'A':
diff --git a/test/c.c b/test/c.c
index 6e710159..18f3d620 100644
--- a/test/c.c
+++ b/test/c.c
@@ -531,81 +531,59 @@ yy50:
 #line 521 "<stdout>"
 yy51:
 	++YYCURSOR;
-	goto yy52;
-yy52:
 #line 205 "c.re"
 	{ RET(';'); }
-#line 528 "<stdout>"
+#line 526 "<stdout>"
 yy53:
 	++YYCURSOR;
-	goto yy54;
-yy54:
 #line 206 "c.re"
 	{ RET('{'); }
-#line 535 "<stdout>"
+#line 531 "<stdout>"
 yy55:
 	++YYCURSOR;
-	goto yy56;
-yy56:
 #line 207 "c.re"
 	{ RET('}'); }
-#line 542 "<stdout>"
+#line 536 "<stdout>"
 yy57:
 	++YYCURSOR;
-	goto yy58;
-yy58:
 #line 208 "c.re"
 	{ RET(','); }
-#line 549 "<stdout>"
+#line 541 "<stdout>"
 yy59:
 	++YYCURSOR;
-	goto yy60;
-yy60:
 #line 209 "c.re"
 	{ RET(':'); }
-#line 556 "<stdout>"
+#line 546 "<stdout>"
 yy61:
 	++YYCURSOR;
-	goto yy62;
-yy62:
 #line 211 "c.re"
 	{ RET('('); }
-#line 563 "<stdout>"
+#line 551 "<stdout>"
 yy63:
 	++YYCURSOR;
-	goto yy64;
-yy64:
 #line 212 "c.re"
 	{ RET(')'); }
-#line 570 "<stdout>"
+#line 556 "<stdout>"
 yy65:
 	++YYCURSOR;
-	goto yy66;
-yy66:
 #line 213 "c.re"
 	{ RET('['); }
-#line 577 "<stdout>"
+#line 561 "<stdout>"
 yy67:
 	++YYCURSOR;
-	goto yy68;
-yy68:
 #line 214 "c.re"
 	{ RET(']'); }
-#line 584 "<stdout>"
+#line 566 "<stdout>"
 yy69:
 	++YYCURSOR;
-	goto yy70;
-yy70:
 #line 218 "c.re"
 	{ RET('~'); }
-#line 591 "<stdout>"
+#line 571 "<stdout>"
 yy71:
 	++YYCURSOR;
-	goto yy72;
-yy72:
 #line 228 "c.re"
 	{ RET('?'); }
-#line 598 "<stdout>"
+#line 576 "<stdout>"
 yy73:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -613,18 +591,16 @@ yy73:
 yy74:
 #line 231 "c.re"
 	{ goto std; }
-#line 606 "<stdout>"
+#line 584 "<stdout>"
 yy75:
 	++YYCURSOR;
-	goto yy76;
-yy76:
 #line 234 "c.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 617 "<stdout>"
+#line 593 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy25;
@@ -632,7 +608,6 @@ yy78:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy79;
 yy79:
 	switch(yych){
 	case 0x09:
@@ -643,109 +618,79 @@ yy79:
 	}
 yy80:
 	++YYCURSOR;
-	goto yy81;
-yy81:
 #line 204 "c.re"
 	{ RET(NEQ); }
-#line 638 "<stdout>"
+#line 611 "<stdout>"
 yy82:
 	++YYCURSOR;
-	goto yy83;
-yy83:
 #line 203 "c.re"
 	{ RET(EQL); }
-#line 645 "<stdout>"
+#line 616 "<stdout>"
 yy84:
 	++YYCURSOR;
-	goto yy85;
-yy85:
 #line 200 "c.re"
 	{ RET(OROR); }
-#line 652 "<stdout>"
+#line 621 "<stdout>"
 yy86:
 	++YYCURSOR;
-	goto yy87;
-yy87:
 #line 193 "c.re"
 	{ RET(OREQ); }
-#line 659 "<stdout>"
+#line 626 "<stdout>"
 yy88:
 	++YYCURSOR;
-	goto yy89;
-yy89:
 #line 192 "c.re"
 	{ RET(XOREQ); }
-#line 666 "<stdout>"
+#line 631 "<stdout>"
 yy90:
 	++YYCURSOR;
-	goto yy91;
-yy91:
 #line 199 "c.re"
 	{ RET(ANDAND); }
-#line 673 "<stdout>"
+#line 636 "<stdout>"
 yy92:
 	++YYCURSOR;
-	goto yy93;
-yy93:
 #line 191 "c.re"
 	{ RET(ANDEQ); }
-#line 680 "<stdout>"
+#line 641 "<stdout>"
 yy94:
 	++YYCURSOR;
-	goto yy95;
-yy95:
 #line 190 "c.re"
 	{ RET(MODEQ); }
-#line 687 "<stdout>"
+#line 646 "<stdout>"
 yy96:
 	++YYCURSOR;
-	goto yy97;
-yy97:
 #line 188 "c.re"
 	{ RET(MULEQ); }
-#line 694 "<stdout>"
+#line 651 "<stdout>"
 yy98:
 	++YYCURSOR;
-	goto yy99;
-yy99:
 #line 198 "c.re"
 	{ RET(DEREF); }
-#line 701 "<stdout>"
+#line 656 "<stdout>"
 yy100:
 	++YYCURSOR;
-	goto yy101;
-yy101:
 #line 197 "c.re"
 	{ RET(DECR); }
-#line 708 "<stdout>"
+#line 661 "<stdout>"
 yy102:
 	++YYCURSOR;
-	goto yy103;
-yy103:
 #line 187 "c.re"
 	{ RET(SUBEQ); }
-#line 715 "<stdout>"
+#line 666 "<stdout>"
 yy104:
 	++YYCURSOR;
-	goto yy105;
-yy105:
 #line 196 "c.re"
 	{ RET(INCR); }
-#line 722 "<stdout>"
+#line 671 "<stdout>"
 yy106:
 	++YYCURSOR;
-	goto yy107;
-yy107:
 #line 186 "c.re"
 	{ RET(ADDEQ); }
-#line 729 "<stdout>"
+#line 676 "<stdout>"
 yy108:
 	++YYCURSOR;
-	goto yy109;
-yy109:
 #line 201 "c.re"
 	{ RET(LEQ); }
-#line 736 "<stdout>"
+#line 681 "<stdout>"
 yy110:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -755,21 +700,17 @@ yy110:
 yy111:
 #line 195 "c.re"
 	{ RET(LSHIFT); }
-#line 746 "<stdout>"
+#line 691 "<stdout>"
 yy112:
 	++YYCURSOR;
-	goto yy113;
-yy113:
 #line 185 "c.re"
 	{ RET(LSHIFTEQ); }
-#line 753 "<stdout>"
+#line 696 "<stdout>"
 yy114:
 	++YYCURSOR;
-	goto yy115;
-yy115:
 #line 202 "c.re"
 	{ RET(GEQ); }
-#line 760 "<stdout>"
+#line 701 "<stdout>"
 yy116:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -779,19 +720,16 @@ yy116:
 yy117:
 #line 194 "c.re"
 	{ RET(RSHIFT); }
-#line 770 "<stdout>"
+#line 711 "<stdout>"
 yy118:
 	++YYCURSOR;
-	goto yy119;
-yy119:
 #line 184 "c.re"
 	{ RET(RSHIFTEQ); }
-#line 777 "<stdout>"
+#line 716 "<stdout>"
 yy120:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy121;
 yy121:
 	switch(yych){
 	case 0x0A:	goto yy122;
@@ -836,11 +774,9 @@ yy123:
 	}
 yy124:
 	++YYCURSOR;
-	goto yy125;
-yy125:
 #line 181 "c.re"
 	{ RET(SCON); }
-#line 822 "<stdout>"
+#line 758 "<stdout>"
 yy126:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -874,8 +810,6 @@ yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy128;
-yy128:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '"':	goto yy124;
@@ -894,8 +828,6 @@ yy129:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy130;
-yy130:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '"':	goto yy124;
@@ -935,8 +867,6 @@ yy132:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:
 	switch(yych){
 	case '0':
 	case '1':
@@ -959,7 +889,7 @@ yy133:
 yy134:
 #line 178 "c.re"
 	{ RET(FCON); }
-#line 933 "<stdout>"
+#line 863 "<stdout>"
 yy135:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -999,8 +929,6 @@ yy138:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy139;
-yy139:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1020,16 +948,13 @@ yy139:
 	}
 yy140:
 	++YYCURSOR;
-	goto yy141;
-yy141:
 #line 183 "c.re"
 	{ RET(ELLIPSIS); }
-#line 994 "<stdout>"
+#line 920 "<stdout>"
 yy142:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy143;
 yy143:
 	switch(yych){
 	case 0x0A:	goto yy122;
@@ -1100,8 +1025,6 @@ yy147:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy148;
-yy148:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '\'':	goto yy145;
@@ -1120,8 +1043,6 @@ yy149:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy150;
-yy150:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '\'':	goto yy145;
@@ -1163,7 +1084,6 @@ yy152:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy153;
 yy153:
 	switch(yych){
 	case '.':	goto yy151;
@@ -1206,8 +1126,6 @@ yy155:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy156;
-yy156:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1234,8 +1152,6 @@ yy158:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy159;
-yy159:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1258,7 +1174,6 @@ yy160:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy161;
 yy161:
 	switch(yych){
 	case '0':
@@ -1315,8 +1230,6 @@ yy164:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy165;
-yy165:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1370,8 +1283,6 @@ yy168:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy169;
-yy169:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1394,7 +1305,6 @@ yy170:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy171;
 yy171:
 	switch(yych){
 	case '.':	goto yy151;
@@ -1447,8 +1357,6 @@ yy173:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy174;
-yy174:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1482,8 +1390,6 @@ yy175:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy176;
-yy176:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1495,8 +1401,6 @@ yy177:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy178;
-yy178:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1508,7 +1412,6 @@ yy179:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy180;
 yy180:
 	switch(yych){
 	case '0':
@@ -1665,7 +1568,7 @@ yy184:
 yy185:
 #line 169 "c.re"
 	{ RET(WHILE); }
-#line 1575 "<stdout>"
+#line 1478 "<stdout>"
 yy186:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1780,7 +1683,7 @@ yy193:
 yy194:
 #line 168 "c.re"
 	{ RET(VOLATILE); }
-#line 1687 "<stdout>"
+#line 1590 "<stdout>"
 yy195:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1852,7 +1755,7 @@ yy195:
 yy196:
 #line 167 "c.re"
 	{ RET(VOID); }
-#line 1756 "<stdout>"
+#line 1659 "<stdout>"
 yy197:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1967,7 +1870,7 @@ yy204:
 yy205:
 #line 166 "c.re"
 	{ RET(UNSIGNED); }
-#line 1868 "<stdout>"
+#line 1771 "<stdout>"
 yy206:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2045,7 +1948,7 @@ yy207:
 yy208:
 #line 165 "c.re"
 	{ RET(UNION); }
-#line 1943 "<stdout>"
+#line 1846 "<stdout>"
 yy209:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2147,7 +2050,7 @@ yy214:
 yy215:
 #line 164 "c.re"
 	{ RET(TYPEDEF); }
-#line 2042 "<stdout>"
+#line 1945 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2263,7 +2166,7 @@ yy223:
 yy224:
 #line 163 "c.re"
 	{ RET(SWITCH); }
-#line 2155 "<stdout>"
+#line 2058 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2359,7 +2262,7 @@ yy229:
 yy230:
 #line 162 "c.re"
 	{ RET(STRUCT); }
-#line 2248 "<stdout>"
+#line 2151 "<stdout>"
 yy231:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2443,7 +2346,7 @@ yy233:
 yy234:
 #line 161 "c.re"
 	{ RET(STATIC); }
-#line 2329 "<stdout>"
+#line 2232 "<stdout>"
 yy235:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2539,7 +2442,7 @@ yy239:
 yy240:
 #line 160 "c.re"
 	{ RET(SIZEOF); }
-#line 2422 "<stdout>"
+#line 2325 "<stdout>"
 yy241:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2623,7 +2526,7 @@ yy243:
 yy244:
 #line 159 "c.re"
 	{ RET(SIGNED); }
-#line 2503 "<stdout>"
+#line 2406 "<stdout>"
 yy245:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2707,7 +2610,7 @@ yy247:
 yy248:
 #line 158 "c.re"
 	{ RET(SHORT); }
-#line 2584 "<stdout>"
+#line 2487 "<stdout>"
 yy249:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2810,7 +2713,7 @@ yy254:
 yy255:
 #line 157 "c.re"
 	{ RET(RETURN); }
-#line 2684 "<stdout>"
+#line 2587 "<stdout>"
 yy256:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2906,7 +2809,7 @@ yy260:
 yy261:
 #line 156 "c.re"
 	{ RET(REGISTER); }
-#line 2777 "<stdout>"
+#line 2680 "<stdout>"
 yy262:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2990,7 +2893,7 @@ yy264:
 yy265:
 #line 155 "c.re"
 	{ RET(LONG); }
-#line 2858 "<stdout>"
+#line 2761 "<stdout>"
 yy266:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3062,7 +2965,7 @@ yy266:
 yy267:
 #line 153 "c.re"
 	{ RET(IF); }
-#line 2927 "<stdout>"
+#line 2830 "<stdout>"
 yy268:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3140,7 +3043,7 @@ yy269:
 yy270:
 #line 154 "c.re"
 	{ RET(INT); }
-#line 3002 "<stdout>"
+#line 2905 "<stdout>"
 yy271:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3224,7 +3127,7 @@ yy273:
 yy274:
 #line 152 "c.re"
 	{ RET(GOTO); }
-#line 3083 "<stdout>"
+#line 2986 "<stdout>"
 yy275:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3308,7 +3211,7 @@ yy277:
 yy278:
 #line 151 "c.re"
 	{ RET(FOR); }
-#line 3164 "<stdout>"
+#line 3067 "<stdout>"
 yy279:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3392,7 +3295,7 @@ yy281:
 yy282:
 #line 150 "c.re"
 	{ RET(FLOAT); }
-#line 3245 "<stdout>"
+#line 3148 "<stdout>"
 yy283:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3500,7 +3403,7 @@ yy289:
 yy290:
 #line 149 "c.re"
 	{ RET(EXTERN); }
-#line 3350 "<stdout>"
+#line 3253 "<stdout>"
 yy291:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3578,7 +3481,7 @@ yy292:
 yy293:
 #line 148 "c.re"
 	{ RET(ENUM); }
-#line 3425 "<stdout>"
+#line 3328 "<stdout>"
 yy294:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3656,7 +3559,7 @@ yy295:
 yy296:
 #line 147 "c.re"
 	{ RET(ELSE); }
-#line 3500 "<stdout>"
+#line 3403 "<stdout>"
 yy297:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3734,7 +3637,7 @@ yy298:
 yy299:
 #line 145 "c.re"
 	{ RET(DO); }
-#line 3574 "<stdout>"
+#line 3477 "<stdout>"
 yy300:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3824,7 +3727,7 @@ yy303:
 yy304:
 #line 146 "c.re"
 	{ RET(DOUBLE); }
-#line 3661 "<stdout>"
+#line 3564 "<stdout>"
 yy305:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3920,7 +3823,7 @@ yy309:
 yy310:
 #line 144 "c.re"
 	{ RET(DEFAULT); }
-#line 3754 "<stdout>"
+#line 3657 "<stdout>"
 yy311:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4047,7 +3950,7 @@ yy320:
 yy321:
 #line 143 "c.re"
 	{ RET(CONTINUE); }
-#line 3878 "<stdout>"
+#line 3781 "<stdout>"
 yy322:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -4119,7 +4022,7 @@ yy322:
 yy323:
 #line 142 "c.re"
 	{ RET(CONST); }
-#line 3947 "<stdout>"
+#line 3850 "<stdout>"
 yy324:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4197,7 +4100,7 @@ yy325:
 yy326:
 #line 141 "c.re"
 	{ RET(CHAR); }
-#line 4022 "<stdout>"
+#line 3925 "<stdout>"
 yy327:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4275,7 +4178,7 @@ yy328:
 yy329:
 #line 140 "c.re"
 	{ RET(CASE); }
-#line 4097 "<stdout>"
+#line 4000 "<stdout>"
 yy330:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4365,7 +4268,7 @@ yy333:
 yy334:
 #line 139 "c.re"
 	{ RET(BREAK); }
-#line 4184 "<stdout>"
+#line 4087 "<stdout>"
 yy335:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4449,28 +4352,24 @@ yy337:
 yy338:
 #line 138 "c.re"
 	{ RET(AUTO); }
-#line 4265 "<stdout>"
+#line 4168 "<stdout>"
 yy339:
 	++YYCURSOR;
-	goto yy340;
-yy340:
 #line 189 "c.re"
 	{ RET(DIVEQ); }
-#line 4272 "<stdout>"
+#line 4173 "<stdout>"
 yy341:
 	++YYCURSOR;
-	goto yy342;
-yy342:
 #line 136 "c.re"
 	{ goto comment; }
-#line 4279 "<stdout>"
+#line 4178 "<stdout>"
 }
 #line 245 "c.re"
 
 
 comment:
 
-#line 4286 "<stdout>"
+#line 4185 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy343;
@@ -4492,28 +4391,24 @@ yy345:
 yy346:
 #line 256 "c.re"
 	{ goto comment; }
-#line 4308 "<stdout>"
+#line 4207 "<stdout>"
 yy347:
 	++YYCURSOR;
-	goto yy348;
-yy348:
 #line 251 "c.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4319 "<stdout>"
+#line 4216 "<stdout>"
 yy349:
 	yych = *++YYCURSOR;
 	goto yy346;
 yy350:
 	++YYCURSOR;
-	goto yy351;
-yy351:
 #line 249 "c.re"
 	{ goto std; }
-#line 4329 "<stdout>"
+#line 4224 "<stdout>"
 }
 #line 257 "c.re"
 
diff --git a/test/cmmap.c b/test/cmmap.c
index 3416e20d..b77f574f 100644
--- a/test/cmmap.c
+++ b/test/cmmap.c
@@ -514,81 +514,59 @@ yy50:
 #line 504 "<stdout>"
 yy51:
 	++YYCURSOR;
-	goto yy52;
-yy52:
 #line 188 "cmmap.re"
 	{ RET(';'); }
-#line 511 "<stdout>"
+#line 509 "<stdout>"
 yy53:
 	++YYCURSOR;
-	goto yy54;
-yy54:
 #line 189 "cmmap.re"
 	{ RET('{'); }
-#line 518 "<stdout>"
+#line 514 "<stdout>"
 yy55:
 	++YYCURSOR;
-	goto yy56;
-yy56:
 #line 190 "cmmap.re"
 	{ RET('}'); }
-#line 525 "<stdout>"
+#line 519 "<stdout>"
 yy57:
 	++YYCURSOR;
-	goto yy58;
-yy58:
 #line 191 "cmmap.re"
 	{ RET(','); }
-#line 532 "<stdout>"
+#line 524 "<stdout>"
 yy59:
 	++YYCURSOR;
-	goto yy60;
-yy60:
 #line 192 "cmmap.re"
 	{ RET(':'); }
-#line 539 "<stdout>"
+#line 529 "<stdout>"
 yy61:
 	++YYCURSOR;
-	goto yy62;
-yy62:
 #line 194 "cmmap.re"
 	{ RET('('); }
-#line 546 "<stdout>"
+#line 534 "<stdout>"
 yy63:
 	++YYCURSOR;
-	goto yy64;
-yy64:
 #line 195 "cmmap.re"
 	{ RET(')'); }
-#line 553 "<stdout>"
+#line 539 "<stdout>"
 yy65:
 	++YYCURSOR;
-	goto yy66;
-yy66:
 #line 196 "cmmap.re"
 	{ RET('['); }
-#line 560 "<stdout>"
+#line 544 "<stdout>"
 yy67:
 	++YYCURSOR;
-	goto yy68;
-yy68:
 #line 197 "cmmap.re"
 	{ RET(']'); }
-#line 567 "<stdout>"
+#line 549 "<stdout>"
 yy69:
 	++YYCURSOR;
-	goto yy70;
-yy70:
 #line 201 "cmmap.re"
 	{ RET('~'); }
-#line 574 "<stdout>"
+#line 554 "<stdout>"
 yy71:
 	++YYCURSOR;
-	goto yy72;
-yy72:
 #line 211 "cmmap.re"
 	{ RET('?'); }
-#line 581 "<stdout>"
+#line 559 "<stdout>"
 yy73:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -596,18 +574,16 @@ yy73:
 yy74:
 #line 214 "cmmap.re"
 	{ goto std; }
-#line 589 "<stdout>"
+#line 567 "<stdout>"
 yy75:
 	++YYCURSOR;
-	goto yy76;
-yy76:
 #line 217 "cmmap.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 600 "<stdout>"
+#line 576 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy25;
@@ -615,7 +591,6 @@ yy78:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy79;
 yy79:
 	switch(yych){
 	case 0x09:
@@ -626,109 +601,79 @@ yy79:
 	}
 yy80:
 	++YYCURSOR;
-	goto yy81;
-yy81:
 #line 187 "cmmap.re"
 	{ RET(NEQ); }
-#line 621 "<stdout>"
+#line 594 "<stdout>"
 yy82:
 	++YYCURSOR;
-	goto yy83;
-yy83:
 #line 186 "cmmap.re"
 	{ RET(EQL); }
-#line 628 "<stdout>"
+#line 599 "<stdout>"
 yy84:
 	++YYCURSOR;
-	goto yy85;
-yy85:
 #line 183 "cmmap.re"
 	{ RET(OROR); }
-#line 635 "<stdout>"
+#line 604 "<stdout>"
 yy86:
 	++YYCURSOR;
-	goto yy87;
-yy87:
 #line 176 "cmmap.re"
 	{ RET(OREQ); }
-#line 642 "<stdout>"
+#line 609 "<stdout>"
 yy88:
 	++YYCURSOR;
-	goto yy89;
-yy89:
 #line 175 "cmmap.re"
 	{ RET(XOREQ); }
-#line 649 "<stdout>"
+#line 614 "<stdout>"
 yy90:
 	++YYCURSOR;
-	goto yy91;
-yy91:
 #line 182 "cmmap.re"
 	{ RET(ANDAND); }
-#line 656 "<stdout>"
+#line 619 "<stdout>"
 yy92:
 	++YYCURSOR;
-	goto yy93;
-yy93:
 #line 174 "cmmap.re"
 	{ RET(ANDEQ); }
-#line 663 "<stdout>"
+#line 624 "<stdout>"
 yy94:
 	++YYCURSOR;
-	goto yy95;
-yy95:
 #line 173 "cmmap.re"
 	{ RET(MODEQ); }
-#line 670 "<stdout>"
+#line 629 "<stdout>"
 yy96:
 	++YYCURSOR;
-	goto yy97;
-yy97:
 #line 171 "cmmap.re"
 	{ RET(MULEQ); }
-#line 677 "<stdout>"
+#line 634 "<stdout>"
 yy98:
 	++YYCURSOR;
-	goto yy99;
-yy99:
 #line 181 "cmmap.re"
 	{ RET(DEREF); }
-#line 684 "<stdout>"
+#line 639 "<stdout>"
 yy100:
 	++YYCURSOR;
-	goto yy101;
-yy101:
 #line 180 "cmmap.re"
 	{ RET(DECR); }
-#line 691 "<stdout>"
+#line 644 "<stdout>"
 yy102:
 	++YYCURSOR;
-	goto yy103;
-yy103:
 #line 170 "cmmap.re"
 	{ RET(SUBEQ); }
-#line 698 "<stdout>"
+#line 649 "<stdout>"
 yy104:
 	++YYCURSOR;
-	goto yy105;
-yy105:
 #line 179 "cmmap.re"
 	{ RET(INCR); }
-#line 705 "<stdout>"
+#line 654 "<stdout>"
 yy106:
 	++YYCURSOR;
-	goto yy107;
-yy107:
 #line 169 "cmmap.re"
 	{ RET(ADDEQ); }
-#line 712 "<stdout>"
+#line 659 "<stdout>"
 yy108:
 	++YYCURSOR;
-	goto yy109;
-yy109:
 #line 184 "cmmap.re"
 	{ RET(LEQ); }
-#line 719 "<stdout>"
+#line 664 "<stdout>"
 yy110:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -738,21 +683,17 @@ yy110:
 yy111:
 #line 178 "cmmap.re"
 	{ RET(LSHIFT); }
-#line 729 "<stdout>"
+#line 674 "<stdout>"
 yy112:
 	++YYCURSOR;
-	goto yy113;
-yy113:
 #line 168 "cmmap.re"
 	{ RET(LSHIFTEQ); }
-#line 736 "<stdout>"
+#line 679 "<stdout>"
 yy114:
 	++YYCURSOR;
-	goto yy115;
-yy115:
 #line 185 "cmmap.re"
 	{ RET(GEQ); }
-#line 743 "<stdout>"
+#line 684 "<stdout>"
 yy116:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -762,19 +703,16 @@ yy116:
 yy117:
 #line 177 "cmmap.re"
 	{ RET(RSHIFT); }
-#line 753 "<stdout>"
+#line 694 "<stdout>"
 yy118:
 	++YYCURSOR;
-	goto yy119;
-yy119:
 #line 167 "cmmap.re"
 	{ RET(RSHIFTEQ); }
-#line 760 "<stdout>"
+#line 699 "<stdout>"
 yy120:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy121;
 yy121:
 	switch(yych){
 	case 0x0A:	goto yy122;
@@ -819,11 +757,9 @@ yy123:
 	}
 yy124:
 	++YYCURSOR;
-	goto yy125;
-yy125:
 #line 164 "cmmap.re"
 	{ RET(SCON); }
-#line 805 "<stdout>"
+#line 741 "<stdout>"
 yy126:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -857,8 +793,6 @@ yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy128;
-yy128:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '"':	goto yy124;
@@ -877,8 +811,6 @@ yy129:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy130;
-yy130:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '"':	goto yy124;
@@ -918,8 +850,6 @@ yy132:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:
 	switch(yych){
 	case '0':
 	case '1':
@@ -942,7 +872,7 @@ yy133:
 yy134:
 #line 161 "cmmap.re"
 	{ RET(FCON); }
-#line 916 "<stdout>"
+#line 846 "<stdout>"
 yy135:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -982,8 +912,6 @@ yy138:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy139;
-yy139:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1003,16 +931,13 @@ yy139:
 	}
 yy140:
 	++YYCURSOR;
-	goto yy141;
-yy141:
 #line 166 "cmmap.re"
 	{ RET(ELLIPSIS); }
-#line 977 "<stdout>"
+#line 903 "<stdout>"
 yy142:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy143;
 yy143:
 	switch(yych){
 	case 0x0A:	goto yy122;
@@ -1083,8 +1008,6 @@ yy147:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy148;
-yy148:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '\'':	goto yy145;
@@ -1103,8 +1026,6 @@ yy149:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy150;
-yy150:
 	switch(yych){
 	case 0x0A:	goto yy122;
 	case '\'':	goto yy145;
@@ -1146,7 +1067,6 @@ yy152:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy153;
 yy153:
 	switch(yych){
 	case '.':	goto yy151;
@@ -1189,8 +1109,6 @@ yy155:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy156;
-yy156:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1217,8 +1135,6 @@ yy158:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy159;
-yy159:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1241,7 +1157,6 @@ yy160:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy161;
 yy161:
 	switch(yych){
 	case '0':
@@ -1298,8 +1213,6 @@ yy164:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy165;
-yy165:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1353,8 +1266,6 @@ yy168:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy169;
-yy169:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1377,7 +1288,6 @@ yy170:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy171;
 yy171:
 	switch(yych){
 	case '.':	goto yy151;
@@ -1430,8 +1340,6 @@ yy173:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy174;
-yy174:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1465,8 +1373,6 @@ yy175:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy176;
-yy176:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1478,8 +1384,6 @@ yy177:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy178;
-yy178:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1491,7 +1395,6 @@ yy179:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy180;
 yy180:
 	switch(yych){
 	case '0':
@@ -1648,7 +1551,7 @@ yy184:
 yy185:
 #line 152 "cmmap.re"
 	{ RET(WHILE); }
-#line 1558 "<stdout>"
+#line 1461 "<stdout>"
 yy186:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1763,7 +1666,7 @@ yy193:
 yy194:
 #line 151 "cmmap.re"
 	{ RET(VOLATILE); }
-#line 1670 "<stdout>"
+#line 1573 "<stdout>"
 yy195:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1835,7 +1738,7 @@ yy195:
 yy196:
 #line 150 "cmmap.re"
 	{ RET(VOID); }
-#line 1739 "<stdout>"
+#line 1642 "<stdout>"
 yy197:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1950,7 +1853,7 @@ yy204:
 yy205:
 #line 149 "cmmap.re"
 	{ RET(UNSIGNED); }
-#line 1851 "<stdout>"
+#line 1754 "<stdout>"
 yy206:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2028,7 +1931,7 @@ yy207:
 yy208:
 #line 148 "cmmap.re"
 	{ RET(UNION); }
-#line 1926 "<stdout>"
+#line 1829 "<stdout>"
 yy209:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2130,7 +2033,7 @@ yy214:
 yy215:
 #line 147 "cmmap.re"
 	{ RET(TYPEDEF); }
-#line 2025 "<stdout>"
+#line 1928 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2246,7 +2149,7 @@ yy223:
 yy224:
 #line 146 "cmmap.re"
 	{ RET(SWITCH); }
-#line 2138 "<stdout>"
+#line 2041 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2342,7 +2245,7 @@ yy229:
 yy230:
 #line 145 "cmmap.re"
 	{ RET(STRUCT); }
-#line 2231 "<stdout>"
+#line 2134 "<stdout>"
 yy231:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2426,7 +2329,7 @@ yy233:
 yy234:
 #line 144 "cmmap.re"
 	{ RET(STATIC); }
-#line 2312 "<stdout>"
+#line 2215 "<stdout>"
 yy235:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2522,7 +2425,7 @@ yy239:
 yy240:
 #line 143 "cmmap.re"
 	{ RET(SIZEOF); }
-#line 2405 "<stdout>"
+#line 2308 "<stdout>"
 yy241:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2606,7 +2509,7 @@ yy243:
 yy244:
 #line 142 "cmmap.re"
 	{ RET(SIGNED); }
-#line 2486 "<stdout>"
+#line 2389 "<stdout>"
 yy245:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2690,7 +2593,7 @@ yy247:
 yy248:
 #line 141 "cmmap.re"
 	{ RET(SHORT); }
-#line 2567 "<stdout>"
+#line 2470 "<stdout>"
 yy249:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2793,7 +2696,7 @@ yy254:
 yy255:
 #line 140 "cmmap.re"
 	{ RET(RETURN); }
-#line 2667 "<stdout>"
+#line 2570 "<stdout>"
 yy256:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2889,7 +2792,7 @@ yy260:
 yy261:
 #line 139 "cmmap.re"
 	{ RET(REGISTER); }
-#line 2760 "<stdout>"
+#line 2663 "<stdout>"
 yy262:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2973,7 +2876,7 @@ yy264:
 yy265:
 #line 138 "cmmap.re"
 	{ RET(LONG); }
-#line 2841 "<stdout>"
+#line 2744 "<stdout>"
 yy266:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3045,7 +2948,7 @@ yy266:
 yy267:
 #line 136 "cmmap.re"
 	{ RET(IF); }
-#line 2910 "<stdout>"
+#line 2813 "<stdout>"
 yy268:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3123,7 +3026,7 @@ yy269:
 yy270:
 #line 137 "cmmap.re"
 	{ RET(INT); }
-#line 2985 "<stdout>"
+#line 2888 "<stdout>"
 yy271:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3207,7 +3110,7 @@ yy273:
 yy274:
 #line 135 "cmmap.re"
 	{ RET(GOTO); }
-#line 3066 "<stdout>"
+#line 2969 "<stdout>"
 yy275:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3291,7 +3194,7 @@ yy277:
 yy278:
 #line 134 "cmmap.re"
 	{ RET(FOR); }
-#line 3147 "<stdout>"
+#line 3050 "<stdout>"
 yy279:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3375,7 +3278,7 @@ yy281:
 yy282:
 #line 133 "cmmap.re"
 	{ RET(FLOAT); }
-#line 3228 "<stdout>"
+#line 3131 "<stdout>"
 yy283:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3483,7 +3386,7 @@ yy289:
 yy290:
 #line 132 "cmmap.re"
 	{ RET(EXTERN); }
-#line 3333 "<stdout>"
+#line 3236 "<stdout>"
 yy291:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3561,7 +3464,7 @@ yy292:
 yy293:
 #line 131 "cmmap.re"
 	{ RET(ENUM); }
-#line 3408 "<stdout>"
+#line 3311 "<stdout>"
 yy294:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3639,7 +3542,7 @@ yy295:
 yy296:
 #line 130 "cmmap.re"
 	{ RET(ELSE); }
-#line 3483 "<stdout>"
+#line 3386 "<stdout>"
 yy297:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3717,7 +3620,7 @@ yy298:
 yy299:
 #line 128 "cmmap.re"
 	{ RET(DO); }
-#line 3557 "<stdout>"
+#line 3460 "<stdout>"
 yy300:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3807,7 +3710,7 @@ yy303:
 yy304:
 #line 129 "cmmap.re"
 	{ RET(DOUBLE); }
-#line 3644 "<stdout>"
+#line 3547 "<stdout>"
 yy305:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3903,7 +3806,7 @@ yy309:
 yy310:
 #line 127 "cmmap.re"
 	{ RET(DEFAULT); }
-#line 3737 "<stdout>"
+#line 3640 "<stdout>"
 yy311:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4030,7 +3933,7 @@ yy320:
 yy321:
 #line 126 "cmmap.re"
 	{ RET(CONTINUE); }
-#line 3861 "<stdout>"
+#line 3764 "<stdout>"
 yy322:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -4102,7 +4005,7 @@ yy322:
 yy323:
 #line 125 "cmmap.re"
 	{ RET(CONST); }
-#line 3930 "<stdout>"
+#line 3833 "<stdout>"
 yy324:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4180,7 +4083,7 @@ yy325:
 yy326:
 #line 124 "cmmap.re"
 	{ RET(CHAR); }
-#line 4005 "<stdout>"
+#line 3908 "<stdout>"
 yy327:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4258,7 +4161,7 @@ yy328:
 yy329:
 #line 123 "cmmap.re"
 	{ RET(CASE); }
-#line 4080 "<stdout>"
+#line 3983 "<stdout>"
 yy330:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4348,7 +4251,7 @@ yy333:
 yy334:
 #line 122 "cmmap.re"
 	{ RET(BREAK); }
-#line 4167 "<stdout>"
+#line 4070 "<stdout>"
 yy335:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4432,28 +4335,24 @@ yy337:
 yy338:
 #line 121 "cmmap.re"
 	{ RET(AUTO); }
-#line 4248 "<stdout>"
+#line 4151 "<stdout>"
 yy339:
 	++YYCURSOR;
-	goto yy340;
-yy340:
 #line 172 "cmmap.re"
 	{ RET(DIVEQ); }
-#line 4255 "<stdout>"
+#line 4156 "<stdout>"
 yy341:
 	++YYCURSOR;
-	goto yy342;
-yy342:
 #line 119 "cmmap.re"
 	{ goto comment; }
-#line 4262 "<stdout>"
+#line 4161 "<stdout>"
 }
 #line 228 "cmmap.re"
 
 
 comment:
 
-#line 4269 "<stdout>"
+#line 4168 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy343;
@@ -4475,28 +4374,24 @@ yy345:
 yy346:
 #line 239 "cmmap.re"
 	{ goto comment; }
-#line 4291 "<stdout>"
+#line 4190 "<stdout>"
 yy347:
 	++YYCURSOR;
-	goto yy348;
-yy348:
 #line 234 "cmmap.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4302 "<stdout>"
+#line 4199 "<stdout>"
 yy349:
 	yych = *++YYCURSOR;
 	goto yy346;
 yy350:
 	++YYCURSOR;
-	goto yy351;
-yy351:
 #line 232 "cmmap.re"
 	{ goto std; }
-#line 4312 "<stdout>"
+#line 4207 "<stdout>"
 }
 #line 240 "cmmap.re"
 
diff --git a/test/cnokw.c b/test/cnokw.c
index 36f75219..a2e9f3eb 100644
--- a/test/cnokw.c
+++ b/test/cnokw.c
@@ -432,81 +432,59 @@ yy35:
 #line 425 "<stdout>"
 yy36:
 	++YYCURSOR;
-	goto yy37;
-yy37:
 #line 172 "cnokw.re"
 	{ RET(';'); }
-#line 432 "<stdout>"
+#line 430 "<stdout>"
 yy38:
 	++YYCURSOR;
-	goto yy39;
-yy39:
 #line 173 "cnokw.re"
 	{ RET('{'); }
-#line 439 "<stdout>"
+#line 435 "<stdout>"
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 174 "cnokw.re"
 	{ RET('}'); }
-#line 446 "<stdout>"
+#line 440 "<stdout>"
 yy42:
 	++YYCURSOR;
-	goto yy43;
-yy43:
 #line 175 "cnokw.re"
 	{ RET(','); }
-#line 453 "<stdout>"
+#line 445 "<stdout>"
 yy44:
 	++YYCURSOR;
-	goto yy45;
-yy45:
 #line 176 "cnokw.re"
 	{ RET(':'); }
-#line 460 "<stdout>"
+#line 450 "<stdout>"
 yy46:
 	++YYCURSOR;
-	goto yy47;
-yy47:
 #line 178 "cnokw.re"
 	{ RET('('); }
-#line 467 "<stdout>"
+#line 455 "<stdout>"
 yy48:
 	++YYCURSOR;
-	goto yy49;
-yy49:
 #line 179 "cnokw.re"
 	{ RET(')'); }
-#line 474 "<stdout>"
+#line 460 "<stdout>"
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 180 "cnokw.re"
 	{ RET('['); }
-#line 481 "<stdout>"
+#line 465 "<stdout>"
 yy52:
 	++YYCURSOR;
-	goto yy53;
-yy53:
 #line 181 "cnokw.re"
 	{ RET(']'); }
-#line 488 "<stdout>"
+#line 470 "<stdout>"
 yy54:
 	++YYCURSOR;
-	goto yy55;
-yy55:
 #line 185 "cnokw.re"
 	{ RET('~'); }
-#line 495 "<stdout>"
+#line 475 "<stdout>"
 yy56:
 	++YYCURSOR;
-	goto yy57;
-yy57:
 #line 195 "cnokw.re"
 	{ RET('?'); }
-#line 502 "<stdout>"
+#line 480 "<stdout>"
 yy58:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -514,18 +492,16 @@ yy58:
 yy59:
 #line 198 "cnokw.re"
 	{ goto std; }
-#line 510 "<stdout>"
+#line 488 "<stdout>"
 yy60:
 	++YYCURSOR;
-	goto yy61;
-yy61:
 #line 201 "cnokw.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 521 "<stdout>"
+#line 497 "<stdout>"
 yy62:
 	yych = *++YYCURSOR;
 	goto yy10;
@@ -533,7 +509,6 @@ yy63:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy64;
 yy64:
 	switch(yych){
 	case 0x09:
@@ -544,109 +519,79 @@ yy64:
 	}
 yy65:
 	++YYCURSOR;
-	goto yy66;
-yy66:
 #line 171 "cnokw.re"
 	{ RET(NEQ); }
-#line 542 "<stdout>"
+#line 515 "<stdout>"
 yy67:
 	++YYCURSOR;
-	goto yy68;
-yy68:
 #line 170 "cnokw.re"
 	{ RET(EQL); }
-#line 549 "<stdout>"
+#line 520 "<stdout>"
 yy69:
 	++YYCURSOR;
-	goto yy70;
-yy70:
 #line 167 "cnokw.re"
 	{ RET(OROR); }
-#line 556 "<stdout>"
+#line 525 "<stdout>"
 yy71:
 	++YYCURSOR;
-	goto yy72;
-yy72:
 #line 160 "cnokw.re"
 	{ RET(OREQ); }
-#line 563 "<stdout>"
+#line 530 "<stdout>"
 yy73:
 	++YYCURSOR;
-	goto yy74;
-yy74:
 #line 159 "cnokw.re"
 	{ RET(XOREQ); }
-#line 570 "<stdout>"
+#line 535 "<stdout>"
 yy75:
 	++YYCURSOR;
-	goto yy76;
-yy76:
 #line 166 "cnokw.re"
 	{ RET(ANDAND); }
-#line 577 "<stdout>"
+#line 540 "<stdout>"
 yy77:
 	++YYCURSOR;
-	goto yy78;
-yy78:
 #line 158 "cnokw.re"
 	{ RET(ANDEQ); }
-#line 584 "<stdout>"
+#line 545 "<stdout>"
 yy79:
 	++YYCURSOR;
-	goto yy80;
-yy80:
 #line 157 "cnokw.re"
 	{ RET(MODEQ); }
-#line 591 "<stdout>"
+#line 550 "<stdout>"
 yy81:
 	++YYCURSOR;
-	goto yy82;
-yy82:
 #line 155 "cnokw.re"
 	{ RET(MULEQ); }
-#line 598 "<stdout>"
+#line 555 "<stdout>"
 yy83:
 	++YYCURSOR;
-	goto yy84;
-yy84:
 #line 165 "cnokw.re"
 	{ RET(DEREF); }
-#line 605 "<stdout>"
+#line 560 "<stdout>"
 yy85:
 	++YYCURSOR;
-	goto yy86;
-yy86:
 #line 164 "cnokw.re"
 	{ RET(DECR); }
-#line 612 "<stdout>"
+#line 565 "<stdout>"
 yy87:
 	++YYCURSOR;
-	goto yy88;
-yy88:
 #line 154 "cnokw.re"
 	{ RET(SUBEQ); }
-#line 619 "<stdout>"
+#line 570 "<stdout>"
 yy89:
 	++YYCURSOR;
-	goto yy90;
-yy90:
 #line 163 "cnokw.re"
 	{ RET(INCR); }
-#line 626 "<stdout>"
+#line 575 "<stdout>"
 yy91:
 	++YYCURSOR;
-	goto yy92;
-yy92:
 #line 153 "cnokw.re"
 	{ RET(ADDEQ); }
-#line 633 "<stdout>"
+#line 580 "<stdout>"
 yy93:
 	++YYCURSOR;
-	goto yy94;
-yy94:
 #line 168 "cnokw.re"
 	{ RET(LEQ); }
-#line 640 "<stdout>"
+#line 585 "<stdout>"
 yy95:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -656,21 +601,17 @@ yy95:
 yy96:
 #line 162 "cnokw.re"
 	{ RET(LSHIFT); }
-#line 650 "<stdout>"
+#line 595 "<stdout>"
 yy97:
 	++YYCURSOR;
-	goto yy98;
-yy98:
 #line 152 "cnokw.re"
 	{ RET(LSHIFTEQ); }
-#line 657 "<stdout>"
+#line 600 "<stdout>"
 yy99:
 	++YYCURSOR;
-	goto yy100;
-yy100:
 #line 169 "cnokw.re"
 	{ RET(GEQ); }
-#line 664 "<stdout>"
+#line 605 "<stdout>"
 yy101:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -680,19 +621,16 @@ yy101:
 yy102:
 #line 161 "cnokw.re"
 	{ RET(RSHIFT); }
-#line 674 "<stdout>"
+#line 615 "<stdout>"
 yy103:
 	++YYCURSOR;
-	goto yy104;
-yy104:
 #line 151 "cnokw.re"
 	{ RET(RSHIFTEQ); }
-#line 681 "<stdout>"
+#line 620 "<stdout>"
 yy105:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy106;
 yy106:
 	switch(yych){
 	case 0x0A:	goto yy107;
@@ -737,11 +675,9 @@ yy108:
 	}
 yy109:
 	++YYCURSOR;
-	goto yy110;
-yy110:
 #line 148 "cnokw.re"
 	{ RET(SCON); }
-#line 726 "<stdout>"
+#line 662 "<stdout>"
 yy111:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -775,8 +711,6 @@ yy112:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy113;
-yy113:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '"':	goto yy109;
@@ -795,8 +729,6 @@ yy114:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy115;
-yy115:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '"':	goto yy109;
@@ -836,8 +768,6 @@ yy117:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy118;
-yy118:
 	switch(yych){
 	case '0':
 	case '1':
@@ -860,7 +790,7 @@ yy118:
 yy119:
 #line 145 "cnokw.re"
 	{ RET(FCON); }
-#line 837 "<stdout>"
+#line 767 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -900,8 +830,6 @@ yy123:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy124;
-yy124:
 	switch(yych){
 	case '0':
 	case '1':
@@ -921,16 +849,13 @@ yy124:
 	}
 yy125:
 	++YYCURSOR;
-	goto yy126;
-yy126:
 #line 150 "cnokw.re"
 	{ RET(ELLIPSIS); }
-#line 898 "<stdout>"
+#line 824 "<stdout>"
 yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy128;
 yy128:
 	switch(yych){
 	case 0x0A:	goto yy107;
@@ -1001,8 +926,6 @@ yy132:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '\'':	goto yy130;
@@ -1021,8 +944,6 @@ yy134:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy135;
-yy135:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '\'':	goto yy130;
@@ -1064,7 +985,6 @@ yy137:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy138;
 yy138:
 	switch(yych){
 	case '.':	goto yy136;
@@ -1107,8 +1027,6 @@ yy140:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy141;
-yy141:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1135,8 +1053,6 @@ yy143:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy144;
-yy144:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1159,7 +1075,6 @@ yy145:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy146;
 yy146:
 	switch(yych){
 	case '0':
@@ -1216,8 +1131,6 @@ yy149:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy150;
-yy150:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1271,8 +1184,6 @@ yy153:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy154;
-yy154:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1295,7 +1206,6 @@ yy155:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy156;
 yy156:
 	switch(yych){
 	case '.':	goto yy136;
@@ -1348,8 +1258,6 @@ yy158:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy159;
-yy159:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1383,8 +1291,6 @@ yy160:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy161;
-yy161:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1396,8 +1302,6 @@ yy162:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy163;
-yy163:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1409,7 +1313,6 @@ yy164:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy165;
 yy165:
 	switch(yych){
 	case '0':
@@ -1479,25 +1382,21 @@ yy165:
 	}
 yy166:
 	++YYCURSOR;
-	goto yy167;
-yy167:
 #line 156 "cnokw.re"
 	{ RET(DIVEQ); }
-#line 1399 "<stdout>"
+#line 1300 "<stdout>"
 yy168:
 	++YYCURSOR;
-	goto yy169;
-yy169:
 #line 136 "cnokw.re"
 	{ goto comment; }
-#line 1406 "<stdout>"
+#line 1305 "<stdout>"
 }
 #line 212 "cnokw.re"
 
 
 comment:
 
-#line 1413 "<stdout>"
+#line 1312 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy170;
@@ -1519,28 +1418,24 @@ yy172:
 yy173:
 #line 223 "cnokw.re"
 	{ goto comment; }
-#line 1435 "<stdout>"
+#line 1334 "<stdout>"
 yy174:
 	++YYCURSOR;
-	goto yy175;
-yy175:
 #line 218 "cnokw.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 1446 "<stdout>"
+#line 1343 "<stdout>"
 yy176:
 	yych = *++YYCURSOR;
 	goto yy173;
 yy177:
 	++YYCURSOR;
-	goto yy178;
-yy178:
 #line 216 "cnokw.re"
 	{ goto std; }
-#line 1456 "<stdout>"
+#line 1351 "<stdout>"
 }
 #line 224 "cnokw.re"
 
diff --git a/test/config1.c b/test/config1.c
index f77867e6..02ade0c4 100755
--- a/test/config1.c
+++ b/test/config1.c
@@ -42,16 +42,13 @@ yy3:
 #line 43 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 14 "config1.re"
 	{ return NULL; }
-#line 50 "<stdout>"
+#line 48 "<stdout>"
 yy6:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy7;
 yy7:
 	switch(yych){
 	case '0':
@@ -75,7 +72,7 @@ char *scan1(char *p)
 {
 	char *q;
 
-#line 79 "<stdout>"
+#line 76 "<stdout>"
 	{
 		YYCTYPE yych;
 		goto yy8;
@@ -103,19 +100,16 @@ yy10:
 yy11:
 #line 23 "config1.re"
 		{ return YYCURSOR; }
-#line 107 "<stdout>"
+#line 104 "<stdout>"
 yy12:
 		++YYCURSOR;
-		goto yy13;
-yy13:
 #line 24 "config1.re"
 		{ return NULL; }
-#line 114 "<stdout>"
+#line 109 "<stdout>"
 yy14:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy15;
 yy15:
 		switch(yych){
 		case '0':
@@ -139,7 +133,7 @@ char *scan(char *p)
 {
 	char *q;
 
-#line 143 "<stdout>"
+#line 137 "<stdout>"
 	{
 		YYCTYPE yych;
 		goto yy16;
@@ -167,19 +161,16 @@ yy18:
 yy19:
 #line 32 "config1.re"
 		{ return YYCURSOR; }
-#line 171 "<stdout>"
+#line 165 "<stdout>"
 yy20:
 		++YYCURSOR;
-		goto yy21;
-yy21:
 #line 33 "config1.re"
 		{ return NULL; }
-#line 178 "<stdout>"
+#line 170 "<stdout>"
 yy22:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy23;
 yy23:
 		switch(yych){
 		case '0':
diff --git a/test/config2.s.c b/test/config2.s.c
index a871b52e..8d61bcc3 100755
--- a/test/config2.s.c
+++ b/test/config2.s.c
@@ -22,47 +22,35 @@ yy0:
    if(yych <= 'b') {
       if(yych <= '`') goto yy10;
       if(yych >= 'b') goto yy4;
-      goto yy2;
    } else {
       if(yych <= 'c') goto yy6;
       if(yych <= 'd') goto yy8;
       goto yy10;
    }
-yy2:
    ++YYCURSOR;
-   goto yy3;
-yy3:
 #line 13 "config2.s.re"
    { return YYCURSOR; }
-#line 38 "<stdout>"
+#line 34 "<stdout>"
 yy4:
    ++YYCURSOR;
-   goto yy5;
-yy5:
 #line 14 "config2.s.re"
    { return YYCURSOR; }
-#line 45 "<stdout>"
+#line 39 "<stdout>"
 yy6:
    ++YYCURSOR;
-   goto yy7;
-yy7:
 #line 15 "config2.s.re"
    { return YYCURSOR; }
-#line 52 "<stdout>"
+#line 44 "<stdout>"
 yy8:
    ++YYCURSOR;
-   goto yy9;
-yy9:
 #line 16 "config2.s.re"
    { return YYCURSOR; }
-#line 59 "<stdout>"
+#line 49 "<stdout>"
 yy10:
    ++YYCURSOR;
-   goto yy11;
-yy11:
 #line 17 "config2.s.re"
    { return NULL; }
-#line 66 "<stdout>"
+#line 54 "<stdout>"
 }
 #line 18 "config2.s.re"
 
@@ -72,7 +60,7 @@ char *scan1(char *p)
 {
 	char *q;
 
-#line 76 "<stdout>"
+#line 64 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy12;
@@ -83,47 +71,35 @@ yy12:
 	if(yych <= 'b') {
 		if(yych <= '`') goto yy22;
 		if(yych >= 'b') goto yy16;
-		goto yy14;
 	} else {
 		if(yych <= 'c') goto yy18;
 		if(yych <= 'd') goto yy20;
 		goto yy22;
 	}
-yy14:
 	++YYCURSOR;
-	goto yy15;
-yy15:
 #line 26 "config2.s.re"
 	{ return YYCURSOR; }
-#line 99 "<stdout>"
+#line 83 "<stdout>"
 yy16:
 	++YYCURSOR;
-	goto yy17;
-yy17:
 #line 27 "config2.s.re"
 	{ return YYCURSOR; }
-#line 106 "<stdout>"
+#line 88 "<stdout>"
 yy18:
 	++YYCURSOR;
-	goto yy19;
-yy19:
 #line 28 "config2.s.re"
 	{ return YYCURSOR; }
-#line 113 "<stdout>"
+#line 93 "<stdout>"
 yy20:
 	++YYCURSOR;
-	goto yy21;
-yy21:
 #line 29 "config2.s.re"
 	{ return YYCURSOR; }
-#line 120 "<stdout>"
+#line 98 "<stdout>"
 yy22:
 	++YYCURSOR;
-	goto yy23;
-yy23:
 #line 30 "config2.s.re"
 	{ return NULL; }
-#line 127 "<stdout>"
+#line 103 "<stdout>"
 }
 #line 31 "config2.s.re"
 
@@ -133,7 +109,7 @@ char *scan(char *p)
 {
 	char *q;
 
-#line 137 "<stdout>"
+#line 113 "<stdout>"
 {
 YYCTYPE yych;
 goto yy24;
@@ -144,47 +120,35 @@ yych = *YYCURSOR;
 if(yych <= 'b') {
 if(yych <= '`') goto yy34;
 if(yych >= 'b') goto yy28;
-goto yy26;
 } else {
 if(yych <= 'c') goto yy30;
 if(yych <= 'd') goto yy32;
 goto yy34;
 }
-yy26:
 ++YYCURSOR;
-goto yy27;
-yy27:
 #line 39 "config2.s.re"
 { return YYCURSOR; }
-#line 160 "<stdout>"
+#line 132 "<stdout>"
 yy28:
 ++YYCURSOR;
-goto yy29;
-yy29:
 #line 40 "config2.s.re"
 { return YYCURSOR; }
-#line 167 "<stdout>"
+#line 137 "<stdout>"
 yy30:
 ++YYCURSOR;
-goto yy31;
-yy31:
 #line 41 "config2.s.re"
 { return YYCURSOR; }
-#line 174 "<stdout>"
+#line 142 "<stdout>"
 yy32:
 ++YYCURSOR;
-goto yy33;
-yy33:
 #line 42 "config2.s.re"
 { return YYCURSOR; }
-#line 181 "<stdout>"
+#line 147 "<stdout>"
 yy34:
 ++YYCURSOR;
-goto yy35;
-yy35:
 #line 43 "config2.s.re"
 { return NULL; }
-#line 188 "<stdout>"
+#line 152 "<stdout>"
 }
 #line 44 "config2.s.re"
 
diff --git a/test/cunroll.c b/test/cunroll.c
index f6977e94..98f0c329 100644
--- a/test/cunroll.c
+++ b/test/cunroll.c
@@ -496,81 +496,59 @@ yy35:
 #line 486 "<stdout>"
 yy36:
 	++YYCURSOR;
-	goto yy37;
-yy37:
 #line 183 "cunroll.re"
 	{ RET(';'); }
-#line 493 "<stdout>"
+#line 491 "<stdout>"
 yy38:
 	++YYCURSOR;
-	goto yy39;
-yy39:
 #line 184 "cunroll.re"
 	{ RET('{'); }
-#line 500 "<stdout>"
+#line 496 "<stdout>"
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 185 "cunroll.re"
 	{ RET('}'); }
-#line 507 "<stdout>"
+#line 501 "<stdout>"
 yy42:
 	++YYCURSOR;
-	goto yy43;
-yy43:
 #line 186 "cunroll.re"
 	{ RET(','); }
-#line 514 "<stdout>"
+#line 506 "<stdout>"
 yy44:
 	++YYCURSOR;
-	goto yy45;
-yy45:
 #line 187 "cunroll.re"
 	{ RET(':'); }
-#line 521 "<stdout>"
+#line 511 "<stdout>"
 yy46:
 	++YYCURSOR;
-	goto yy47;
-yy47:
 #line 189 "cunroll.re"
 	{ RET('('); }
-#line 528 "<stdout>"
+#line 516 "<stdout>"
 yy48:
 	++YYCURSOR;
-	goto yy49;
-yy49:
 #line 190 "cunroll.re"
 	{ RET(')'); }
-#line 535 "<stdout>"
+#line 521 "<stdout>"
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 191 "cunroll.re"
 	{ RET('['); }
-#line 542 "<stdout>"
+#line 526 "<stdout>"
 yy52:
 	++YYCURSOR;
-	goto yy53;
-yy53:
 #line 192 "cunroll.re"
 	{ RET(']'); }
-#line 549 "<stdout>"
+#line 531 "<stdout>"
 yy54:
 	++YYCURSOR;
-	goto yy55;
-yy55:
 #line 196 "cunroll.re"
 	{ RET('~'); }
-#line 556 "<stdout>"
+#line 536 "<stdout>"
 yy56:
 	++YYCURSOR;
-	goto yy57;
-yy57:
 #line 206 "cunroll.re"
 	{ RET('?'); }
-#line 563 "<stdout>"
+#line 541 "<stdout>"
 yy58:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -578,18 +556,16 @@ yy58:
 yy59:
 #line 209 "cunroll.re"
 	{ goto std; }
-#line 571 "<stdout>"
+#line 549 "<stdout>"
 yy60:
 	++YYCURSOR;
-	goto yy61;
-yy61:
 #line 212 "cunroll.re"
 	{
 		if(cursor == s->eof) RET(EOI);
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 582 "<stdout>"
+#line 558 "<stdout>"
 yy62:
 	yych = *++YYCURSOR;
 	goto yy10;
@@ -597,7 +573,6 @@ yy63:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy64;
 yy64:
 	switch(yych){
 	case 0x09:
@@ -608,109 +583,79 @@ yy64:
 	}
 yy65:
 	++YYCURSOR;
-	goto yy66;
-yy66:
 #line 182 "cunroll.re"
 	{ RET(NEQ); }
-#line 603 "<stdout>"
+#line 576 "<stdout>"
 yy67:
 	++YYCURSOR;
-	goto yy68;
-yy68:
 #line 181 "cunroll.re"
 	{ RET(EQL); }
-#line 610 "<stdout>"
+#line 581 "<stdout>"
 yy69:
 	++YYCURSOR;
-	goto yy70;
-yy70:
 #line 178 "cunroll.re"
 	{ RET(OROR); }
-#line 617 "<stdout>"
+#line 586 "<stdout>"
 yy71:
 	++YYCURSOR;
-	goto yy72;
-yy72:
 #line 171 "cunroll.re"
 	{ RET(OREQ); }
-#line 624 "<stdout>"
+#line 591 "<stdout>"
 yy73:
 	++YYCURSOR;
-	goto yy74;
-yy74:
 #line 170 "cunroll.re"
 	{ RET(XOREQ); }
-#line 631 "<stdout>"
+#line 596 "<stdout>"
 yy75:
 	++YYCURSOR;
-	goto yy76;
-yy76:
 #line 177 "cunroll.re"
 	{ RET(ANDAND); }
-#line 638 "<stdout>"
+#line 601 "<stdout>"
 yy77:
 	++YYCURSOR;
-	goto yy78;
-yy78:
 #line 169 "cunroll.re"
 	{ RET(ANDEQ); }
-#line 645 "<stdout>"
+#line 606 "<stdout>"
 yy79:
 	++YYCURSOR;
-	goto yy80;
-yy80:
 #line 168 "cunroll.re"
 	{ RET(MODEQ); }
-#line 652 "<stdout>"
+#line 611 "<stdout>"
 yy81:
 	++YYCURSOR;
-	goto yy82;
-yy82:
 #line 166 "cunroll.re"
 	{ RET(MULEQ); }
-#line 659 "<stdout>"
+#line 616 "<stdout>"
 yy83:
 	++YYCURSOR;
-	goto yy84;
-yy84:
 #line 176 "cunroll.re"
 	{ RET(DEREF); }
-#line 666 "<stdout>"
+#line 621 "<stdout>"
 yy85:
 	++YYCURSOR;
-	goto yy86;
-yy86:
 #line 175 "cunroll.re"
 	{ RET(DECR); }
-#line 673 "<stdout>"
+#line 626 "<stdout>"
 yy87:
 	++YYCURSOR;
-	goto yy88;
-yy88:
 #line 165 "cunroll.re"
 	{ RET(SUBEQ); }
-#line 680 "<stdout>"
+#line 631 "<stdout>"
 yy89:
 	++YYCURSOR;
-	goto yy90;
-yy90:
 #line 174 "cunroll.re"
 	{ RET(INCR); }
-#line 687 "<stdout>"
+#line 636 "<stdout>"
 yy91:
 	++YYCURSOR;
-	goto yy92;
-yy92:
 #line 164 "cunroll.re"
 	{ RET(ADDEQ); }
-#line 694 "<stdout>"
+#line 641 "<stdout>"
 yy93:
 	++YYCURSOR;
-	goto yy94;
-yy94:
 #line 179 "cunroll.re"
 	{ RET(LEQ); }
-#line 701 "<stdout>"
+#line 646 "<stdout>"
 yy95:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -720,21 +665,17 @@ yy95:
 yy96:
 #line 173 "cunroll.re"
 	{ RET(LSHIFT); }
-#line 711 "<stdout>"
+#line 656 "<stdout>"
 yy97:
 	++YYCURSOR;
-	goto yy98;
-yy98:
 #line 163 "cunroll.re"
 	{ RET(LSHIFTEQ); }
-#line 718 "<stdout>"
+#line 661 "<stdout>"
 yy99:
 	++YYCURSOR;
-	goto yy100;
-yy100:
 #line 180 "cunroll.re"
 	{ RET(GEQ); }
-#line 725 "<stdout>"
+#line 666 "<stdout>"
 yy101:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -744,19 +685,16 @@ yy101:
 yy102:
 #line 172 "cunroll.re"
 	{ RET(RSHIFT); }
-#line 735 "<stdout>"
+#line 676 "<stdout>"
 yy103:
 	++YYCURSOR;
-	goto yy104;
-yy104:
 #line 162 "cunroll.re"
 	{ RET(RSHIFTEQ); }
-#line 742 "<stdout>"
+#line 681 "<stdout>"
 yy105:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy106;
 yy106:
 	switch(yych){
 	case 0x0A:	goto yy107;
@@ -801,11 +739,9 @@ yy108:
 	}
 yy109:
 	++YYCURSOR;
-	goto yy110;
-yy110:
 #line 159 "cunroll.re"
 	{ RET(SCON); }
-#line 787 "<stdout>"
+#line 723 "<stdout>"
 yy111:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
@@ -839,8 +775,6 @@ yy112:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy113;
-yy113:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '"':	goto yy109;
@@ -859,8 +793,6 @@ yy114:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy115;
-yy115:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '"':	goto yy109;
@@ -900,8 +832,6 @@ yy117:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy118;
-yy118:
 	switch(yych){
 	case '0':
 	case '1':
@@ -924,7 +854,7 @@ yy118:
 yy119:
 #line 156 "cunroll.re"
 	{ RET(FCON); }
-#line 898 "<stdout>"
+#line 828 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -964,8 +894,6 @@ yy123:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy124;
-yy124:
 	switch(yych){
 	case '0':
 	case '1':
@@ -985,16 +913,13 @@ yy124:
 	}
 yy125:
 	++YYCURSOR;
-	goto yy126;
-yy126:
 #line 161 "cunroll.re"
 	{ RET(ELLIPSIS); }
-#line 959 "<stdout>"
+#line 885 "<stdout>"
 yy127:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy128;
 yy128:
 	switch(yych){
 	case 0x0A:	goto yy107;
@@ -1065,8 +990,6 @@ yy132:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy133;
-yy133:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '\'':	goto yy130;
@@ -1085,8 +1008,6 @@ yy134:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy135;
-yy135:
 	switch(yych){
 	case 0x0A:	goto yy107;
 	case '\'':	goto yy130;
@@ -1128,7 +1049,6 @@ yy137:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy138;
 yy138:
 	switch(yych){
 	case '.':	goto yy136;
@@ -1171,8 +1091,6 @@ yy140:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy141;
-yy141:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1199,8 +1117,6 @@ yy143:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy144;
-yy144:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1223,7 +1139,6 @@ yy145:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy146;
 yy146:
 	switch(yych){
 	case '0':
@@ -1280,8 +1195,6 @@ yy149:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy150;
-yy150:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1335,8 +1248,6 @@ yy153:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy154;
-yy154:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1359,7 +1270,6 @@ yy155:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy156;
 yy156:
 	switch(yych){
 	case '.':	goto yy136;
@@ -1412,8 +1322,6 @@ yy158:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy159;
-yy159:
 	switch(yych){
 	case '0':
 	case '1':
@@ -1447,8 +1355,6 @@ yy160:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy161;
-yy161:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1460,8 +1366,6 @@ yy162:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy163;
-yy163:
 	switch(yych){
 	case 'L':
 	case 'U':
@@ -1540,7 +1444,7 @@ yy164:
 yy165:
 #line 142 "cunroll.re"
 	{ RET(ID); }
-#line 1453 "<stdout>"
+#line 1357 "<stdout>"
 yy166:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1612,7 +1516,7 @@ yy166:
 yy167:
 #line 143 "cunroll.re"
 	{ RET(ID); }
-#line 1522 "<stdout>"
+#line 1426 "<stdout>"
 yy168:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1684,7 +1588,7 @@ yy168:
 yy169:
 #line 144 "cunroll.re"
 	{ RET(ID); }
-#line 1591 "<stdout>"
+#line 1495 "<stdout>"
 yy170:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1756,7 +1660,7 @@ yy170:
 yy171:
 #line 145 "cunroll.re"
 	{ RET(ID); }
-#line 1660 "<stdout>"
+#line 1564 "<stdout>"
 yy172:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1828,7 +1732,7 @@ yy172:
 yy173:
 #line 146 "cunroll.re"
 	{ RET(ID); }
-#line 1729 "<stdout>"
+#line 1633 "<stdout>"
 yy174:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1900,7 +1804,7 @@ yy174:
 yy175:
 #line 147 "cunroll.re"
 	{ RET(ID); }
-#line 1798 "<stdout>"
+#line 1702 "<stdout>"
 yy176:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1972,13 +1876,11 @@ yy176:
 yy177:
 #line 148 "cunroll.re"
 	{ RET(ID); }
-#line 1867 "<stdout>"
+#line 1771 "<stdout>"
 yy178:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy179;
-yy179:
 	switch(yych){
 	case '0':
 	case '1':
@@ -2048,28 +1950,24 @@ yy179:
 yy180:
 #line 149 "cunroll.re"
 	{ RET(ID); }
-#line 1940 "<stdout>"
+#line 1842 "<stdout>"
 yy181:
 	++YYCURSOR;
-	goto yy182;
-yy182:
 #line 167 "cunroll.re"
 	{ RET(DIVEQ); }
-#line 1947 "<stdout>"
+#line 1847 "<stdout>"
 yy183:
 	++YYCURSOR;
-	goto yy184;
-yy184:
 #line 138 "cunroll.re"
 	{ goto comment; }
-#line 1954 "<stdout>"
+#line 1852 "<stdout>"
 }
 #line 223 "cunroll.re"
 
 
 comment:
 
-#line 1961 "<stdout>"
+#line 1859 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy185;
@@ -2092,7 +1990,7 @@ yy187:
 yy188:
 #line 242 "cunroll.re"
 	{ goto comment; }
-#line 1984 "<stdout>"
+#line 1882 "<stdout>"
 yy189:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2107,7 +2005,7 @@ yy190:
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 1998 "<stdout>"
+#line 1896 "<stdout>"
 yy191:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2118,7 +2016,7 @@ yy191:
 yy192:
 #line 234 "cunroll.re"
 	{ goto comment; }
-#line 2008 "<stdout>"
+#line 1906 "<stdout>"
 yy193:
 	yych = *++YYCURSOR;
 	goto yy188;
@@ -2132,7 +2030,7 @@ yy194:
 yy195:
 #line 235 "cunroll.re"
 	{ goto comment; }
-#line 2021 "<stdout>"
+#line 1919 "<stdout>"
 yy196:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2143,7 +2041,7 @@ yy196:
 yy197:
 #line 236 "cunroll.re"
 	{ goto comment; }
-#line 2031 "<stdout>"
+#line 1929 "<stdout>"
 yy198:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2154,7 +2052,7 @@ yy198:
 yy199:
 #line 237 "cunroll.re"
 	{ goto comment; }
-#line 2041 "<stdout>"
+#line 1939 "<stdout>"
 yy200:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2165,7 +2063,7 @@ yy200:
 yy201:
 #line 238 "cunroll.re"
 	{ goto comment; }
-#line 2051 "<stdout>"
+#line 1949 "<stdout>"
 yy202:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2176,7 +2074,7 @@ yy202:
 yy203:
 #line 239 "cunroll.re"
 	{ goto comment; }
-#line 2061 "<stdout>"
+#line 1959 "<stdout>"
 yy204:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2187,21 +2085,17 @@ yy204:
 yy205:
 #line 240 "cunroll.re"
 	{ goto comment; }
-#line 2071 "<stdout>"
+#line 1969 "<stdout>"
 yy206:
 	++YYCURSOR;
-	goto yy207;
-yy207:
 #line 241 "cunroll.re"
 	{ goto comment; }
-#line 2078 "<stdout>"
+#line 1974 "<stdout>"
 yy208:
 	++YYCURSOR;
-	goto yy209;
-yy209:
 #line 227 "cunroll.re"
 	{ goto std; }
-#line 2085 "<stdout>"
+#line 1979 "<stdout>"
 }
 #line 243 "cunroll.re"
 
diff --git a/test/cvsignore.b.c b/test/cvsignore.b.c
index 1d05994d..b98b4777 100755
--- a/test/cvsignore.b.c
+++ b/test/cvsignore.b.c
@@ -84,8 +84,6 @@ yy0:
 		if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 		yych = *YYCURSOR;
 		if(yych != '$') goto yy4;
-		goto yy2;
-yy2:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		switch(yych){
@@ -99,14 +97,13 @@ yy2:
 yy3:
 #line 53 "cvsignore.b.re"
 		{ output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; }
-#line 103 "<stdout>"
+#line 101 "<stdout>"
 yy4:
 		yych = *++YYCURSOR;
 		goto yy3;
 yy5:
 		yych = *++YYCURSOR;
 		if(yych == 'o') goto yy44;
-		goto yy6;
 yy6:
 		YYCURSOR = YYMARKER;
 		switch(yyaccept){
@@ -127,36 +124,25 @@ yy9:
 yy10:
 		yych = *++YYCURSOR;
 		if(yych != 'a') goto yy6;
-		goto yy11;
-yy11:
 		yych = *++YYCURSOR;
 		if(yych != 't') goto yy6;
-		goto yy12;
-yy12:
 		yych = *++YYCURSOR;
 		if(yych != 'e') goto yy6;
-		goto yy13;
-yy13:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy15;
 		if(yych != ':') goto yy6;
-		goto yy14;
-yy14:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy18;
 yy15:
 		++YYCURSOR;
-		goto yy16;
-yy16:
 #line 48 "cvsignore.b.re"
 		{ APPEND(L"$" L"Date$"); goto loop; }
-#line 155 "<stdout>"
+#line 142 "<stdout>"
 yy17:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy18;
 yy18:
 		if(yybm[0+yych] & 128) {
 			goto yy17;
@@ -167,23 +153,18 @@ yy19:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy21;
 		if(yych != ':') goto yy6;
-		goto yy20;
-yy20:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy24;
 yy21:
 		++YYCURSOR;
-		goto yy22;
-yy22:
 #line 49 "cvsignore.b.re"
 		{ APPEND(L"$" L"Id$"); goto loop; }
-#line 182 "<stdout>"
+#line 164 "<stdout>"
 yy23:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy24;
 yy24:
 		if(yych == 0x0A) goto yy6;
 		if(yych == '$') goto yy21;
@@ -191,28 +172,21 @@ yy24:
 yy25:
 		yych = *++YYCURSOR;
 		if(yych != 'g') goto yy6;
-		goto yy26;
-yy26:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy28;
 		if(yych != ':') goto yy6;
-		goto yy27;
-yy27:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy31;
 yy28:
 		++YYCURSOR;
-		goto yy29;
-yy29:
 #line 50 "cvsignore.b.re"
 		{ APPEND(L"$" L"Log$"); goto loop; }
-#line 211 "<stdout>"
+#line 186 "<stdout>"
 yy30:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy31;
 yy31:
 		if(yych == 0x0A) goto yy6;
 		if(yych == '$') goto yy28;
@@ -220,48 +194,31 @@ yy31:
 yy32:
 		yych = *++YYCURSOR;
 		if(yych != 'v') goto yy6;
-		goto yy33;
-yy33:
 		yych = *++YYCURSOR;
 		if(yych != 'i') goto yy6;
-		goto yy34;
-yy34:
 		yych = *++YYCURSOR;
 		if(yych != 's') goto yy6;
-		goto yy35;
-yy35:
 		yych = *++YYCURSOR;
 		if(yych != 'i') goto yy6;
-		goto yy36;
-yy36:
 		yych = *++YYCURSOR;
 		if(yych != 'o') goto yy6;
-		goto yy37;
-yy37:
 		yych = *++YYCURSOR;
 		if(yych != 'n') goto yy6;
-		goto yy38;
-yy38:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy40;
 		if(yych != ':') goto yy6;
-		goto yy39;
-yy39:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy43;
 yy40:
 		++YYCURSOR;
-		goto yy41;
-yy41:
 #line 51 "cvsignore.b.re"
 		{ APPEND(L"$" L"Revision$"); goto loop; }
-#line 260 "<stdout>"
+#line 218 "<stdout>"
 yy42:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy43;
 yy43:
 		if(yych == 0x0A) goto yy6;
 		if(yych == '$') goto yy40;
@@ -269,40 +226,27 @@ yy43:
 yy44:
 		yych = *++YYCURSOR;
 		if(yych != 'u') goto yy6;
-		goto yy45;
-yy45:
 		yych = *++YYCURSOR;
 		if(yych != 'r') goto yy6;
-		goto yy46;
-yy46:
 		yych = *++YYCURSOR;
 		if(yych != 'c') goto yy6;
-		goto yy47;
-yy47:
 		yych = *++YYCURSOR;
 		if(yych != 'e') goto yy6;
-		goto yy48;
-yy48:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy50;
 		if(yych != ':') goto yy6;
-		goto yy49;
-yy49:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy53;
 yy50:
 		++YYCURSOR;
-		goto yy51;
-yy51:
 #line 52 "cvsignore.b.re"
 		{ APPEND(L"$" L"Source$"); goto loop; }
-#line 301 "<stdout>"
+#line 246 "<stdout>"
 yy52:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy53;
 yy53:
 		if(yych == 0x0A) goto yy6;
 		if(yych == '$') goto yy50;
diff --git a/test/cvsignore.c b/test/cvsignore.c
index 6897a1a8..1e9cd2f7 100755
--- a/test/cvsignore.c
+++ b/test/cvsignore.c
@@ -132,16 +132,13 @@ yy14:
 	}
 yy15:
 	++YYCURSOR;
-	goto yy16;
-yy16:
 #line 48 "cvsignore.re"
 	{ APPEND(L"$" L"Date$"); goto loop; }
-#line 140 "<stdout>"
+#line 138 "<stdout>"
 yy17:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy18;
 yy18:
 	switch(yych){
 	case 0x0A:	goto yy6;
@@ -163,16 +160,13 @@ yy20:
 	}
 yy21:
 	++YYCURSOR;
-	goto yy22;
-yy22:
 #line 49 "cvsignore.re"
 	{ APPEND(L"$" L"Id$"); goto loop; }
-#line 171 "<stdout>"
+#line 166 "<stdout>"
 yy23:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy24;
 yy24:
 	switch(yych){
 	case 0x0A:	goto yy6;
@@ -200,16 +194,13 @@ yy27:
 	}
 yy28:
 	++YYCURSOR;
-	goto yy29;
-yy29:
 #line 50 "cvsignore.re"
 	{ APPEND(L"$" L"Log$"); goto loop; }
-#line 208 "<stdout>"
+#line 200 "<stdout>"
 yy30:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy31;
 yy31:
 	switch(yych){
 	case 0x0A:	goto yy6;
@@ -267,16 +258,13 @@ yy39:
 	}
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 51 "cvsignore.re"
 	{ APPEND(L"$" L"Revision$"); goto loop; }
-#line 275 "<stdout>"
+#line 264 "<stdout>"
 yy42:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy43;
 yy43:
 	switch(yych){
 	case 0x0A:	goto yy6;
@@ -322,16 +310,13 @@ yy49:
 	}
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 52 "cvsignore.re"
 	{ APPEND(L"$" L"Source$"); goto loop; }
-#line 330 "<stdout>"
+#line 316 "<stdout>"
 yy52:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy53;
 yy53:
 	switch(yych){
 	case 0x0A:	goto yy6;
diff --git a/test/cvsignore.s.c b/test/cvsignore.s.c
index cf7a78bf..eb0d3d4e 100755
--- a/test/cvsignore.s.c
+++ b/test/cvsignore.s.c
@@ -49,8 +49,6 @@ yy0:
 	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 	yych = *YYCURSOR;
 	if(yych != '$') goto yy4;
-	goto yy2;
-yy2:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
@@ -64,14 +62,13 @@ yy2:
 yy3:
 #line 53 "cvsignore.s.re"
 	{ output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; }
-#line 68 "<stdout>"
+#line 66 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy3;
 yy5:
 	yych = *++YYCURSOR;
 	if(yych == 'o') goto yy44;
-	goto yy6;
 yy6:
 	YYCURSOR = YYMARKER;
 	switch(yyaccept){
@@ -92,36 +89,25 @@ yy9:
 yy10:
 	yych = *++YYCURSOR;
 	if(yych != 'a') goto yy6;
-	goto yy11;
-yy11:
 	yych = *++YYCURSOR;
 	if(yych != 't') goto yy6;
-	goto yy12;
-yy12:
 	yych = *++YYCURSOR;
 	if(yych != 'e') goto yy6;
-	goto yy13;
-yy13:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy15;
 	if(yych != ':') goto yy6;
-	goto yy14;
-yy14:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy18;
 yy15:
 	++YYCURSOR;
-	goto yy16;
-yy16:
 #line 48 "cvsignore.s.re"
 	{ APPEND(L"$" L"Date$"); goto loop; }
-#line 120 "<stdout>"
+#line 107 "<stdout>"
 yy17:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy18;
 yy18:
 	if(yych == 0x0A) goto yy6;
 	if(yych == '$') goto yy15;
@@ -130,23 +116,18 @@ yy19:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy21;
 	if(yych != ':') goto yy6;
-	goto yy20;
-yy20:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy24;
 yy21:
 	++YYCURSOR;
-	goto yy22;
-yy22:
 #line 49 "cvsignore.s.re"
 	{ APPEND(L"$" L"Id$"); goto loop; }
-#line 145 "<stdout>"
+#line 127 "<stdout>"
 yy23:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy24;
 yy24:
 	if(yych == 0x0A) goto yy6;
 	if(yych == '$') goto yy21;
@@ -154,28 +135,21 @@ yy24:
 yy25:
 	yych = *++YYCURSOR;
 	if(yych != 'g') goto yy6;
-	goto yy26;
-yy26:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy28;
 	if(yych != ':') goto yy6;
-	goto yy27;
-yy27:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy31;
 yy28:
 	++YYCURSOR;
-	goto yy29;
-yy29:
 #line 50 "cvsignore.s.re"
 	{ APPEND(L"$" L"Log$"); goto loop; }
-#line 174 "<stdout>"
+#line 149 "<stdout>"
 yy30:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy31;
 yy31:
 	if(yych == 0x0A) goto yy6;
 	if(yych == '$') goto yy28;
@@ -183,48 +157,31 @@ yy31:
 yy32:
 	yych = *++YYCURSOR;
 	if(yych != 'v') goto yy6;
-	goto yy33;
-yy33:
 	yych = *++YYCURSOR;
 	if(yych != 'i') goto yy6;
-	goto yy34;
-yy34:
 	yych = *++YYCURSOR;
 	if(yych != 's') goto yy6;
-	goto yy35;
-yy35:
 	yych = *++YYCURSOR;
 	if(yych != 'i') goto yy6;
-	goto yy36;
-yy36:
 	yych = *++YYCURSOR;
 	if(yych != 'o') goto yy6;
-	goto yy37;
-yy37:
 	yych = *++YYCURSOR;
 	if(yych != 'n') goto yy6;
-	goto yy38;
-yy38:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy40;
 	if(yych != ':') goto yy6;
-	goto yy39;
-yy39:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy43;
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 51 "cvsignore.s.re"
 	{ APPEND(L"$" L"Revision$"); goto loop; }
-#line 223 "<stdout>"
+#line 181 "<stdout>"
 yy42:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy43;
 yy43:
 	if(yych == 0x0A) goto yy6;
 	if(yych == '$') goto yy40;
@@ -232,40 +189,27 @@ yy43:
 yy44:
 	yych = *++YYCURSOR;
 	if(yych != 'u') goto yy6;
-	goto yy45;
-yy45:
 	yych = *++YYCURSOR;
 	if(yych != 'r') goto yy6;
-	goto yy46;
-yy46:
 	yych = *++YYCURSOR;
 	if(yych != 'c') goto yy6;
-	goto yy47;
-yy47:
 	yych = *++YYCURSOR;
 	if(yych != 'e') goto yy6;
-	goto yy48;
-yy48:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy50;
 	if(yych != ':') goto yy6;
-	goto yy49;
-yy49:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy53;
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 52 "cvsignore.s.re"
 	{ APPEND(L"$" L"Source$"); goto loop; }
-#line 264 "<stdout>"
+#line 209 "<stdout>"
 yy52:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy53;
 yy53:
 	if(yych == 0x0A) goto yy6;
 	if(yych == '$') goto yy50;
diff --git a/test/cvsignore.w.c b/test/cvsignore.w.c
index 87a70202..a7eb6034 100755
--- a/test/cvsignore.w.c
+++ b/test/cvsignore.w.c
@@ -49,8 +49,6 @@ yy0:
 	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 	yych = *YYCURSOR;
 	if(yych != '$') goto yy4;
-	goto yy2;
-yy2:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	switch(yych){
@@ -64,14 +62,13 @@ yy2:
 yy3:
 #line 53 "cvsignore.w.re"
 	{ output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; }
-#line 68 "<stdout>"
+#line 66 "<stdout>"
 yy4:
 	yych = *++YYCURSOR;
 	goto yy3;
 yy5:
 	yych = *++YYCURSOR;
 	if(yych == 'o') goto yy44;
-	goto yy6;
 yy6:
 	YYCURSOR = YYMARKER;
 	switch(yyaccept){
@@ -92,36 +89,25 @@ yy9:
 yy10:
 	yych = *++YYCURSOR;
 	if(yych != 'a') goto yy6;
-	goto yy11;
-yy11:
 	yych = *++YYCURSOR;
 	if(yych != 't') goto yy6;
-	goto yy12;
-yy12:
 	yych = *++YYCURSOR;
 	if(yych != 'e') goto yy6;
-	goto yy13;
-yy13:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy15;
 	if(yych != ':') goto yy6;
-	goto yy14;
-yy14:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy18;
 yy15:
 	++YYCURSOR;
-	goto yy16;
-yy16:
 #line 48 "cvsignore.w.re"
 	{ APPEND(L"$" L"Date$"); goto loop; }
-#line 120 "<stdout>"
+#line 107 "<stdout>"
 yy17:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy18;
 yy18:
 	if(yych == 0x000A) goto yy6;
 	if(yych == '$') goto yy15;
@@ -130,23 +116,18 @@ yy19:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy21;
 	if(yych != ':') goto yy6;
-	goto yy20;
-yy20:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy24;
 yy21:
 	++YYCURSOR;
-	goto yy22;
-yy22:
 #line 49 "cvsignore.w.re"
 	{ APPEND(L"$" L"Id$"); goto loop; }
-#line 145 "<stdout>"
+#line 127 "<stdout>"
 yy23:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy24;
 yy24:
 	if(yych == 0x000A) goto yy6;
 	if(yych == '$') goto yy21;
@@ -154,28 +135,21 @@ yy24:
 yy25:
 	yych = *++YYCURSOR;
 	if(yych != 'g') goto yy6;
-	goto yy26;
-yy26:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy28;
 	if(yych != ':') goto yy6;
-	goto yy27;
-yy27:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy31;
 yy28:
 	++YYCURSOR;
-	goto yy29;
-yy29:
 #line 50 "cvsignore.w.re"
 	{ APPEND(L"$" L"Log$"); goto loop; }
-#line 174 "<stdout>"
+#line 149 "<stdout>"
 yy30:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy31;
 yy31:
 	if(yych == 0x000A) goto yy6;
 	if(yych == '$') goto yy28;
@@ -183,48 +157,31 @@ yy31:
 yy32:
 	yych = *++YYCURSOR;
 	if(yych != 'v') goto yy6;
-	goto yy33;
-yy33:
 	yych = *++YYCURSOR;
 	if(yych != 'i') goto yy6;
-	goto yy34;
-yy34:
 	yych = *++YYCURSOR;
 	if(yych != 's') goto yy6;
-	goto yy35;
-yy35:
 	yych = *++YYCURSOR;
 	if(yych != 'i') goto yy6;
-	goto yy36;
-yy36:
 	yych = *++YYCURSOR;
 	if(yych != 'o') goto yy6;
-	goto yy37;
-yy37:
 	yych = *++YYCURSOR;
 	if(yych != 'n') goto yy6;
-	goto yy38;
-yy38:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy40;
 	if(yych != ':') goto yy6;
-	goto yy39;
-yy39:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy43;
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 51 "cvsignore.w.re"
 	{ APPEND(L"$" L"Revision$"); goto loop; }
-#line 223 "<stdout>"
+#line 181 "<stdout>"
 yy42:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy43;
 yy43:
 	if(yych == 0x000A) goto yy6;
 	if(yych == '$') goto yy40;
@@ -232,40 +189,27 @@ yy43:
 yy44:
 	yych = *++YYCURSOR;
 	if(yych != 'u') goto yy6;
-	goto yy45;
-yy45:
 	yych = *++YYCURSOR;
 	if(yych != 'r') goto yy6;
-	goto yy46;
-yy46:
 	yych = *++YYCURSOR;
 	if(yych != 'c') goto yy6;
-	goto yy47;
-yy47:
 	yych = *++YYCURSOR;
 	if(yych != 'e') goto yy6;
-	goto yy48;
-yy48:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy50;
 	if(yych != ':') goto yy6;
-	goto yy49;
-yy49:
 	yych = *++YYCURSOR;
 	if(yych == '$') goto yy6;
 	goto yy53;
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 52 "cvsignore.w.re"
 	{ APPEND(L"$" L"Source$"); goto loop; }
-#line 264 "<stdout>"
+#line 209 "<stdout>"
 yy52:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy53;
 yy53:
 	if(yych == 0x000A) goto yy6;
 	if(yych == '$') goto yy50;
diff --git a/test/cvsignore.wb.c b/test/cvsignore.wb.c
index cf58f563..fa41e063 100755
--- a/test/cvsignore.wb.c
+++ b/test/cvsignore.wb.c
@@ -84,8 +84,6 @@ yy0:
 		if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 		yych = *YYCURSOR;
 		if(yych != '$') goto yy4;
-		goto yy2;
-yy2:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		switch(yych){
@@ -99,14 +97,13 @@ yy2:
 yy3:
 #line 53 "cvsignore.wb.re"
 		{ output[outsize++] = cursor[-1]; if (cursor >= limit) break; goto loop; }
-#line 103 "<stdout>"
+#line 101 "<stdout>"
 yy4:
 		yych = *++YYCURSOR;
 		goto yy3;
 yy5:
 		yych = *++YYCURSOR;
 		if(yych == 'o') goto yy44;
-		goto yy6;
 yy6:
 		YYCURSOR = YYMARKER;
 		switch(yyaccept){
@@ -127,36 +124,25 @@ yy9:
 yy10:
 		yych = *++YYCURSOR;
 		if(yych != 'a') goto yy6;
-		goto yy11;
-yy11:
 		yych = *++YYCURSOR;
 		if(yych != 't') goto yy6;
-		goto yy12;
-yy12:
 		yych = *++YYCURSOR;
 		if(yych != 'e') goto yy6;
-		goto yy13;
-yy13:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy15;
 		if(yych != ':') goto yy6;
-		goto yy14;
-yy14:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy18;
 yy15:
 		++YYCURSOR;
-		goto yy16;
-yy16:
 #line 48 "cvsignore.wb.re"
 		{ APPEND(L"$" L"Date$"); goto loop; }
-#line 155 "<stdout>"
+#line 142 "<stdout>"
 yy17:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy18;
 yy18:
 		if(yyh & 0xFF00) {
 			goto yy17;
@@ -169,23 +155,18 @@ yy19:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy21;
 		if(yych != ':') goto yy6;
-		goto yy20;
-yy20:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy24;
 yy21:
 		++YYCURSOR;
-		goto yy22;
-yy22:
 #line 49 "cvsignore.wb.re"
 		{ APPEND(L"$" L"Id$"); goto loop; }
-#line 184 "<stdout>"
+#line 166 "<stdout>"
 yy23:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy24;
 yy24:
 		if(yych == 0x000A) goto yy6;
 		if(yych == '$') goto yy21;
@@ -193,28 +174,21 @@ yy24:
 yy25:
 		yych = *++YYCURSOR;
 		if(yych != 'g') goto yy6;
-		goto yy26;
-yy26:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy28;
 		if(yych != ':') goto yy6;
-		goto yy27;
-yy27:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy31;
 yy28:
 		++YYCURSOR;
-		goto yy29;
-yy29:
 #line 50 "cvsignore.wb.re"
 		{ APPEND(L"$" L"Log$"); goto loop; }
-#line 213 "<stdout>"
+#line 188 "<stdout>"
 yy30:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy31;
 yy31:
 		if(yych == 0x000A) goto yy6;
 		if(yych == '$') goto yy28;
@@ -222,48 +196,31 @@ yy31:
 yy32:
 		yych = *++YYCURSOR;
 		if(yych != 'v') goto yy6;
-		goto yy33;
-yy33:
 		yych = *++YYCURSOR;
 		if(yych != 'i') goto yy6;
-		goto yy34;
-yy34:
 		yych = *++YYCURSOR;
 		if(yych != 's') goto yy6;
-		goto yy35;
-yy35:
 		yych = *++YYCURSOR;
 		if(yych != 'i') goto yy6;
-		goto yy36;
-yy36:
 		yych = *++YYCURSOR;
 		if(yych != 'o') goto yy6;
-		goto yy37;
-yy37:
 		yych = *++YYCURSOR;
 		if(yych != 'n') goto yy6;
-		goto yy38;
-yy38:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy40;
 		if(yych != ':') goto yy6;
-		goto yy39;
-yy39:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy43;
 yy40:
 		++YYCURSOR;
-		goto yy41;
-yy41:
 #line 51 "cvsignore.wb.re"
 		{ APPEND(L"$" L"Revision$"); goto loop; }
-#line 262 "<stdout>"
+#line 220 "<stdout>"
 yy42:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy43;
 yy43:
 		if(yych == 0x000A) goto yy6;
 		if(yych == '$') goto yy40;
@@ -271,40 +228,27 @@ yy43:
 yy44:
 		yych = *++YYCURSOR;
 		if(yych != 'u') goto yy6;
-		goto yy45;
-yy45:
 		yych = *++YYCURSOR;
 		if(yych != 'r') goto yy6;
-		goto yy46;
-yy46:
 		yych = *++YYCURSOR;
 		if(yych != 'c') goto yy6;
-		goto yy47;
-yy47:
 		yych = *++YYCURSOR;
 		if(yych != 'e') goto yy6;
-		goto yy48;
-yy48:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy50;
 		if(yych != ':') goto yy6;
-		goto yy49;
-yy49:
 		yych = *++YYCURSOR;
 		if(yych == '$') goto yy6;
 		goto yy53;
 yy50:
 		++YYCURSOR;
-		goto yy51;
-yy51:
 #line 52 "cvsignore.wb.re"
 		{ APPEND(L"$" L"Source$"); goto loop; }
-#line 303 "<stdout>"
+#line 248 "<stdout>"
 yy52:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy53;
 yy53:
 		if(yych == 0x000A) goto yy6;
 		if(yych == '$') goto yy50;
diff --git a/test/error3.c b/test/error3.c
index 340a96ed..3f78a0de 100755
--- a/test/error3.c
+++ b/test/error3.c
@@ -30,18 +30,14 @@ yy0:
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 18 "error3.re"
 	{RET(1);}
-#line 37 "<stdout>"
+#line 35 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 19 "error3.re"
 	{RET(0);}
-#line 44 "<stdout>"
+#line 40 "<stdout>"
 }
 #line 20 "error3.re"
 
diff --git a/test/input1.c b/test/input1.c
index 0ecb8649..d3ca59a5 100644
--- a/test/input1.c
+++ b/test/input1.c
@@ -32,8 +32,6 @@ yy5:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy6;
-yy6:
 	switch(yych){
 	case 'b':	goto yy5;
 	case 'c':	goto yy8;
@@ -52,11 +50,9 @@ yy8:
 	}
 yy9:
 	++YYCURSOR;
-	goto yy10;
-yy10:
 #line 3 "input1.re"
 	{ return 1; }
-#line 60 "<stdout>"
+#line 56 "<stdout>"
 }
 #line 6 "input1.re"
 
diff --git a/test/input10.b.c b/test/input10.b.c
index 0ba255f1..ef7c4703 100755
--- a/test/input10.b.c
+++ b/test/input10.b.c
@@ -13,27 +13,21 @@ yy0:
 		if(yych <= 'E') {
 			if(yych <= '@') goto yy4;
 			if(yych >= 'E') goto yy4;
-			goto yy2;
 		} else {
 			if(yych <= 'G') goto yy2;
 			if(yych <= '`') goto yy4;
 			if(yych >= 'h') goto yy4;
-			goto yy2;
 		}
 yy2:
 		++YYCURSOR;
-		goto yy3;
-yy3:
 #line 8 "input10.b.re"
 		{ return 1; }
-#line 30 "<stdout>"
+#line 26 "<stdout>"
 yy4:
 		++YYCURSOR;
-		goto yy5;
-yy5:
 #line 10 "input10.b.re"
 		{ return -1; }
-#line 37 "<stdout>"
+#line 31 "<stdout>"
 	}
 }
 #line 12 "input10.b.re"
diff --git a/test/input10.c b/test/input10.c
index a11c97fc..ba39c38e 100755
--- a/test/input10.c
+++ b/test/input10.c
@@ -27,18 +27,14 @@ yy0:
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 8 "input10.re"
 	{ return 1; }
-#line 33 "<stdout>"
+#line 31 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 10 "input10.re"
 	{ return -1; }
-#line 40 "<stdout>"
+#line 36 "<stdout>"
 }
 #line 12 "input10.re"
 
diff --git a/test/input10.s.c b/test/input10.s.c
index f45cfcb8..bc0d562f 100755
--- a/test/input10.s.c
+++ b/test/input10.s.c
@@ -12,27 +12,21 @@ yy0:
 	if(yych <= 'E') {
 		if(yych <= '@') goto yy4;
 		if(yych >= 'E') goto yy4;
-		goto yy2;
 	} else {
 		if(yych <= 'G') goto yy2;
 		if(yych <= '`') goto yy4;
 		if(yych >= 'h') goto yy4;
-		goto yy2;
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 8 "input10.s.re"
 	{ return 1; }
-#line 29 "<stdout>"
+#line 25 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 10 "input10.s.re"
 	{ return -1; }
-#line 36 "<stdout>"
+#line 30 "<stdout>"
 }
 #line 12 "input10.s.re"
 
diff --git a/test/input11.b.c b/test/input11.b.c
index fab7ea3f..b7bb7f76 100755
--- a/test/input11.b.c
+++ b/test/input11.b.c
@@ -78,20 +78,18 @@ yy4:
 		goto yy14;
 yy5:
 		++YYCURSOR;
-		goto yy6;
 yy6:
 #line 13 "input11.b.re"
 		{ return 2; }
-#line 86 "<stdout>"
+#line 85 "<stdout>"
 yy7:
 		++YYCURSOR;
 		if((yych = *YYCURSOR) <= '0') goto yy8;
 		if(yych <= '9') goto yy11;
-		goto yy8;
 yy8:
 #line 15 "input11.b.re"
 		{ return -1; }
-#line 95 "<stdout>"
+#line 93 "<stdout>"
 yy9:
 		yych = *++YYCURSOR;
 		goto yy12;
@@ -102,7 +100,6 @@ yy11:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy12;
 yy12:
 		if(yybm[0+yych] & 0x20) {
 			goto yy11;
@@ -112,7 +109,6 @@ yy13:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy14;
 yy14:
 		if(yybm[0+yych] & 0x40) {
 			goto yy13;
@@ -121,26 +117,18 @@ yy14:
 yy15:
 		yych = *++YYCURSOR;
 		if(yych != '2') goto yy14;
-		goto yy16;
-yy16:
 		yych = *++YYCURSOR;
 		if(yych != 'c') goto yy14;
-		goto yy17;
-yy17:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if(yych != ':') goto yy14;
-		goto yy18;
-yy18:
 		yych = *++YYCURSOR;
 		if(yych <= '^') {
 			if(yych <= '@') goto yy19;
 			if(yych <= 'Z') goto yy20;
-			goto yy19;
 		} else {
 			if(yych == '`') goto yy19;
 			if(yych <= 'z') goto yy20;
-			goto yy19;
 		}
 yy19:
 		YYCURSOR = YYMARKER;
@@ -151,16 +139,12 @@ yy20:
 		++YYCURSOR;
 		if(YYLIMIT == YYCURSOR) YYFILL(1);
 		yych = *YYCURSOR;
-		goto yy21;
-yy21:
 		if(yybm[0+yych] & 0x80) {
 			goto yy20;
 		}
-		goto yy22;
-yy22:
 #line 11 "input11.b.re"
 		{ return 0; }
-#line 164 "<stdout>"
+#line 148 "<stdout>"
 	}
 }
 #line 17 "input11.b.re"
diff --git a/test/input11.c b/test/input11.c
index 72f4c553..078bce5b 100755
--- a/test/input11.c
+++ b/test/input11.c
@@ -91,11 +91,10 @@ yy4:
 	goto yy14;
 yy5:
 	++YYCURSOR;
-	goto yy6;
 yy6:
 #line 11 "input11.re"
 	{ return 2; }
-#line 97 "<stdout>"
+#line 96 "<stdout>"
 yy7:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -113,7 +112,7 @@ yy7:
 yy8:
 #line 13 "input11.re"
 	{ return -1; }
-#line 115 "<stdout>"
+#line 114 "<stdout>"
 yy9:
 	yych = *++YYCURSOR;
 	goto yy12;
@@ -124,7 +123,6 @@ yy11:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy12;
 yy12:
 	switch(yych){
 	case '0':
@@ -143,7 +141,6 @@ yy13:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy14;
 yy14:
 	switch(yych){
 	case '0':
@@ -296,8 +293,6 @@ yy20:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy21;
-yy21:
 	switch(yych){
 	case '0':
 	case '1':
@@ -368,7 +363,7 @@ yy21:
 yy22:
 #line 9 "input11.re"
 	{ return 0; }
-#line 363 "<stdout>"
+#line 358 "<stdout>"
 }
 #line 15 "input11.re"
 
diff --git a/test/input11.s.c b/test/input11.s.c
index 735621fa..400c78be 100755
--- a/test/input11.s.c
+++ b/test/input11.s.c
@@ -43,20 +43,18 @@ yy4:
 	goto yy14;
 yy5:
 	++YYCURSOR;
-	goto yy6;
 yy6:
 #line 11 "input11.s.re"
 	{ return 2; }
-#line 51 "<stdout>"
+#line 50 "<stdout>"
 yy7:
 	++YYCURSOR;
 	if((yych = *YYCURSOR) <= '0') goto yy8;
 	if(yych <= '9') goto yy11;
-	goto yy8;
 yy8:
 #line 13 "input11.s.re"
 	{ return -1; }
-#line 60 "<stdout>"
+#line 58 "<stdout>"
 yy9:
 	yych = *++YYCURSOR;
 	goto yy12;
@@ -67,7 +65,6 @@ yy11:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy12;
 yy12:
 	if(yych <= '/') goto yy6;
 	if(yych <= '9') goto yy11;
@@ -76,7 +73,6 @@ yy13:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy14;
 yy14:
 	if(yych <= '@') {
 		if(yych <= '/') goto yy3;
@@ -91,26 +87,18 @@ yy14:
 yy15:
 	yych = *++YYCURSOR;
 	if(yych != '2') goto yy14;
-	goto yy16;
-yy16:
 	yych = *++YYCURSOR;
 	if(yych != 'c') goto yy14;
-	goto yy17;
-yy17:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych != ':') goto yy14;
-	goto yy18;
-yy18:
 	yych = *++YYCURSOR;
 	if(yych <= '^') {
 		if(yych <= '@') goto yy19;
 		if(yych <= 'Z') goto yy20;
-		goto yy19;
 	} else {
 		if(yych == '`') goto yy19;
 		if(yych <= 'z') goto yy20;
-		goto yy19;
 	}
 yy19:
 	YYCURSOR = YYMARKER;
@@ -121,27 +109,22 @@ yy20:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy21;
-yy21:
 	if(yych <= 'Z') {
 		if(yych <= '/') goto yy22;
 		if(yych <= ':') goto yy20;
 		if(yych >= 'A') goto yy20;
-		goto yy22;
 	} else {
 		if(yych <= '_') {
 			if(yych >= '_') goto yy20;
-			goto yy22;
 		} else {
 			if(yych <= '`') goto yy22;
 			if(yych <= 'z') goto yy20;
-			goto yy22;
 		}
 	}
 yy22:
 #line 9 "input11.s.re"
 	{ return 0; }
-#line 145 "<stdout>"
+#line 128 "<stdout>"
 }
 #line 15 "input11.s.re"
 
diff --git a/test/input2.c b/test/input2.c
index 5790091a..45816301 100644
--- a/test/input2.c
+++ b/test/input2.c
@@ -18,8 +18,6 @@ yy3:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy4;
-yy4:
 	switch(yych){
 	case 'a':	goto yy3;
 	case 'b':	goto yy5;
@@ -33,11 +31,9 @@ yy5:
 	}
 yy6:
 	++YYCURSOR;
-	goto yy7;
-yy7:
 #line 3 "input2.re"
 	{ return 1; }
-#line 41 "<stdout>"
+#line 37 "<stdout>"
 }
 #line 5 "input2.re"
 
diff --git a/test/input3.c b/test/input3.c
index 9b316a9e..bff65997 100644
--- a/test/input3.c
+++ b/test/input3.c
@@ -18,8 +18,6 @@ yy3:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy4;
-yy4:
 	switch(yych){
 	case 'a':	goto yy3;
 	case 'b':	goto yy5;
@@ -33,11 +31,9 @@ yy5:
 	}
 yy6:
 	++YYCURSOR;
-	goto yy7;
-yy7:
 #line 3 "input3.re"
 	{ return 1; }
-#line 41 "<stdout>"
+#line 37 "<stdout>"
 }
 #line 5 "input3.re"
 
diff --git a/test/input4.c b/test/input4.c
index a737931a..bff0d00f 100755
--- a/test/input4.c
+++ b/test/input4.c
@@ -15,11 +15,9 @@ yy0:
 #line 16 "<stdout>"
 yy3:
 	++YYCURSOR;
-	goto yy4;
-yy4:
 #line 4 "input4.re"
 	{ return 1; }
-#line 23 "<stdout>"
+#line 21 "<stdout>"
 }
 #line 7 "input4.re"
 
diff --git a/test/input5.c b/test/input5.c
index 496d11e5..c7d7befe 100755
--- a/test/input5.c
+++ b/test/input5.c
@@ -15,18 +15,14 @@ yy0:
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 3 "input5.re"
 	{ return 0; }
-#line 23 "<stdout>"
+#line 21 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 4 "input5.re"
 	{ return 1; }
-#line 30 "<stdout>"
+#line 26 "<stdout>"
 }
 #line 6 "input5.re"
 
diff --git a/test/input6.c b/test/input6.c
index 985b5db8..df9cfde3 100755
--- a/test/input6.c
+++ b/test/input6.c
@@ -15,11 +15,9 @@ yy0:
 #line 16 "<stdout>"
 yy3:
 	++YYCURSOR;
-	goto yy4;
-yy4:
 #line 4 "input6.re"
 	{ return 1; }
-#line 23 "<stdout>"
+#line 21 "<stdout>"
 }
 #line 6 "input6.re"
 
diff --git a/test/input7.c b/test/input7.c
index be064c97..4a8b3b69 100755
--- a/test/input7.c
+++ b/test/input7.c
@@ -15,18 +15,14 @@ yy0:
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 5 "input7.re"
 	{ return 0; }
-#line 23 "<stdout>"
+#line 21 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 6 "input7.re"
 	{ return 1; }
-#line 30 "<stdout>"
+#line 26 "<stdout>"
 }
 #line 8 "input7.re"
 
diff --git a/test/input8.c b/test/input8.c
index 037910e5..b9cc1978 100755
--- a/test/input8.c
+++ b/test/input8.c
@@ -28,11 +28,9 @@ yy3:
 #line 29 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 7 "input8.re"
 	{ return 2; }
-#line 36 "<stdout>"
+#line 34 "<stdout>"
 yy6:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -44,7 +42,7 @@ yy6:
 yy7:
 #line 5 "input8.re"
 	{ return 0; }
-#line 48 "<stdout>"
+#line 46 "<stdout>"
 yy8:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -65,7 +63,6 @@ yy10:
 yy11:
 	yych = *++YYCURSOR;
 	if(yych >= 0x01) goto yy9;
-	goto yy12;
 yy12:
 	++YYCURSOR;
 	yych = *YYCURSOR;
diff --git a/test/input9.c b/test/input9.c
index eb34d46a..d08fe51d 100755
--- a/test/input9.c
+++ b/test/input9.c
@@ -26,46 +26,34 @@ yy0:
 	}
 yy2:
 	++YYCURSOR;
-	goto yy3;
-yy3:
 #line 5 "input9.re"
 	{ return 1; }
-#line 34 "<stdout>"
+#line 32 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 6 "input9.re"
 	{ return 2; }
-#line 41 "<stdout>"
+#line 37 "<stdout>"
 yy6:
 	++YYCURSOR;
-	goto yy7;
-yy7:
 #line 7 "input9.re"
 	{ return 3; }
-#line 48 "<stdout>"
+#line 42 "<stdout>"
 yy8:
 	++YYCURSOR;
-	goto yy9;
-yy9:
 #line 8 "input9.re"
 	{ return 4; }
-#line 55 "<stdout>"
+#line 47 "<stdout>"
 yy10:
 	++YYCURSOR;
-	goto yy11;
-yy11:
 #line 9 "input9.re"
 	{ return 5; }
-#line 62 "<stdout>"
+#line 52 "<stdout>"
 yy12:
 	++YYCURSOR;
-	goto yy13;
-yy13:
 #line 10 "input9.re"
 	{ return 6; }
-#line 69 "<stdout>"
+#line 57 "<stdout>"
 yy14:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -75,52 +63,40 @@ yy14:
 yy15:
 #line 18 "input9.re"
 	{ return 0; }
-#line 79 "<stdout>"
+#line 67 "<stdout>"
 yy16:
 	++YYCURSOR;
-	goto yy17;
-yy17:
 #line 13 "input9.re"
 	{ return 8; }
-#line 86 "<stdout>"
+#line 72 "<stdout>"
 yy18:
 	++YYCURSOR;
-	goto yy19;
-yy19:
 #line 14 "input9.re"
 	{ return 9; }
-#line 93 "<stdout>"
+#line 77 "<stdout>"
 yy20:
 	++YYCURSOR;
-	goto yy21;
-yy21:
 #line 15 "input9.re"
 	{ return 10; }
-#line 100 "<stdout>"
+#line 82 "<stdout>"
 yy22:
 	++YYCURSOR;
-	goto yy23;
-yy23:
 #line 16 "input9.re"
 	{ return 11; }
-#line 107 "<stdout>"
+#line 87 "<stdout>"
 yy24:
 	++YYCURSOR;
-	goto yy25;
-yy25:
 #line 17 "input9.re"
 	{ return 12; }
-#line 114 "<stdout>"
+#line 92 "<stdout>"
 yy26:
 	yych = *++YYCURSOR;
 	goto yy15;
 yy27:
 	++YYCURSOR;
-	goto yy28;
-yy28:
 #line 11 "input9.re"
 	{ return 7; }
-#line 124 "<stdout>"
+#line 100 "<stdout>"
 }
 #line 20 "input9.re"
 
diff --git a/test/modula.c b/test/modula.c
index 01afa70f..12e0a1c9 100644
--- a/test/modula.c
+++ b/test/modula.c
@@ -209,53 +209,39 @@ yy9:
 	}
 yy10:
 	++YYCURSOR;
-	goto yy11;
-yy11:
 #line 77 "modula.re"
 	{RETURN(7);}
-#line 213 "<stdout>"
+#line 211 "<stdout>"
 yy12:
 	++YYCURSOR;
-	goto yy13;
-yy13:
 #line 78 "modula.re"
 	{RETURN(8);}
-#line 220 "<stdout>"
+#line 216 "<stdout>"
 yy14:
 	++YYCURSOR;
-	goto yy15;
-yy15:
 #line 80 "modula.re"
 	{RETURN(10);}
-#line 227 "<stdout>"
+#line 221 "<stdout>"
 yy16:
 	++YYCURSOR;
-	goto yy17;
-yy17:
 #line 81 "modula.re"
 	{RETURN(11);}
-#line 234 "<stdout>"
+#line 226 "<stdout>"
 yy18:
 	++YYCURSOR;
-	goto yy19;
-yy19:
 #line 82 "modula.re"
 	{RETURN(12);}
-#line 241 "<stdout>"
+#line 231 "<stdout>"
 yy20:
 	++YYCURSOR;
-	goto yy21;
-yy21:
 #line 83 "modula.re"
 	{RETURN(13);}
-#line 248 "<stdout>"
+#line 236 "<stdout>"
 yy22:
 	++YYCURSOR;
-	goto yy23;
-yy23:
 #line 84 "modula.re"
 	{RETURN(14);}
-#line 255 "<stdout>"
+#line 241 "<stdout>"
 yy24:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -265,14 +251,12 @@ yy24:
 yy25:
 #line 85 "modula.re"
 	{RETURN(15);}
-#line 265 "<stdout>"
+#line 251 "<stdout>"
 yy26:
 	++YYCURSOR;
-	goto yy27;
-yy27:
 #line 87 "modula.re"
 	{RETURN(17);}
-#line 272 "<stdout>"
+#line 256 "<stdout>"
 yy28:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -282,14 +266,12 @@ yy28:
 yy29:
 #line 88 "modula.re"
 	{RETURN(18);}
-#line 282 "<stdout>"
+#line 266 "<stdout>"
 yy30:
 	++YYCURSOR;
-	goto yy31;
-yy31:
 #line 90 "modula.re"
 	{RETURN(20);}
-#line 289 "<stdout>"
+#line 271 "<stdout>"
 yy32:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -300,14 +282,12 @@ yy32:
 yy33:
 #line 91 "modula.re"
 	{RETURN(21);}
-#line 300 "<stdout>"
+#line 282 "<stdout>"
 yy34:
 	++YYCURSOR;
-	goto yy35;
-yy35:
 #line 94 "modula.re"
 	{RETURN(24);}
-#line 307 "<stdout>"
+#line 287 "<stdout>"
 yy36:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -317,56 +297,42 @@ yy36:
 yy37:
 #line 95 "modula.re"
 	{RETURN(25);}
-#line 317 "<stdout>"
+#line 297 "<stdout>"
 yy38:
 	++YYCURSOR;
-	goto yy39;
-yy39:
 #line 97 "modula.re"
 	{RETURN(27);}
-#line 324 "<stdout>"
+#line 302 "<stdout>"
 yy40:
 	++YYCURSOR;
-	goto yy41;
-yy41:
 #line 98 "modula.re"
 	{RETURN(28);}
-#line 331 "<stdout>"
+#line 307 "<stdout>"
 yy42:
 	++YYCURSOR;
-	goto yy43;
-yy43:
 #line 99 "modula.re"
 	{RETURN(29);}
-#line 338 "<stdout>"
+#line 312 "<stdout>"
 yy44:
 	++YYCURSOR;
-	goto yy45;
-yy45:
 #line 100 "modula.re"
 	{RETURN(30);}
-#line 345 "<stdout>"
+#line 317 "<stdout>"
 yy46:
 	++YYCURSOR;
-	goto yy47;
-yy47:
 #line 101 "modula.re"
 	{RETURN(31);}
-#line 352 "<stdout>"
+#line 322 "<stdout>"
 yy48:
 	++YYCURSOR;
-	goto yy49;
-yy49:
 #line 102 "modula.re"
 	{RETURN(32);}
-#line 359 "<stdout>"
+#line 327 "<stdout>"
 yy50:
 	++YYCURSOR;
-	goto yy51;
-yy51:
 #line 103 "modula.re"
 	{RETURN(33);}
-#line 366 "<stdout>"
+#line 332 "<stdout>"
 yy52:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -377,7 +343,7 @@ yy52:
 yy53:
 #line 146 "modula.re"
 	{RETURN(74);}
-#line 377 "<stdout>"
+#line 343 "<stdout>"
 yy54:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -510,18 +476,16 @@ yy73:
 yy74:
 #line 148 "modula.re"
 	{ goto std; }
-#line 510 "<stdout>"
+#line 476 "<stdout>"
 yy75:
 	++YYCURSOR;
-	goto yy76;
-yy76:
 #line 151 "modula.re"
 	{
 		if(cursor == s->eof) RETURN(0);
 		s->pos = cursor; s->line++;
 		goto std;
 	    }
-#line 521 "<stdout>"
+#line 485 "<stdout>"
 yy77:
 	yych = *++YYCURSOR;
 	goto yy8;
@@ -529,7 +493,6 @@ yy78:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy79;
 yy79:
 	switch(yych){
 	case 0x09:
@@ -540,7 +503,6 @@ yy80:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy81;
 yy81:
 	switch(yych){
 	case '0':
@@ -695,7 +657,7 @@ yy85:
 yy86:
 #line 144 "modula.re"
 	{RETURN(73);}
-#line 690 "<stdout>"
+#line 652 "<stdout>"
 yy87:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -778,7 +740,7 @@ yy89:
 yy90:
 #line 143 "modula.re"
 	{RETURN(72);}
-#line 771 "<stdout>"
+#line 733 "<stdout>"
 yy91:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -855,7 +817,7 @@ yy92:
 yy93:
 #line 142 "modula.re"
 	{RETURN(71);}
-#line 846 "<stdout>"
+#line 808 "<stdout>"
 yy94:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -944,7 +906,7 @@ yy97:
 yy98:
 #line 141 "modula.re"
 	{RETURN(70);}
-#line 933 "<stdout>"
+#line 895 "<stdout>"
 yy99:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1021,7 +983,7 @@ yy100:
 yy101:
 #line 139 "modula.re"
 	{RETURN(68);}
-#line 1008 "<stdout>"
+#line 970 "<stdout>"
 yy102:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1104,7 +1066,7 @@ yy104:
 yy105:
 #line 140 "modula.re"
 	{RETURN(69);}
-#line 1089 "<stdout>"
+#line 1051 "<stdout>"
 yy106:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1181,7 +1143,7 @@ yy107:
 yy108:
 #line 138 "modula.re"
 	{RETURN(67);}
-#line 1164 "<stdout>"
+#line 1126 "<stdout>"
 yy109:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1258,7 +1220,7 @@ yy110:
 yy111:
 #line 137 "modula.re"
 	{RETURN(66);}
-#line 1239 "<stdout>"
+#line 1201 "<stdout>"
 yy112:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1367,7 +1329,7 @@ yy118:
 yy119:
 #line 136 "modula.re"
 	{RETURN(65);}
-#line 1346 "<stdout>"
+#line 1308 "<stdout>"
 yy120:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1450,7 +1412,7 @@ yy122:
 yy123:
 #line 135 "modula.re"
 	{RETURN(64);}
-#line 1427 "<stdout>"
+#line 1389 "<stdout>"
 yy124:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1533,7 +1495,7 @@ yy126:
 yy127:
 #line 134 "modula.re"
 	{RETURN(63);}
-#line 1508 "<stdout>"
+#line 1470 "<stdout>"
 yy128:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1646,7 +1608,7 @@ yy135:
 yy136:
 #line 133 "modula.re"
 	{RETURN(62);}
-#line 1619 "<stdout>"
+#line 1581 "<stdout>"
 yy137:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1765,7 +1727,7 @@ yy145:
 yy146:
 #line 132 "modula.re"
 	{RETURN(61);}
-#line 1736 "<stdout>"
+#line 1698 "<stdout>"
 yy147:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1860,7 +1822,7 @@ yy151:
 yy152:
 #line 131 "modula.re"
 	{RETURN(60);}
-#line 1829 "<stdout>"
+#line 1791 "<stdout>"
 yy153:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1931,7 +1893,7 @@ yy153:
 yy154:
 #line 129 "modula.re"
 	{RETURN(58);}
-#line 1898 "<stdout>"
+#line 1860 "<stdout>"
 yy155:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2002,7 +1964,7 @@ yy155:
 yy156:
 #line 130 "modula.re"
 	{RETURN(59);}
-#line 1967 "<stdout>"
+#line 1929 "<stdout>"
 yy157:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2079,7 +2041,7 @@ yy158:
 yy159:
 #line 128 "modula.re"
 	{RETURN(57);}
-#line 2042 "<stdout>"
+#line 2004 "<stdout>"
 yy160:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2156,7 +2118,7 @@ yy161:
 yy162:
 #line 126 "modula.re"
 	{RETURN(55);}
-#line 2116 "<stdout>"
+#line 2078 "<stdout>"
 yy163:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2239,7 +2201,7 @@ yy165:
 yy166:
 #line 127 "modula.re"
 	{RETURN(56);}
-#line 2197 "<stdout>"
+#line 2159 "<stdout>"
 yy167:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2322,7 +2284,7 @@ yy169:
 yy170:
 #line 125 "modula.re"
 	{RETURN(54);}
-#line 2278 "<stdout>"
+#line 2240 "<stdout>"
 yy171:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2393,7 +2355,7 @@ yy171:
 yy172:
 #line 121 "modula.re"
 	{RETURN(50);}
-#line 2347 "<stdout>"
+#line 2309 "<stdout>"
 yy173:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2470,7 +2432,7 @@ yy174:
 yy175:
 #line 124 "modula.re"
 	{RETURN(53);}
-#line 2422 "<stdout>"
+#line 2384 "<stdout>"
 yy176:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2566,7 +2528,7 @@ yy180:
 yy181:
 #line 123 "modula.re"
 	{RETURN(52);}
-#line 2516 "<stdout>"
+#line 2478 "<stdout>"
 yy182:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2691,7 +2653,7 @@ yy191:
 yy192:
 #line 122 "modula.re"
 	{RETURN(51);}
-#line 2639 "<stdout>"
+#line 2601 "<stdout>"
 yy193:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2780,7 +2742,7 @@ yy196:
 yy197:
 #line 120 "modula.re"
 	{RETURN(49);}
-#line 2726 "<stdout>"
+#line 2688 "<stdout>"
 yy198:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -2851,7 +2813,7 @@ yy198:
 yy199:
 #line 119 "modula.re"
 	{RETURN(48);}
-#line 2795 "<stdout>"
+#line 2757 "<stdout>"
 yy200:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -2965,7 +2927,7 @@ yy207:
 yy208:
 #line 118 "modula.re"
 	{RETURN(47);}
-#line 2907 "<stdout>"
+#line 2869 "<stdout>"
 yy209:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3036,7 +2998,7 @@ yy209:
 yy210:
 #line 117 "modula.re"
 	{RETURN(46);}
-#line 2976 "<stdout>"
+#line 2938 "<stdout>"
 yy211:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3107,7 +3069,7 @@ yy211:
 yy212:
 #line 116 "modula.re"
 	{RETURN(45);}
-#line 3045 "<stdout>"
+#line 3007 "<stdout>"
 yy213:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3185,7 +3147,7 @@ yy214:
 yy215:
 #line 114 "modula.re"
 	{RETURN(43);}
-#line 3121 "<stdout>"
+#line 3083 "<stdout>"
 yy216:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3262,7 +3224,7 @@ yy217:
 yy218:
 #line 115 "modula.re"
 	{RETURN(44);}
-#line 3196 "<stdout>"
+#line 3158 "<stdout>"
 yy219:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3345,7 +3307,7 @@ yy221:
 yy222:
 #line 113 "modula.re"
 	{RETURN(42);}
-#line 3277 "<stdout>"
+#line 3239 "<stdout>"
 yy223:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -3416,7 +3378,7 @@ yy223:
 yy224:
 #line 112 "modula.re"
 	{RETURN(41);}
-#line 3346 "<stdout>"
+#line 3308 "<stdout>"
 yy225:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3529,7 +3491,7 @@ yy232:
 yy233:
 #line 111 "modula.re"
 	{RETURN(40);}
-#line 3457 "<stdout>"
+#line 3419 "<stdout>"
 yy234:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3624,7 +3586,7 @@ yy238:
 yy239:
 #line 110 "modula.re"
 	{RETURN(39);}
-#line 3550 "<stdout>"
+#line 3512 "<stdout>"
 yy240:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3701,7 +3663,7 @@ yy241:
 yy242:
 #line 109 "modula.re"
 	{RETURN(38);}
-#line 3625 "<stdout>"
+#line 3587 "<stdout>"
 yy243:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3778,7 +3740,7 @@ yy244:
 yy245:
 #line 108 "modula.re"
 	{RETURN(37);}
-#line 3700 "<stdout>"
+#line 3662 "<stdout>"
 yy246:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3861,7 +3823,7 @@ yy248:
 yy249:
 #line 107 "modula.re"
 	{RETURN(36);}
-#line 3781 "<stdout>"
+#line 3743 "<stdout>"
 yy250:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -3956,7 +3918,7 @@ yy254:
 yy255:
 #line 106 "modula.re"
 	{RETURN(35);}
-#line 3874 "<stdout>"
+#line 3836 "<stdout>"
 yy256:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -4027,47 +3989,36 @@ yy256:
 yy257:
 #line 105 "modula.re"
 	{RETURN(34);}
-#line 3943 "<stdout>"
+#line 3905 "<stdout>"
 yy258:
 	++YYCURSOR;
-	goto yy259;
-yy259:
 #line 96 "modula.re"
 	{RETURN(26);}
-#line 3950 "<stdout>"
+#line 3910 "<stdout>"
 yy260:
 	++YYCURSOR;
-	goto yy261;
-yy261:
 #line 93 "modula.re"
 	{RETURN(23);}
-#line 3957 "<stdout>"
+#line 3915 "<stdout>"
 yy262:
 	++YYCURSOR;
-	goto yy263;
-yy263:
 #line 92 "modula.re"
 	{RETURN(22);}
-#line 3964 "<stdout>"
+#line 3920 "<stdout>"
 yy264:
 	++YYCURSOR;
-	goto yy265;
-yy265:
 #line 89 "modula.re"
 	{RETURN(19);}
-#line 3971 "<stdout>"
+#line 3925 "<stdout>"
 yy266:
 	++YYCURSOR;
-	goto yy267;
-yy267:
 #line 86 "modula.re"
 	{RETURN(16);}
-#line 3978 "<stdout>"
+#line 3930 "<stdout>"
 yy268:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy269;
 yy269:
 	switch(yych){
 	case 0x0A:	goto yy270;
@@ -4085,16 +4036,13 @@ yy270:
 	}
 yy271:
 	++YYCURSOR;
-	goto yy272;
-yy272:
 #line 75 "modula.re"
 	{RETURN(6);}
-#line 4005 "<stdout>"
+#line 3954 "<stdout>"
 yy273:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy274;
 yy274:
 	switch(yych){
 	case 0x0A:	goto yy270;
@@ -4111,13 +4059,12 @@ yy275:
 yy276:
 #line 74 "modula.re"
 	{RETURN(5);}
-#line 4027 "<stdout>"
+#line 3975 "<stdout>"
 yy277:
 	yyaccept = 0;
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy278;
 yy278:
 	switch(yych){
 	case '.':	goto yy275;
@@ -4144,8 +4091,6 @@ yy279:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy280;
-yy280:
 	switch(yych){
 	case '0':
 	case '1':
@@ -4168,24 +4113,19 @@ yy280:
 	}
 yy281:
 	++YYCURSOR;
-	goto yy282;
-yy282:
 #line 73 "modula.re"
 	{RETURN(4);}
-#line 4087 "<stdout>"
+#line 4030 "<stdout>"
 yy283:
 	++YYCURSOR;
-	goto yy284;
-yy284:
 	YYCURSOR -= 2;#line 70 "modula.re"
 	{RETURN(1);}
-#line 4094 "<stdout>"
+#line 4035 "<stdout>"
 yy285:
 	yyaccept = 2;
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
-	goto yy286;
 yy286:
 	switch(yych){
 	case '0':
@@ -4237,8 +4177,6 @@ yy289:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy290;
-yy290:
 	switch(yych){
 	case '0':
 	case '1':
@@ -4257,7 +4195,6 @@ yy291:
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy292;
 yy292:
 	switch(yych){
 	case '.':	goto yy275;
@@ -4306,7 +4243,7 @@ yy293:
 yy294:
 #line 71 "modula.re"
 	{RETURN(2);}
-#line 4218 "<stdout>"
+#line 4155 "<stdout>"
 yy295:
 	yyaccept = 4;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -4333,20 +4270,18 @@ yy295:
 yy296:
 #line 72 "modula.re"
 	{RETURN(3);}
-#line 4244 "<stdout>"
+#line 4181 "<stdout>"
 yy297:
 	++YYCURSOR;
-	goto yy298;
-yy298:
 #line 67 "modula.re"
 	{ depth = 1; goto comment; }
-#line 4251 "<stdout>"
+#line 4186 "<stdout>"
 }
 #line 162 "modula.re"
 
 comment:
 
-#line 4257 "<stdout>"
+#line 4192 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy299;
@@ -4369,7 +4304,7 @@ yy301:
 yy302:
 #line 179 "modula.re"
 	{ goto comment; }
-#line 4280 "<stdout>"
+#line 4215 "<stdout>"
 yy303:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -4378,29 +4313,23 @@ yy303:
 	}
 yy304:
 	++YYCURSOR;
-	goto yy305;
-yy305:
 #line 174 "modula.re"
 	{
 		if(cursor == s->eof) RETURN(0);
 		s->tok = s->pos = cursor; s->line++;
 		goto comment;
 	    }
-#line 4297 "<stdout>"
+#line 4230 "<stdout>"
 yy306:
 	yych = *++YYCURSOR;
 	goto yy302;
 yy307:
 	++YYCURSOR;
-	goto yy308;
-yy308:
 #line 172 "modula.re"
 	{ ++depth; goto comment; }
-#line 4307 "<stdout>"
+#line 4238 "<stdout>"
 yy309:
 	++YYCURSOR;
-	goto yy310;
-yy310:
 #line 166 "modula.re"
 	{
 		if(--depth == 0)
@@ -4408,7 +4337,7 @@ yy310:
 		else
 		    goto comment;
 	    }
-#line 4319 "<stdout>"
+#line 4248 "<stdout>"
 }
 #line 180 "modula.re"
 
diff --git a/test/push.c b/test/push.c
index f1a49c59..c5553f04 100755
--- a/test/push.c
+++ b/test/push.c
@@ -379,86 +379,63 @@ yy13:
 #line 372 "<stdout>"
 yy14:
 	++YYCURSOR;
-	goto yy15;
-yy15:
 #line 249 "push.re"
 	{ SEND(kEqual);          }
-#line 379 "<stdout>"
+#line 377 "<stdout>"
 yy16:
 	++YYCURSOR;
-	goto yy17;
-yy17:
 #line 250 "push.re"
 	{ SEND(kLeftParen);      }
-#line 386 "<stdout>"
+#line 382 "<stdout>"
 yy18:
 	++YYCURSOR;
-	goto yy19;
-yy19:
 #line 251 "push.re"
 	{ SEND(kRightParen);     }
-#line 393 "<stdout>"
+#line 387 "<stdout>"
 yy20:
 	++YYCURSOR;
-	goto yy21;
-yy21:
 #line 252 "push.re"
 	{ SEND(kMinus);          }
-#line 400 "<stdout>"
+#line 392 "<stdout>"
 yy22:
 	++YYCURSOR;
-	goto yy23;
-yy23:
 #line 253 "push.re"
 	{ SEND(kPlus);           }
-#line 407 "<stdout>"
+#line 397 "<stdout>"
 yy24:
 	++YYCURSOR;
-	goto yy25;
-yy25:
 #line 254 "push.re"
 	{ SEND(kStar);           }
-#line 414 "<stdout>"
+#line 402 "<stdout>"
 yy26:
 	++YYCURSOR;
-	goto yy27;
-yy27:
 #line 255 "push.re"
 	{ SEND(kSlash);          }
-#line 421 "<stdout>"
+#line 407 "<stdout>"
 yy28:
 	++YYCURSOR;
-	goto yy29;
-yy29:
 #line 257 "push.re"
 	{ SKIP();                }
-#line 428 "<stdout>"
+#line 412 "<stdout>"
 yy30:
 	++YYCURSOR;
-	goto yy31;
-yy31:
 #line 258 "push.re"
 	{ SKIP();                }
-#line 435 "<stdout>"
+#line 417 "<stdout>"
 yy32:
 	++YYCURSOR;
-	goto yy33;
-yy33:
 #line 259 "push.re"
 	{ send(kEOF); return 1;  }
-#line 442 "<stdout>"
+#line 422 "<stdout>"
 yy34:
 	++YYCURSOR;
-	goto yy35;
-yy35:
 #line 260 "push.re"
 	{ SEND(kUnknown);        }
-#line 449 "<stdout>"
+#line 427 "<stdout>"
 yy36:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy37;
 yy37:
 	switch(yych){
 	case '0':
@@ -477,7 +454,6 @@ yy38:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy39;
 yy39:
 	switch(yych){
 	case '0':
@@ -640,7 +616,7 @@ yy44:
 yy45:
 #line 245 "push.re"
 	{ SEND(kReturn);         }
-#line 630 "<stdout>"
+#line 606 "<stdout>"
 yy46:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -730,7 +706,7 @@ yy49:
 yy50:
 #line 244 "push.re"
 	{ SEND(kWhile);          }
-#line 717 "<stdout>"
+#line 693 "<stdout>"
 yy51:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -820,7 +796,7 @@ yy54:
 yy55:
 #line 243 "push.re"
 	{ SEND(kBreak);          }
-#line 804 "<stdout>"
+#line 780 "<stdout>"
 yy56:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -904,7 +880,7 @@ yy58:
 yy59:
 #line 242 "push.re"
 	{ SEND(kGoto);           }
-#line 885 "<stdout>"
+#line 861 "<stdout>"
 yy60:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -988,7 +964,7 @@ yy62:
 yy63:
 #line 241 "push.re"
 	{ SEND(kElse);           }
-#line 966 "<stdout>"
+#line 942 "<stdout>"
 yy64:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -1066,7 +1042,7 @@ yy65:
 yy66:
 #line 240 "push.re"
 	{ SEND(kFor);            }
-#line 1041 "<stdout>"
+#line 1017 "<stdout>"
 yy67:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -1138,7 +1114,7 @@ yy67:
 yy68:
 #line 239 "push.re"
 	{ SEND(kIf);             }
-#line 1110 "<stdout>"
+#line 1086 "<stdout>"
 }
 #line 261 "push.re"
 
diff --git a/test/repeater.c b/test/repeater.c
index 1ef33071..bf6997e1 100644
--- a/test/repeater.c
+++ b/test/repeater.c
@@ -79,11 +79,9 @@ yy9:
 	}
 yy10:
 	++YYCURSOR;
-	goto yy11;
-yy11:
 #line 18 "repeater.re"
 	{RET(1);}
-#line 83 "<stdout>"
+#line 81 "<stdout>"
 yy12:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -94,11 +92,9 @@ yy12:
 	}
 yy13:
 	++YYCURSOR;
-	goto yy14;
-yy14:
 #line 19 "repeater.re"
 	{RET(2);}
-#line 97 "<stdout>"
+#line 93 "<stdout>"
 yy15:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -117,11 +113,9 @@ yy16:
 	}
 yy17:
 	++YYCURSOR;
-	goto yy18;
-yy18:
 #line 21 "repeater.re"
 	{RET(4);}
-#line 118 "<stdout>"
+#line 112 "<stdout>"
 yy19:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -130,16 +124,13 @@ yy19:
 	}
 yy20:
 	++YYCURSOR;
-	goto yy21;
-yy21:
 #line 20 "repeater.re"
 	{RET(3);}
-#line 131 "<stdout>"
+#line 123 "<stdout>"
 yy22:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy23;
 yy23:
 	switch(yych){
 	case 0x0A:	goto yy17;
diff --git a/test/sample.c b/test/sample.c
index 91890493..d23682ab 100644
--- a/test/sample.c
+++ b/test/sample.c
@@ -78,16 +78,13 @@ yy7:
 	goto yy11;
 yy8:
 	++YYCURSOR;
-	goto yy9;
-yy9:
 #line 6 "sample.re"
 	{return ERR;}
-#line 85 "<stdout>"
+#line 83 "<stdout>"
 yy10:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy11;
 yy11:
 	switch(yych){
 	case '0':
@@ -132,8 +129,6 @@ yy14:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy15;
-yy15:
 	switch(yych){
 	case '0':
 	case '1':
@@ -156,12 +151,11 @@ yy15:
 yy16:
 #line 5 "sample.re"
 	{return HEX;}
-#line 157 "<stdout>"
+#line 152 "<stdout>"
 yy17:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy18;
 yy18:
 	switch(yych){
 	case 'a':
@@ -244,7 +238,7 @@ yy22:
 yy23:
 #line 2 "sample.re"
 	{return PRINT;}
-#line 245 "<stdout>"
+#line 239 "<stdout>"
 }
 #line 7 "sample.re"
 
diff --git a/test/scanner.c b/test/scanner.c
index 8a942087..5e2fc655 100644
--- a/test/scanner.c
+++ b/test/scanner.c
@@ -102,14 +102,12 @@ yy3:
 #line 103 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 87 "scanner.re"
 	{ if(cursor == eof) RETURN(0);
 				  out.write((const char*)(tok), (const char*)(cursor) - (const char*)(tok));
 				  tok = pos = cursor; cline++;
 				  goto echo; }
-#line 113 "<stdout>"
+#line 111 "<stdout>"
 yy6:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -150,13 +148,11 @@ yy12:
 	}
 yy13:
 	++YYCURSOR;
-	goto yy14;
-yy14:
 #line 84 "scanner.re"
 	{ out.write((const char*)(tok), (const char*)(&cursor[-7]) - (const char*)(tok));
 				  tok = cursor;
 				  RETURN(1); }
-#line 160 "<stdout>"
+#line 156 "<stdout>"
 }
 #line 92 "scanner.re"
 
@@ -172,7 +168,7 @@ scan:
     tline = cline;
     tok = cursor;
 
-#line 176 "<stdout>"
+#line 172 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -274,7 +270,7 @@ yy18:
 	{ depth = 1;
 				  goto code;
 				}
-#line 271 "<stdout>"
+#line 267 "<stdout>"
 yy19:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -284,7 +280,7 @@ yy19:
 yy20:
 #line 131 "scanner.re"
 	{ RETURN(*tok); }
-#line 281 "<stdout>"
+#line 277 "<stdout>"
 yy21:
 	++YYCURSOR;
 	switch((yych = *YYCURSOR)) {
@@ -295,7 +291,7 @@ yy22:
 #line 133 "scanner.re"
 	{ yylval.op = *tok;
 				  RETURN(CLOSE); }
-#line 292 "<stdout>"
+#line 288 "<stdout>"
 yy23:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -306,7 +302,7 @@ yy23:
 yy24:
 #line 122 "scanner.re"
 	{ fatal("unterminated string constant (missing \")"); }
-#line 303 "<stdout>"
+#line 299 "<stdout>"
 yy25:
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -317,7 +313,7 @@ yy25:
 yy26:
 #line 123 "scanner.re"
 	{ fatal("unterminated string constant (missing ')"); }
-#line 314 "<stdout>"
+#line 310 "<stdout>"
 yy27:
 	yyaccept = 3;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -328,7 +324,7 @@ yy27:
 yy28:
 #line 129 "scanner.re"
 	{ fatal("unterminated range (missing ])"); }
-#line 325 "<stdout>"
+#line 321 "<stdout>"
 yy29:
 	yych = *++YYCURSOR;
 	goto yy20;
@@ -344,7 +340,7 @@ yy32:
 	{ cur = cursor;
 				  yylval.symbol = Symbol::find(token());
 				  return ID; }
-#line 341 "<stdout>"
+#line 337 "<stdout>"
 yy33:
 	++YYCURSOR;
 	yych = *YYCURSOR;
@@ -352,31 +348,26 @@ yy33:
 yy34:
 #line 152 "scanner.re"
 	{ goto scan; }
-#line 349 "<stdout>"
+#line 345 "<stdout>"
 yy35:
 	++YYCURSOR;
-	goto yy36;
-yy36:
 #line 154 "scanner.re"
 	{ if(cursor == eof) RETURN(0);
 				  pos = cursor; cline++;
 				  goto scan;
 	    			}
-#line 359 "<stdout>"
+#line 353 "<stdout>"
 yy37:
 	++YYCURSOR;
-	goto yy38;
-yy38:
 #line 159 "scanner.re"
 	{ std::cerr << "unexpected character: " << *tok << std::endl;
 				  goto scan;
 				}
-#line 368 "<stdout>"
+#line 360 "<stdout>"
 yy39:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy40;
 yy40:
 	switch(yych){
 	case 0x09:
@@ -387,7 +378,6 @@ yy41:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy42;
 yy42:
 	switch(yych){
 	case '0':
@@ -458,7 +448,6 @@ yy43:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy44;
 yy44:
 	switch(yych){
 	case 0x0A:	goto yy45;
@@ -484,18 +473,15 @@ yy46:
 	}
 yy47:
 	++YYCURSOR;
-	goto yy48;
-yy48:
 #line 125 "scanner.re"
 	{ cur = cursor;
 				  yylval.regexp = ranToRE(token());
 				  return RANGE; }
-#line 484 "<stdout>"
+#line 471 "<stdout>"
 yy49:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy50;
 yy50:
 	switch(yych){
 	case 0x0A:	goto yy45;
@@ -513,18 +499,15 @@ yy51:
 	}
 yy52:
 	++YYCURSOR;
-	goto yy53;
-yy53:
 #line 118 "scanner.re"
 	{ cur = cursor;
 				  yylval.regexp = strToCaseInsensitiveRE(token());
 				  return STRING; }
-#line 513 "<stdout>"
+#line 497 "<stdout>"
 yy54:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy55;
 yy55:
 	switch(yych){
 	case 0x0A:	goto yy45;
@@ -542,35 +525,27 @@ yy56:
 	}
 yy57:
 	++YYCURSOR;
-	goto yy58;
-yy58:
 #line 114 "scanner.re"
 	{ cur = cursor;
 				  yylval.regexp = strToRE(token());
 				  return STRING; }
-#line 542 "<stdout>"
+#line 523 "<stdout>"
 yy59:
 	++YYCURSOR;
-	goto yy60;
-yy60:
 #line 111 "scanner.re"
 	{ tok = cursor;
 				  RETURN(0); }
-#line 550 "<stdout>"
+#line 529 "<stdout>"
 yy61:
 	++YYCURSOR;
-	goto yy62;
-yy62:
 #line 108 "scanner.re"
 	{ depth = 1;
 				  goto comment; }
-#line 558 "<stdout>"
+#line 535 "<stdout>"
 yy63:
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	goto yy64;
-yy64:
 	switch(yych){
 	case ',':	goto yy67;
 	case '0':
@@ -588,13 +563,11 @@ yy64:
 	}
 yy65:
 	++YYCURSOR;
-	goto yy66;
-yy66:
 #line 136 "scanner.re"
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = atoi((char *)tok+1);
 				  RETURN(CLOSESIZE); }
-#line 588 "<stdout>"
+#line 561 "<stdout>"
 yy67:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -603,18 +576,15 @@ yy67:
 	}
 yy68:
 	++YYCURSOR;
-	goto yy69;
-yy69:
 #line 144 "scanner.re"
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = -1;
 				  RETURN(CLOSESIZE); }
-#line 603 "<stdout>"
+#line 574 "<stdout>"
 yy70:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy71;
 yy71:
 	switch(yych){
 	case '0':
@@ -632,20 +602,18 @@ yy71:
 	}
 yy72:
 	++YYCURSOR;
-	goto yy73;
-yy73:
 #line 140 "scanner.re"
 	{ yylval.extop.minsize = atoi((char *)tok+1);
 				  yylval.extop.maxsize = MAX(yylval.extop.minsize,atoi(strchr((char *)tok, ',')+1));
 				  RETURN(CLOSESIZE); }
-#line 632 "<stdout>"
+#line 600 "<stdout>"
 }
 #line 162 "scanner.re"
 
 
 code:
 
-#line 639 "<stdout>"
+#line 607 "<stdout>"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
@@ -664,8 +632,6 @@ yy74:
 	}
 yy76:
 	++YYCURSOR;
-	goto yy77;
-yy77:
 #line 166 "scanner.re"
 	{ if(--depth == 0){
 					cur = cursor;
@@ -673,32 +639,27 @@ yy77:
 					return CODE;
 				  }
 				  goto code; }
-#line 667 "<stdout>"
+#line 633 "<stdout>"
 yy78:
 	++YYCURSOR;
-	goto yy79;
-yy79:
 #line 172 "scanner.re"
 	{ ++depth;
 				  goto code; }
-#line 675 "<stdout>"
+#line 639 "<stdout>"
 yy80:
 	++YYCURSOR;
-	goto yy81;
-yy81:
 #line 174 "scanner.re"
 	{ if(cursor == eof) fatal("missing '}'");
 				  pos = cursor; cline++;
 				  goto code;
 				}
-#line 685 "<stdout>"
+#line 647 "<stdout>"
 yy82:
 	++YYCURSOR;
-	goto yy83;
 yy83:
 #line 178 "scanner.re"
 	{ goto code; }
-#line 692 "<stdout>"
+#line 653 "<stdout>"
 yy84:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
@@ -717,7 +678,6 @@ yy86:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy87;
 yy87:
 	switch(yych){
 	case 0x0A:	goto yy88;
@@ -742,7 +702,6 @@ yy90:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy91;
 yy91:
 	switch(yych){
 	case 0x0A:	goto yy88;
@@ -764,7 +723,7 @@ yy92:
 
 comment:
 
-#line 758 "<stdout>"
+#line 717 "<stdout>"
 {
 	YYCTYPE yych;
 	goto yy93;
@@ -787,7 +746,7 @@ yy95:
 yy96:
 #line 193 "scanner.re"
 	{ goto comment; }
-#line 781 "<stdout>"
+#line 740 "<stdout>"
 yy97:
 	yych = *++YYCURSOR;
 	switch(yych){
@@ -796,35 +755,29 @@ yy97:
 	}
 yy98:
 	++YYCURSOR;
-	goto yy99;
-yy99:
 #line 189 "scanner.re"
 	{ if(cursor == eof) RETURN(0);
 				  tok = pos = cursor; cline++;
 				  goto comment;
 				}
-#line 797 "<stdout>"
+#line 754 "<stdout>"
 yy100:
 	yych = *++YYCURSOR;
 	goto yy96;
 yy101:
 	++YYCURSOR;
-	goto yy102;
-yy102:
 #line 187 "scanner.re"
 	{ ++depth;
 				  goto comment; }
-#line 808 "<stdout>"
+#line 763 "<stdout>"
 yy103:
 	++YYCURSOR;
-	goto yy104;
-yy104:
 #line 183 "scanner.re"
 	{ if(--depth == 0)
 					goto scan;
 				    else
 					goto comment; }
-#line 818 "<stdout>"
+#line 771 "<stdout>"
 }
 #line 194 "scanner.re"
 
diff --git a/test/simple.c b/test/simple.c
index ff4734d5..eb87d1ea 100644
--- a/test/simple.c
+++ b/test/simple.c
@@ -40,16 +40,13 @@ yy3:
 #line 41 "<stdout>"
 yy4:
 	++YYCURSOR;
-	goto yy5;
-yy5:
 #line 11 "simple.re"
 	{return NULL;}
-#line 48 "<stdout>"
+#line 46 "<stdout>"
 yy6:
 	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	goto yy7;
 yy7:
 	switch(yych){
 	case '0':