Restoring authorship annotation for <smalov@yandex-team.ru>. Commit 2 of 2.

1 files changed, 383 insertions, 383 deletions

diff --git a/contrib/tools/ragel6/csfflat.cpp b/contrib/tools/ragel6/csfflat.cpp
index a28573332c..f504eb2606 100644
--- a/contrib/tools/ragel6/csfflat.cpp
+++ b/contrib/tools/ragel6/csfflat.cpp
@@ -1,389 +1,389 @@
-/* 
- *  Copyright 2004-2006 Adrian Thurston <thurston@complang.org> 
- *            2004 Erich Ocean <eric.ocean@ampede.com> 
- *            2005 Alan West <alan@alanz.com> 
- */ 
- 
-/*  This file is part of Ragel. 
+/*
+ *  Copyright 2004-2006 Adrian Thurston <thurston@complang.org>
+ *            2004 Erich Ocean <eric.ocean@ampede.com>
+ *            2005 Alan West <alan@alanz.com>
+ */
+
+/*  This file is part of Ragel.
+ *
+ *  Ragel is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  * 
- *  Ragel is free software; you can redistribute it and/or modify 
- *  it under the terms of the GNU General Public License as published by 
- *  the Free Software Foundation; either version 2 of the License, or 
- *  (at your option) any later version. 
- *  
- *  Ragel is distributed in the hope that it will be useful, 
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of 
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
- *  GNU General Public License for more details. 
- *  
- *  You should have received a copy of the GNU General Public License 
- *  along with Ragel; if not, write to the Free Software 
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
- */ 
- 
-#include "ragel.h" 
-#include "csfflat.h" 
-#include "redfsm.h" 
-#include "gendata.h" 
- 
-std::ostream &CSharpFFlatCodeGen::TO_STATE_ACTION( RedStateAp *state ) 
-{ 
-	int act = 0; 
-	if ( state->toStateAction != 0 ) 
-		act = state->toStateAction->actListId+1; 
-	out << act; 
-	return out; 
-} 
- 
-std::ostream &CSharpFFlatCodeGen::FROM_STATE_ACTION( RedStateAp *state ) 
-{ 
-	int act = 0; 
-	if ( state->fromStateAction != 0 ) 
-		act = state->fromStateAction->actListId+1; 
-	out << act; 
-	return out; 
-} 
- 
-std::ostream &CSharpFFlatCodeGen::EOF_ACTION( RedStateAp *state ) 
-{ 
-	int act = 0; 
-	if ( state->eofAction != 0 ) 
-		act = state->eofAction->actListId+1; 
-	out << act; 
-	return out; 
-} 
- 
-/* Write out the function for a transition. */ 
-std::ostream &CSharpFFlatCodeGen::TRANS_ACTION( RedTransAp *trans ) 
-{ 
-	int action = 0; 
-	if ( trans->action != 0 ) 
-		action = trans->action->actListId+1; 
-	out << action; 
-	return out; 
-} 
- 
-/* Write out the function switch. This switch is keyed on the values 
- * of the func index. */ 
-std::ostream &CSharpFFlatCodeGen::TO_STATE_ACTION_SWITCH() 
-{ 
-	/* Loop the actions. */ 
-	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) { 
-		if ( redAct->numToStateRefs > 0 ) { 
-			/* Write the entry label. */ 
-			out << "\tcase " << redAct->actListId+1 << ":\n"; 
- 
-			/* Write each action in the list of action items. */ 
-			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ ) 
-				ACTION( out, item->value, 0, false ); 
- 
-			out << "\tbreak;\n"; 
-		} 
-	} 
- 
-	genLineDirective( out ); 
-	return out; 
-} 
- 
-/* Write out the function switch. This switch is keyed on the values 
- * of the func index. */ 
-std::ostream &CSharpFFlatCodeGen::FROM_STATE_ACTION_SWITCH() 
-{ 
-	/* Loop the actions. */ 
-	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) { 
-		if ( redAct->numFromStateRefs > 0 ) { 
-			/* Write the entry label. */ 
-			out << "\tcase " << redAct->actListId+1 << ":\n"; 
- 
-			/* Write each action in the list of action items. */ 
-			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ ) 
-				ACTION( out, item->value, 0, false ); 
- 
-			out << "\tbreak;\n"; 
-		} 
-	} 
- 
-	genLineDirective( out ); 
-	return out; 
-} 
- 
-std::ostream &CSharpFFlatCodeGen::EOF_ACTION_SWITCH() 
-{ 
-	/* Loop the actions. */ 
-	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) { 
-		if ( redAct->numEofRefs > 0 ) { 
-			/* Write the entry label. */ 
-			out << "\tcase " << redAct->actListId+1 << ":\n"; 
- 
-			/* Write each action in the list of action items. */ 
-			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ ) 
-				ACTION( out, item->value, 0, true ); 
- 
-			out << "\tbreak;\n"; 
-		} 
-	} 
- 
-	genLineDirective( out ); 
-	return out; 
-} 
- 
-/* Write out the function switch. This switch is keyed on the values 
- * of the func index. */ 
-std::ostream &CSharpFFlatCodeGen::ACTION_SWITCH() 
-{ 
-	/* Loop the actions. */ 
-	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) { 
-		if ( redAct->numTransRefs > 0 ) { 
-			/* Write the entry label. */ 
-			out << "\tcase " << redAct->actListId+1 << ":\n"; 
- 
-			/* Write each action in the list of action items. */ 
-			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ ) 
-				ACTION( out, item->value, 0, false ); 
- 
-			out << "\tbreak;\n"; 
-		} 
-	} 
- 
-	genLineDirective( out ); 
-	return out; 
-} 
- 
-void CSharpFFlatCodeGen::writeData() 
-{ 
-	if ( redFsm->anyConditions() ) { 
-		OPEN_ARRAY( WIDE_ALPH_TYPE(), CK() ); 
-		COND_KEYS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
- 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondSpan), CSP() ); 
-		COND_KEY_SPANS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
- 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCond), C() ); 
-		CONDS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
- 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondIndexOffset), CO() ); 
-		COND_INDEX_OFFSET(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	OPEN_ARRAY( WIDE_ALPH_TYPE(), K() ); 
-	KEYS(); 
-	CLOSE_ARRAY() << 
-	"\n"; 
- 
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxSpan), SP() ); 
-	KEY_SPANS(); 
-	CLOSE_ARRAY() << 
-	"\n"; 
- 
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxFlatIndexOffset), IO() ); 
-	FLAT_INDEX_OFFSET(); 
-	CLOSE_ARRAY() << 
-	"\n"; 
- 
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex), I() ); 
-	INDICIES(); 
-	CLOSE_ARRAY() << 
-	"\n"; 
- 
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() ); 
-	TRANS_TARGS(); 
-	CLOSE_ARRAY() << 
-	"\n"; 
- 
-	if ( redFsm->anyActions() ) { 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActListId), TA() ); 
-		TRANS_ACTIONS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	if ( redFsm->anyToStateActions() ) { 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc),  TSA() ); 
-		TO_STATE_ACTIONS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	if ( redFsm->anyFromStateActions() ) { 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), FSA() ); 
-		FROM_STATE_ACTIONS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	if ( redFsm->anyEofActions() ) { 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActListId), EA() ); 
-		EOF_ACTIONS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	if ( redFsm->anyEofTrans() ) { 
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() ); 
-		EOF_TRANS(); 
-		CLOSE_ARRAY() << 
-		"\n"; 
-	} 
- 
-	STATE_IDS(); 
-} 
- 
-void CSharpFFlatCodeGen::writeExec() 
-{ 
-	testEofUsed = false; 
-	outLabelUsed = false; 
-	initVarTypes(); 
- 
-	out <<  
-		"	{\n" 
-		"	" << slenType << " _slen"; 
- 
-	if ( redFsm->anyRegCurStateRef() ) 
-		out << ", _ps"; 
-	 
-	out << ";\n"; 
-	out << "	" << transType << " _trans"; 
- 
-	if ( redFsm->anyConditions() ) 
-		out << ", _cond"; 
- 
-	out << ";\n"; 
- 
+ *  Ragel is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ * 
+ *  You should have received a copy of the GNU General Public License
+ *  along with Ragel; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+
+#include "ragel.h"
+#include "csfflat.h"
+#include "redfsm.h"
+#include "gendata.h"
+
+std::ostream &CSharpFFlatCodeGen::TO_STATE_ACTION( RedStateAp *state )
+{
+	int act = 0;
+	if ( state->toStateAction != 0 )
+		act = state->toStateAction->actListId+1;
+	out << act;
+	return out;
+}
+
+std::ostream &CSharpFFlatCodeGen::FROM_STATE_ACTION( RedStateAp *state )
+{
+	int act = 0;
+	if ( state->fromStateAction != 0 )
+		act = state->fromStateAction->actListId+1;
+	out << act;
+	return out;
+}
+
+std::ostream &CSharpFFlatCodeGen::EOF_ACTION( RedStateAp *state )
+{
+	int act = 0;
+	if ( state->eofAction != 0 )
+		act = state->eofAction->actListId+1;
+	out << act;
+	return out;
+}
+
+/* Write out the function for a transition. */
+std::ostream &CSharpFFlatCodeGen::TRANS_ACTION( RedTransAp *trans )
+{
+	int action = 0;
+	if ( trans->action != 0 )
+		action = trans->action->actListId+1;
+	out << action;
+	return out;
+}
+
+/* Write out the function switch. This switch is keyed on the values
+ * of the func index. */
+std::ostream &CSharpFFlatCodeGen::TO_STATE_ACTION_SWITCH()
+{
+	/* Loop the actions. */
+	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) {
+		if ( redAct->numToStateRefs > 0 ) {
+			/* Write the entry label. */
+			out << "\tcase " << redAct->actListId+1 << ":\n";
+
+			/* Write each action in the list of action items. */
+			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ )
+				ACTION( out, item->value, 0, false );
+
+			out << "\tbreak;\n";
+		}
+	}
+
+	genLineDirective( out );
+	return out;
+}
+
+/* Write out the function switch. This switch is keyed on the values
+ * of the func index. */
+std::ostream &CSharpFFlatCodeGen::FROM_STATE_ACTION_SWITCH()
+{
+	/* Loop the actions. */
+	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) {
+		if ( redAct->numFromStateRefs > 0 ) {
+			/* Write the entry label. */
+			out << "\tcase " << redAct->actListId+1 << ":\n";
+
+			/* Write each action in the list of action items. */
+			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ )
+				ACTION( out, item->value, 0, false );
+
+			out << "\tbreak;\n";
+		}
+	}
+
+	genLineDirective( out );
+	return out;
+}
+
+std::ostream &CSharpFFlatCodeGen::EOF_ACTION_SWITCH()
+{
+	/* Loop the actions. */
+	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) {
+		if ( redAct->numEofRefs > 0 ) {
+			/* Write the entry label. */
+			out << "\tcase " << redAct->actListId+1 << ":\n";
+
+			/* Write each action in the list of action items. */
+			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ )
+				ACTION( out, item->value, 0, true );
+
+			out << "\tbreak;\n";
+		}
+	}
+
+	genLineDirective( out );
+	return out;
+}
+
+/* Write out the function switch. This switch is keyed on the values
+ * of the func index. */
+std::ostream &CSharpFFlatCodeGen::ACTION_SWITCH()
+{
+	/* Loop the actions. */
+	for ( GenActionTableMap::Iter redAct = redFsm->actionMap; redAct.lte(); redAct++ ) {
+		if ( redAct->numTransRefs > 0 ) {
+			/* Write the entry label. */
+			out << "\tcase " << redAct->actListId+1 << ":\n";
+
+			/* Write each action in the list of action items. */
+			for ( GenActionTable::Iter item = redAct->key; item.lte(); item++ )
+				ACTION( out, item->value, 0, false );
+
+			out << "\tbreak;\n";
+		}
+	}
+
+	genLineDirective( out );
+	return out;
+}
+
+void CSharpFFlatCodeGen::writeData()
+{
+	if ( redFsm->anyConditions() ) {
+		OPEN_ARRAY( WIDE_ALPH_TYPE(), CK() );
+		COND_KEYS();
+		CLOSE_ARRAY() <<
+		"\n";
+
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondSpan), CSP() );
+		COND_KEY_SPANS();
+		CLOSE_ARRAY() <<
+		"\n";
+
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCond), C() );
+		CONDS();
+		CLOSE_ARRAY() <<
+		"\n";
+
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondIndexOffset), CO() );
+		COND_INDEX_OFFSET();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	OPEN_ARRAY( WIDE_ALPH_TYPE(), K() );
+	KEYS();
+	CLOSE_ARRAY() <<
+	"\n";
+
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxSpan), SP() );
+	KEY_SPANS();
+	CLOSE_ARRAY() <<
+	"\n";
+
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxFlatIndexOffset), IO() );
+	FLAT_INDEX_OFFSET();
+	CLOSE_ARRAY() <<
+	"\n";
+
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex), I() );
+	INDICIES();
+	CLOSE_ARRAY() <<
+	"\n";
+
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() );
+	TRANS_TARGS();
+	CLOSE_ARRAY() <<
+	"\n";
+
+	if ( redFsm->anyActions() ) {
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActListId), TA() );
+		TRANS_ACTIONS();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	if ( redFsm->anyToStateActions() ) {
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc),  TSA() );
+		TO_STATE_ACTIONS();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	if ( redFsm->anyFromStateActions() ) {
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), FSA() );
+		FROM_STATE_ACTIONS();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	if ( redFsm->anyEofActions() ) {
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActListId), EA() );
+		EOF_ACTIONS();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	if ( redFsm->anyEofTrans() ) {
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset+1), ET() );
+		EOF_TRANS();
+		CLOSE_ARRAY() <<
+		"\n";
+	}
+
+	STATE_IDS();
+}
+
+void CSharpFFlatCodeGen::writeExec()
+{
+	testEofUsed = false;
+	outLabelUsed = false;
+	initVarTypes();
+
+	out << 
+		"	{\n"
+		"	" << slenType << " _slen";
+
+	if ( redFsm->anyRegCurStateRef() )
+		out << ", _ps";
+	
+	out << ";\n";
+	out << "	" << transType << " _trans";
+
+	if ( redFsm->anyConditions() )
+		out << ", _cond";
+
+	out << ";\n";
+
+	out <<
+		"	" << "int _keys;\n"
+		"	" << indsType << " _inds;\n";
+		/*
+		"	" << PTR_CONST() << WIDE_ALPH_TYPE() << POINTER() << "_keys;\n"
+		"	" << PTR_CONST() << ARRAY_TYPE(redFsm->maxIndex) << POINTER() << "_inds;\n";*/
+
+	if ( redFsm->anyConditions() ) {
+		out << 
+			"	" << condsType << " _conds;\n"
+			"	" << WIDE_ALPH_TYPE() << " _widec;\n";
+	}
+
+	if ( !noEnd ) {
+		testEofUsed = true;
+		out << 
+			"	if ( " << P() << " == " << PE() << " )\n"
+			"		goto _test_eof;\n";
+	}
+
+	if ( redFsm->errState != 0 ) {
+		outLabelUsed = true;
+		out << 
+			"	if ( " << vCS() << " == " << redFsm->errState->id << " )\n"
+			"		goto _out;\n";
+	}
+
+	out << "_resume:\n";
+
+	if ( redFsm->anyFromStateActions() ) {
+		out <<
+			"	switch ( " << FSA() << "[" << vCS() << "] ) {\n";
+			FROM_STATE_ACTION_SWITCH();
+			SWITCH_DEFAULT() <<
+			"	}\n"
+			"\n";
+	}
+
+	if ( redFsm->anyConditions() )
+		COND_TRANSLATE();
+
+	LOCATE_TRANS();
+
+	if ( redFsm->anyEofTrans() )
+		out << "_eof_trans:\n";
+	
+	if ( redFsm->anyRegCurStateRef() )
+		out << "	_ps = " << vCS() << ";\n";
+
 	out << 
-		"	" << "int _keys;\n" 
-		"	" << indsType << " _inds;\n"; 
-		/* 
-		"	" << PTR_CONST() << WIDE_ALPH_TYPE() << POINTER() << "_keys;\n" 
-		"	" << PTR_CONST() << ARRAY_TYPE(redFsm->maxIndex) << POINTER() << "_inds;\n";*/ 
- 
-	if ( redFsm->anyConditions() ) { 
-		out <<  
-			"	" << condsType << " _conds;\n" 
-			"	" << WIDE_ALPH_TYPE() << " _widec;\n"; 
-	} 
- 
-	if ( !noEnd ) { 
-		testEofUsed = true; 
-		out <<  
-			"	if ( " << P() << " == " << PE() << " )\n" 
-			"		goto _test_eof;\n"; 
-	} 
- 
-	if ( redFsm->errState != 0 ) { 
-		outLabelUsed = true; 
-		out <<  
-			"	if ( " << vCS() << " == " << redFsm->errState->id << " )\n" 
-			"		goto _out;\n"; 
-	} 
- 
-	out << "_resume:\n"; 
- 
-	if ( redFsm->anyFromStateActions() ) { 
+		"	" << vCS() << " = " << TT() << "[_trans];\n\n";
+
+	if ( redFsm->anyRegActions() ) {
 		out << 
-			"	switch ( " << FSA() << "[" << vCS() << "] ) {\n"; 
-			FROM_STATE_ACTION_SWITCH(); 
-			SWITCH_DEFAULT() << 
-			"	}\n" 
-			"\n"; 
-	} 
- 
-	if ( redFsm->anyConditions() ) 
-		COND_TRANSLATE(); 
- 
-	LOCATE_TRANS(); 
- 
-	if ( redFsm->anyEofTrans() ) 
-		out << "_eof_trans:\n"; 
-	 
-	if ( redFsm->anyRegCurStateRef() ) 
-		out << "	_ps = " << vCS() << ";\n"; 
- 
-	out <<  
-		"	" << vCS() << " = " << TT() << "[_trans];\n\n"; 
- 
-	if ( redFsm->anyRegActions() ) { 
-		out <<  
-			"	if ( " << TA() << "[_trans] == 0 )\n" 
-			"		goto _again;\n" 
-			"\n" 
-			"	switch ( " << TA() << "[_trans] ) {\n"; 
-			ACTION_SWITCH(); 
-			SWITCH_DEFAULT() << 
-			"	}\n" 
-			"\n"; 
-	} 
- 
-	if ( redFsm->anyRegActions() || redFsm->anyActionGotos() ||  
-			redFsm->anyActionCalls() || redFsm->anyActionRets() ) 
-		out << "_again:\n"; 
- 
-	if ( redFsm->anyToStateActions() ) { 
+			"	if ( " << TA() << "[_trans] == 0 )\n"
+			"		goto _again;\n"
+			"\n"
+			"	switch ( " << TA() << "[_trans] ) {\n";
+			ACTION_SWITCH();
+			SWITCH_DEFAULT() <<
+			"	}\n"
+			"\n";
+	}
+
+	if ( redFsm->anyRegActions() || redFsm->anyActionGotos() || 
+			redFsm->anyActionCalls() || redFsm->anyActionRets() )
+		out << "_again:\n";
+
+	if ( redFsm->anyToStateActions() ) {
+		out <<
+			"	switch ( " << TSA() << "[" << vCS() << "] ) {\n";
+			TO_STATE_ACTION_SWITCH();
+			SWITCH_DEFAULT() <<
+			"	}\n"
+			"\n";
+	}
+
+	if ( redFsm->errState != 0 ) {
+		outLabelUsed = true;
 		out << 
-			"	switch ( " << TSA() << "[" << vCS() << "] ) {\n"; 
-			TO_STATE_ACTION_SWITCH(); 
-			SWITCH_DEFAULT() << 
-			"	}\n" 
-			"\n"; 
-	} 
- 
-	if ( redFsm->errState != 0 ) { 
-		outLabelUsed = true; 
-		out <<  
-			"	if ( " << vCS() << " == " << redFsm->errState->id << " )\n" 
-			"		goto _out;\n"; 
-	} 
- 
-	if ( !noEnd ) { 
-		out <<  
-			"	if ( ++" << P() << " != " << PE() << " )\n" 
-			"		goto _resume;\n"; 
-	} 
-	else { 
-		out <<  
-			"	" << P() << " += 1;\n" 
-			"	goto _resume;\n"; 
-	} 
- 
-	if ( testEofUsed ) 
-		out << "	_test_eof: {}\n"; 
- 
-	if ( redFsm->anyEofTrans() || redFsm->anyEofActions() ) { 
+			"	if ( " << vCS() << " == " << redFsm->errState->id << " )\n"
+			"		goto _out;\n";
+	}
+
+	if ( !noEnd ) {
 		out << 
-			"	if ( " << P() << " == " << vEOF() << " )\n" 
-			"	{\n"; 
- 
-		if ( redFsm->anyEofTrans() ) { 
-			out << 
-				"	if ( " << ET() << "[" << vCS() << "] > 0 ) {\n" 
-				"		_trans = " << CAST(transType) << " (" << ET() << 
-					"[" << vCS() << "] - 1);\n" 
-				"		goto _eof_trans;\n" 
-				"	}\n"; 
-		} 
- 
-		if ( redFsm->anyEofActions() ) { 
-			out << 
-				"	switch ( " << EA() << "[" << vCS() << "] ) {\n"; 
-				EOF_ACTION_SWITCH(); 
-				SWITCH_DEFAULT() << 
-				"	}\n"; 
-		} 
- 
+			"	if ( ++" << P() << " != " << PE() << " )\n"
+			"		goto _resume;\n";
+	}
+	else {
 		out << 
-			"	}\n" 
-			"\n"; 
-	} 
- 
-	if ( outLabelUsed ) 
-		out << "	_out: {}\n"; 
- 
-	out << "	}\n"; 
-} 
+			"	" << P() << " += 1;\n"
+			"	goto _resume;\n";
+	}
+
+	if ( testEofUsed )
+		out << "	_test_eof: {}\n";
+
+	if ( redFsm->anyEofTrans() || redFsm->anyEofActions() ) {
+		out <<
+			"	if ( " << P() << " == " << vEOF() << " )\n"
+			"	{\n";
+
+		if ( redFsm->anyEofTrans() ) {
+			out <<
+				"	if ( " << ET() << "[" << vCS() << "] > 0 ) {\n"
+				"		_trans = " << CAST(transType) << " (" << ET() <<
+					"[" << vCS() << "] - 1);\n"
+				"		goto _eof_trans;\n"
+				"	}\n";
+		}
+
+		if ( redFsm->anyEofActions() ) {
+			out <<
+				"	switch ( " << EA() << "[" << vCS() << "] ) {\n";
+				EOF_ACTION_SWITCH();
+				SWITCH_DEFAULT() <<
+				"	}\n";
+		}
+
+		out <<
+			"	}\n"
+			"\n";
+	}
+
+	if ( outLabelUsed )
+		out << "	_out: {}\n";
+
+	out << "	}\n";
+}