Restoring authorship annotation for <[email protected]>. Commit 1 of 2.

1 files changed, 1068 insertions, 1068 deletions

diff --git a/contrib/tools/ragel6/cdtable.cpp b/contrib/tools/ragel6/cdtable.cpp
index 6bcb79ea842..1cc88d09f56 100644
--- a/contrib/tools/ragel6/cdtable.cpp
+++ b/contrib/tools/ragel6/cdtable.cpp
@@ -1,671 +1,671 @@
-/*
- *  Copyright 2001-2006 Adrian Thurston <[email protected]>
- *            2004 Erich Ocean <[email protected]>
- *            2005 Alan West <[email protected]>
- */
-
-/*  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 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.
+/* 
+ *  Copyright 2001-2006 Adrian Thurston <[email protected]> 
+ *            2004 Erich Ocean <[email protected]> 
+ *            2005 Alan West <[email protected]> 
+ */ 
+ 
+/*  This file is part of Ragel. 
  * 
- *  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 "cdtable.h"
-#include "redfsm.h"
-#include "gendata.h"
-
-/* Determine if we should use indicies or not. */
-void TabCodeGen::calcIndexSize()
-{
-	int sizeWithInds = 0, sizeWithoutInds = 0;
-
-	/* Calculate cost of using with indicies. */
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		int totalIndex = st->outSingle.length() + st->outRange.length() + 
-				(st->defTrans == 0 ? 0 : 1);
-		sizeWithInds += arrayTypeSize(redFsm->maxIndex) * totalIndex;
-	}
-	sizeWithInds += arrayTypeSize(redFsm->maxState) * redFsm->transSet.length();
-	if ( redFsm->anyActions() )
-		sizeWithInds += arrayTypeSize(redFsm->maxActionLoc) * redFsm->transSet.length();
-
-	/* Calculate the cost of not using indicies. */
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		int totalIndex = st->outSingle.length() + st->outRange.length() + 
-				(st->defTrans == 0 ? 0 : 1);
-		sizeWithoutInds += arrayTypeSize(redFsm->maxState) * totalIndex;
-		if ( redFsm->anyActions() )
-			sizeWithoutInds += arrayTypeSize(redFsm->maxActionLoc) * totalIndex;
-	}
-
-	/* If using indicies reduces the size, use them. */
-	useIndicies = sizeWithInds < sizeWithoutInds;
-}
-
-std::ostream &TabCodeGen::TO_STATE_ACTION( RedStateAp *state )
-{
-	int act = 0;
-	if ( state->toStateAction != 0 )
-		act = state->toStateAction->location+1;
-	out << act;
-	return out;
-}
-
-std::ostream &TabCodeGen::FROM_STATE_ACTION( RedStateAp *state )
-{
-	int act = 0;
-	if ( state->fromStateAction != 0 )
-		act = state->fromStateAction->location+1;
-	out << act;
-	return out;
-}
-
-std::ostream &TabCodeGen::EOF_ACTION( RedStateAp *state )
-{
-	int act = 0;
-	if ( state->eofAction != 0 )
-		act = state->eofAction->location+1;
-	out << act;
-	return out;
-}
-
-
-std::ostream &TabCodeGen::TRANS_ACTION( RedTransAp *trans )
-{
-	/* If there are actions, emit them. Otherwise emit zero. */
-	int act = 0;
-	if ( trans->action != 0 )
-		act = trans->action->location+1;
-	out << act;
-	return out;
-}
-
-std::ostream &TabCodeGen::TO_STATE_ACTION_SWITCH()
-{
-	/* Walk the list of functions, printing the cases. */
-	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) {
-		/* Write out referenced actions. */
-		if ( act->numToStateRefs > 0 ) {
-			/* Write the case label, the action and the case break. */
-			out << "\tcase " << act->actionId << ":\n";
-			ACTION( out, act, 0, false, false );
-			out << "\tbreak;\n";
-		}
-	}
-
-	genLineDirective( out );
-	return out;
-}
-
-std::ostream &TabCodeGen::FROM_STATE_ACTION_SWITCH()
-{
-	/* Walk the list of functions, printing the cases. */
-	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) {
-		/* Write out referenced actions. */
-		if ( act->numFromStateRefs > 0 ) {
-			/* Write the case label, the action and the case break. */
-			out << "\tcase " << act->actionId << ":\n";
-			ACTION( out, act, 0, false, false );
-			out << "\tbreak;\n";
-		}
-	}
-
-	genLineDirective( out );
-	return out;
-}
-
-std::ostream &TabCodeGen::EOF_ACTION_SWITCH()
-{
-	/* Walk the list of functions, printing the cases. */
-	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) {
-		/* Write out referenced actions. */
-		if ( act->numEofRefs > 0 ) {
-			/* Write the case label, the action and the case break. */
-			out << "\tcase " << act->actionId << ":\n";
-			ACTION( out, act, 0, true, false );
-			out << "\tbreak;\n";
-		}
-	}
-
-	genLineDirective( out );
-	return out;
-}
-
-
-std::ostream &TabCodeGen::ACTION_SWITCH()
-{
-	/* Walk the list of functions, printing the cases. */
-	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) {
-		/* Write out referenced actions. */
-		if ( act->numTransRefs > 0 ) {
-			/* Write the case label, the action and the case break. */
-			out << "\tcase " << act->actionId << ":\n";
-			ACTION( out, act, 0, false, false );
-			out << "\tbreak;\n";
-		}
-	}
-
-	genLineDirective( out );
-	return out;
-}
-
-std::ostream &TabCodeGen::COND_OFFSETS()
-{
-	out << "\t";
-	int totalStateNum = 0, curKeyOffset = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write the key offset. */
-		out << curKeyOffset;
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Move the key offset ahead. */
-		curKeyOffset += st->stateCondList.length();
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::KEY_OFFSETS()
-{
-	out << "\t";
-	int totalStateNum = 0, curKeyOffset = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write the key offset. */
-		out << curKeyOffset;
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Move the key offset ahead. */
-		curKeyOffset += st->outSingle.length() + st->outRange.length()*2;
-	}
-	out << "\n";
-	return out;
-}
-
-
-std::ostream &TabCodeGen::INDEX_OFFSETS()
-{
-	out << "\t";
-	int totalStateNum = 0, curIndOffset = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write the index offset. */
-		out << curIndOffset;
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Move the index offset ahead. */
-		curIndOffset += st->outSingle.length() + st->outRange.length();
-		if ( st->defTrans != 0 )
-			curIndOffset += 1;
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::COND_LENS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write singles length. */
-		out << st->stateCondList.length();
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-
-std::ostream &TabCodeGen::SINGLE_LENS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write singles length. */
-		out << st->outSingle.length();
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::RANGE_LENS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Emit length of range index. */
-		out << st->outRange.length();
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::TO_STATE_ACTIONS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write any eof action. */
-		TO_STATE_ACTION(st);
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::FROM_STATE_ACTIONS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write any eof action. */
-		FROM_STATE_ACTION(st);
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::EOF_ACTIONS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write any eof action. */
-		EOF_ACTION(st);
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::EOF_TRANS()
-{
-	out << "\t";
-	int totalStateNum = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Write any eof action. */
-		long trans = 0;
-		if ( st->eofTrans != 0 ) {
-			assert( st->eofTrans->pos >= 0 );
-			trans = st->eofTrans->pos+1;
-		}
-		out << trans;
-
-		if ( !st.last() ) {
-			out << ", ";
-			if ( ++totalStateNum % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	return out;
-}
-
-
-std::ostream &TabCodeGen::COND_KEYS()
-{
-	out << '\t';
-	int totalTrans = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Loop the state's transitions. */
-		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
-			/* Lower key. */
-			out << KEY( sc->lowKey ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-
-			/* Upper key. */
-			out << KEY( sc->highKey ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::COND_SPACES()
-{
-	out << '\t';
-	int totalTrans = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Loop the state's transitions. */
-		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
-			/* Cond Space id. */
-			out << sc->condSpace->condSpaceId << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::KEYS()
-{
-	out << '\t';
-	int totalTrans = 0;
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Loop the singles. */
-		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-			out << KEY( stel->lowKey ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Loop the state's transitions. */
-		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
-			/* Lower key. */
-			out << KEY( rtel->lowKey ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-
-			/* Upper key. */
-			out << KEY( rtel->highKey ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::INDICIES()
-{
-	int totalTrans = 0;
-	out << '\t';
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Walk the singles. */
-		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-			out << stel->value->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Walk the ranges. */
-		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
-			out << rtel->value->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* The state's default index goes next. */
-		if ( st->defTrans != 0 ) {
-			out << st->defTrans->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::TRANS_TARGS()
-{
-	int totalTrans = 0;
-	out << '\t';
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Walk the singles. */
-		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-			RedTransAp *trans = stel->value;
-			out << trans->targ->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Walk the ranges. */
-		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
-			RedTransAp *trans = rtel->value;
-			out << trans->targ->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* The state's default target state. */
-		if ( st->defTrans != 0 ) {
-			RedTransAp *trans = st->defTrans;
-			out << trans->targ->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Add any eof transitions that have not yet been written out above. */
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		if ( st->eofTrans != 0 ) {
-			RedTransAp *trans = st->eofTrans;
-			trans->pos = totalTrans;
-			out << trans->targ->id << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-
-std::ostream &TabCodeGen::TRANS_ACTIONS()
-{
-	int totalTrans = 0;
-	out << '\t';
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		/* Walk the singles. */
-		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) {
-			RedTransAp *trans = stel->value;
-			TRANS_ACTION( trans ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* Walk the ranges. */
-		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) {
-			RedTransAp *trans = rtel->value;
-			TRANS_ACTION( trans ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-
-		/* The state's default index goes next. */
-		if ( st->defTrans != 0 ) {
-			RedTransAp *trans = st->defTrans;
-			TRANS_ACTION( trans ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-	/* Add any eof transitions that have not yet been written out above. */
-	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
-		if ( st->eofTrans != 0 ) {
-			RedTransAp *trans = st->eofTrans;
-			TRANS_ACTION( trans ) << ", ";
-			if ( ++totalTrans % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-
-
-	/* Output one last number so we don't have to figure out when the last
-	 * entry is and avoid writing a comma. */
-	out << 0 << "\n";
-	return out;
-}
-
-std::ostream &TabCodeGen::TRANS_TARGS_WI()
-{
-	/* Transitions must be written ordered by their id. */
-	RedTransAp **transPtrs = new RedTransAp*[redFsm->transSet.length()];
-	for ( TransApSet::Iter trans = redFsm->transSet; trans.lte(); trans++ )
-		transPtrs[trans->id] = trans;
-
-	/* Keep a count of the num of items in the array written. */
-	out << '\t';
-	int totalStates = 0;
-	for ( int t = 0; t < redFsm->transSet.length(); t++ ) {
-		/* Record the position, need this for eofTrans. */
-		RedTransAp *trans = transPtrs[t];
-		trans->pos = t;
-
-		/* Write out the target state. */
-		out << trans->targ->id;
-		if ( t < redFsm->transSet.length()-1 ) {
-			out << ", ";
-			if ( ++totalStates % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	delete[] transPtrs;
-	return out;
-}
-
-
-std::ostream &TabCodeGen::TRANS_ACTIONS_WI()
-{
-	/* Transitions must be written ordered by their id. */
-	RedTransAp **transPtrs = new RedTransAp*[redFsm->transSet.length()];
-	for ( TransApSet::Iter trans = redFsm->transSet; trans.lte(); trans++ )
-		transPtrs[trans->id] = trans;
-
-	/* Keep a count of the num of items in the array written. */
-	out << '\t';
-	int totalAct = 0;
-	for ( int t = 0; t < redFsm->transSet.length(); t++ ) {
-		/* Write the function for the transition. */
-		RedTransAp *trans = transPtrs[t];
-		TRANS_ACTION( trans );
-		if ( t < redFsm->transSet.length()-1 ) {
-			out << ", ";
-			if ( ++totalAct % IALL == 0 )
-				out << "\n\t";
-		}
-	}
-	out << "\n";
-	delete[] transPtrs;
-	return out;
-}
-
-void TabCodeGen::LOCATE_TRANS()
-{
-	out <<
-		"	_keys = " << ARR_OFF( K(), KO() + "[" + vCS() + "]" ) << ";\n"
-		"	_trans = " << IO() << "[" << vCS() << "];\n"
-		"\n"
-		"	_klen = " << SL() << "[" << vCS() << "];\n"
-		"	if ( _klen > 0 ) {\n"
+ *  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 "cdtable.h" 
+#include "redfsm.h" 
+#include "gendata.h" 
+ 
+/* Determine if we should use indicies or not. */ 
+void TabCodeGen::calcIndexSize() 
+{ 
+	int sizeWithInds = 0, sizeWithoutInds = 0; 
+ 
+	/* Calculate cost of using with indicies. */ 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		int totalIndex = st->outSingle.length() + st->outRange.length() +  
+				(st->defTrans == 0 ? 0 : 1); 
+		sizeWithInds += arrayTypeSize(redFsm->maxIndex) * totalIndex; 
+	} 
+	sizeWithInds += arrayTypeSize(redFsm->maxState) * redFsm->transSet.length(); 
+	if ( redFsm->anyActions() ) 
+		sizeWithInds += arrayTypeSize(redFsm->maxActionLoc) * redFsm->transSet.length(); 
+ 
+	/* Calculate the cost of not using indicies. */ 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		int totalIndex = st->outSingle.length() + st->outRange.length() +  
+				(st->defTrans == 0 ? 0 : 1); 
+		sizeWithoutInds += arrayTypeSize(redFsm->maxState) * totalIndex; 
+		if ( redFsm->anyActions() ) 
+			sizeWithoutInds += arrayTypeSize(redFsm->maxActionLoc) * totalIndex; 
+	} 
+ 
+	/* If using indicies reduces the size, use them. */ 
+	useIndicies = sizeWithInds < sizeWithoutInds; 
+} 
+ 
+std::ostream &TabCodeGen::TO_STATE_ACTION( RedStateAp *state ) 
+{ 
+	int act = 0; 
+	if ( state->toStateAction != 0 ) 
+		act = state->toStateAction->location+1; 
+	out << act; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::FROM_STATE_ACTION( RedStateAp *state ) 
+{ 
+	int act = 0; 
+	if ( state->fromStateAction != 0 ) 
+		act = state->fromStateAction->location+1; 
+	out << act; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::EOF_ACTION( RedStateAp *state ) 
+{ 
+	int act = 0; 
+	if ( state->eofAction != 0 ) 
+		act = state->eofAction->location+1; 
+	out << act; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::TRANS_ACTION( RedTransAp *trans ) 
+{ 
+	/* If there are actions, emit them. Otherwise emit zero. */ 
+	int act = 0; 
+	if ( trans->action != 0 ) 
+		act = trans->action->location+1; 
+	out << act; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::TO_STATE_ACTION_SWITCH() 
+{ 
+	/* Walk the list of functions, printing the cases. */ 
+	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) { 
+		/* Write out referenced actions. */ 
+		if ( act->numToStateRefs > 0 ) { 
+			/* Write the case label, the action and the case break. */ 
+			out << "\tcase " << act->actionId << ":\n"; 
+			ACTION( out, act, 0, false, false ); 
+			out << "\tbreak;\n"; 
+		} 
+	} 
+ 
+	genLineDirective( out ); 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::FROM_STATE_ACTION_SWITCH() 
+{ 
+	/* Walk the list of functions, printing the cases. */ 
+	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) { 
+		/* Write out referenced actions. */ 
+		if ( act->numFromStateRefs > 0 ) { 
+			/* Write the case label, the action and the case break. */ 
+			out << "\tcase " << act->actionId << ":\n"; 
+			ACTION( out, act, 0, false, false ); 
+			out << "\tbreak;\n"; 
+		} 
+	} 
+ 
+	genLineDirective( out ); 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::EOF_ACTION_SWITCH() 
+{ 
+	/* Walk the list of functions, printing the cases. */ 
+	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) { 
+		/* Write out referenced actions. */ 
+		if ( act->numEofRefs > 0 ) { 
+			/* Write the case label, the action and the case break. */ 
+			out << "\tcase " << act->actionId << ":\n"; 
+			ACTION( out, act, 0, true, false ); 
+			out << "\tbreak;\n"; 
+		} 
+	} 
+ 
+	genLineDirective( out ); 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::ACTION_SWITCH() 
+{ 
+	/* Walk the list of functions, printing the cases. */ 
+	for ( GenActionList::Iter act = actionList; act.lte(); act++ ) { 
+		/* Write out referenced actions. */ 
+		if ( act->numTransRefs > 0 ) { 
+			/* Write the case label, the action and the case break. */ 
+			out << "\tcase " << act->actionId << ":\n"; 
+			ACTION( out, act, 0, false, false ); 
+			out << "\tbreak;\n"; 
+		} 
+	} 
+ 
+	genLineDirective( out ); 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::COND_OFFSETS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0, curKeyOffset = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write the key offset. */ 
+		out << curKeyOffset; 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Move the key offset ahead. */ 
+		curKeyOffset += st->stateCondList.length(); 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::KEY_OFFSETS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0, curKeyOffset = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write the key offset. */ 
+		out << curKeyOffset; 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Move the key offset ahead. */ 
+		curKeyOffset += st->outSingle.length() + st->outRange.length()*2; 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::INDEX_OFFSETS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0, curIndOffset = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write the index offset. */ 
+		out << curIndOffset; 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Move the index offset ahead. */ 
+		curIndOffset += st->outSingle.length() + st->outRange.length(); 
+		if ( st->defTrans != 0 ) 
+			curIndOffset += 1; 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::COND_LENS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write singles length. */ 
+		out << st->stateCondList.length(); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::SINGLE_LENS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write singles length. */ 
+		out << st->outSingle.length(); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::RANGE_LENS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Emit length of range index. */ 
+		out << st->outRange.length(); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::TO_STATE_ACTIONS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write any eof action. */ 
+		TO_STATE_ACTION(st); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::FROM_STATE_ACTIONS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write any eof action. */ 
+		FROM_STATE_ACTION(st); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::EOF_ACTIONS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write any eof action. */ 
+		EOF_ACTION(st); 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::EOF_TRANS() 
+{ 
+	out << "\t"; 
+	int totalStateNum = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Write any eof action. */ 
+		long trans = 0; 
+		if ( st->eofTrans != 0 ) { 
+			assert( st->eofTrans->pos >= 0 ); 
+			trans = st->eofTrans->pos+1; 
+		} 
+		out << trans; 
+ 
+		if ( !st.last() ) { 
+			out << ", "; 
+			if ( ++totalStateNum % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::COND_KEYS() 
+{ 
+	out << '\t'; 
+	int totalTrans = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Loop the state's transitions. */ 
+		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) { 
+			/* Lower key. */ 
+			out << KEY( sc->lowKey ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+ 
+			/* Upper key. */ 
+			out << KEY( sc->highKey ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::COND_SPACES() 
+{ 
+	out << '\t'; 
+	int totalTrans = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Loop the state's transitions. */ 
+		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) { 
+			/* Cond Space id. */ 
+			out << sc->condSpace->condSpaceId << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::KEYS() 
+{ 
+	out << '\t'; 
+	int totalTrans = 0; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Loop the singles. */ 
+		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) { 
+			out << KEY( stel->lowKey ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Loop the state's transitions. */ 
+		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) { 
+			/* Lower key. */ 
+			out << KEY( rtel->lowKey ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+ 
+			/* Upper key. */ 
+			out << KEY( rtel->highKey ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::INDICIES() 
+{ 
+	int totalTrans = 0; 
+	out << '\t'; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Walk the singles. */ 
+		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) { 
+			out << stel->value->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Walk the ranges. */ 
+		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) { 
+			out << rtel->value->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* The state's default index goes next. */ 
+		if ( st->defTrans != 0 ) { 
+			out << st->defTrans->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::TRANS_TARGS() 
+{ 
+	int totalTrans = 0; 
+	out << '\t'; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Walk the singles. */ 
+		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) { 
+			RedTransAp *trans = stel->value; 
+			out << trans->targ->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Walk the ranges. */ 
+		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) { 
+			RedTransAp *trans = rtel->value; 
+			out << trans->targ->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* The state's default target state. */ 
+		if ( st->defTrans != 0 ) { 
+			RedTransAp *trans = st->defTrans; 
+			out << trans->targ->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Add any eof transitions that have not yet been written out above. */ 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		if ( st->eofTrans != 0 ) { 
+			RedTransAp *trans = st->eofTrans; 
+			trans->pos = totalTrans; 
+			out << trans->targ->id << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::TRANS_ACTIONS() 
+{ 
+	int totalTrans = 0; 
+	out << '\t'; 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		/* Walk the singles. */ 
+		for ( RedTransList::Iter stel = st->outSingle; stel.lte(); stel++ ) { 
+			RedTransAp *trans = stel->value; 
+			TRANS_ACTION( trans ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* Walk the ranges. */ 
+		for ( RedTransList::Iter rtel = st->outRange; rtel.lte(); rtel++ ) { 
+			RedTransAp *trans = rtel->value; 
+			TRANS_ACTION( trans ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+ 
+		/* The state's default index goes next. */ 
+		if ( st->defTrans != 0 ) { 
+			RedTransAp *trans = st->defTrans; 
+			TRANS_ACTION( trans ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+	/* Add any eof transitions that have not yet been written out above. */ 
+	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) { 
+		if ( st->eofTrans != 0 ) { 
+			RedTransAp *trans = st->eofTrans; 
+			TRANS_ACTION( trans ) << ", "; 
+			if ( ++totalTrans % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+ 
+ 
+	/* Output one last number so we don't have to figure out when the last 
+	 * entry is and avoid writing a comma. */ 
+	out << 0 << "\n"; 
+	return out; 
+} 
+ 
+std::ostream &TabCodeGen::TRANS_TARGS_WI() 
+{ 
+	/* Transitions must be written ordered by their id. */ 
+	RedTransAp **transPtrs = new RedTransAp*[redFsm->transSet.length()]; 
+	for ( TransApSet::Iter trans = redFsm->transSet; trans.lte(); trans++ ) 
+		transPtrs[trans->id] = trans; 
+ 
+	/* Keep a count of the num of items in the array written. */ 
+	out << '\t'; 
+	int totalStates = 0; 
+	for ( int t = 0; t < redFsm->transSet.length(); t++ ) { 
+		/* Record the position, need this for eofTrans. */ 
+		RedTransAp *trans = transPtrs[t]; 
+		trans->pos = t; 
+ 
+		/* Write out the target state. */ 
+		out << trans->targ->id; 
+		if ( t < redFsm->transSet.length()-1 ) { 
+			out << ", "; 
+			if ( ++totalStates % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	delete[] transPtrs; 
+	return out; 
+} 
+ 
+ 
+std::ostream &TabCodeGen::TRANS_ACTIONS_WI() 
+{ 
+	/* Transitions must be written ordered by their id. */ 
+	RedTransAp **transPtrs = new RedTransAp*[redFsm->transSet.length()]; 
+	for ( TransApSet::Iter trans = redFsm->transSet; trans.lte(); trans++ ) 
+		transPtrs[trans->id] = trans; 
+ 
+	/* Keep a count of the num of items in the array written. */ 
+	out << '\t'; 
+	int totalAct = 0; 
+	for ( int t = 0; t < redFsm->transSet.length(); t++ ) { 
+		/* Write the function for the transition. */ 
+		RedTransAp *trans = transPtrs[t]; 
+		TRANS_ACTION( trans ); 
+		if ( t < redFsm->transSet.length()-1 ) { 
+			out << ", "; 
+			if ( ++totalAct % IALL == 0 ) 
+				out << "\n\t"; 
+		} 
+	} 
+	out << "\n"; 
+	delete[] transPtrs; 
+	return out; 
+} 
+ 
+void TabCodeGen::LOCATE_TRANS() 
+{ 
+	out << 
+		"	_keys = " << ARR_OFF( K(), KO() + "[" + vCS() + "]" ) << ";\n" 
+		"	_trans = " << IO() << "[" << vCS() << "];\n" 
+		"\n" 
+		"	_klen = " << SL() << "[" << vCS() << "];\n" 
+		"	if ( _klen > 0 ) {\n" 
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_lower = _keys;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_mid;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_upper = _keys + _klen - 1;\n"
-		"		while (1) {\n"
-		"			if ( _upper < _lower )\n"
-		"				break;\n"
-		"\n"
-		"			_mid = _lower + ((_upper-_lower) >> 1);\n"
-		"			if ( " << GET_WIDE_KEY() << " < *_mid )\n"
-		"				_upper = _mid - 1;\n"
-		"			else if ( " << GET_WIDE_KEY() << " > *_mid )\n"
-		"				_lower = _mid + 1;\n"
-		"			else {\n"
+		"		while (1) {\n" 
+		"			if ( _upper < _lower )\n" 
+		"				break;\n" 
+		"\n" 
+		"			_mid = _lower + ((_upper-_lower) >> 1);\n" 
+		"			if ( " << GET_WIDE_KEY() << " < *_mid )\n" 
+		"				_upper = _mid - 1;\n" 
+		"			else if ( " << GET_WIDE_KEY() << " > *_mid )\n" 
+		"				_lower = _mid + 1;\n" 
+		"			else {\n" 
 		"				_trans += " << CAST(UINT()) << "(_mid - _keys);\n"
-		"				goto _match;\n"
-		"			}\n"
-		"		}\n"
-		"		_keys += _klen;\n"
-		"		_trans += _klen;\n"
-		"	}\n"
-		"\n"
-		"	_klen = " << RL() << "[" << vCS() << "];\n"
-		"	if ( _klen > 0 ) {\n"
+		"				goto _match;\n" 
+		"			}\n" 
+		"		}\n" 
+		"		_keys += _klen;\n" 
+		"		_trans += _klen;\n" 
+		"	}\n" 
+		"\n" 
+		"	_klen = " << RL() << "[" << vCS() << "];\n" 
+		"	if ( _klen > 0 ) {\n" 
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_lower = _keys;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_mid;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_upper = _keys + (_klen<<1) - 2;\n"
-		"		while (1) {\n"
-		"			if ( _upper < _lower )\n"
-		"				break;\n"
-		"\n"
-		"			_mid = _lower + (((_upper-_lower) >> 1) & ~1);\n"
-		"			if ( " << GET_WIDE_KEY() << " < _mid[0] )\n"
-		"				_upper = _mid - 2;\n"
-		"			else if ( " << GET_WIDE_KEY() << " > _mid[1] )\n"
-		"				_lower = _mid + 2;\n"
-		"			else {\n"
+		"		while (1) {\n" 
+		"			if ( _upper < _lower )\n" 
+		"				break;\n" 
+		"\n" 
+		"			_mid = _lower + (((_upper-_lower) >> 1) & ~1);\n" 
+		"			if ( " << GET_WIDE_KEY() << " < _mid[0] )\n" 
+		"				_upper = _mid - 2;\n" 
+		"			else if ( " << GET_WIDE_KEY() << " > _mid[1] )\n" 
+		"				_lower = _mid + 2;\n" 
+		"			else {\n" 
 		"				_trans += " << CAST(UINT()) << "((_mid - _keys)>>1);\n"
-		"				goto _match;\n"
-		"			}\n"
-		"		}\n"
-		"		_trans += _klen;\n"
-		"	}\n"
-		"\n";
-}
-
-void TabCodeGen::GOTO( ostream &ret, int gotoDest, bool inFinish )
-{
+		"				goto _match;\n" 
+		"			}\n" 
+		"		}\n" 
+		"		_trans += _klen;\n" 
+		"	}\n" 
+		"\n"; 
+} 
+ 
+void TabCodeGen::GOTO( ostream &ret, int gotoDest, bool inFinish ) 
+{ 
 	ret << "{";
 	
 	ret << vCS() << " = " << gotoDest << ";";
@@ -676,13 +676,13 @@ void TabCodeGen::GOTO( ostream &ret, int gotoDest, bool inFinish )
 	ret << CTRL_FLOW() << "goto _again;";
 
 	ret << "}";
-}
-
-void TabCodeGen::GOTO_EXPR( ostream &ret, GenInlineItem *ilItem, bool inFinish )
-{
+} 
+ 
+void TabCodeGen::GOTO_EXPR( ostream &ret, GenInlineItem *ilItem, bool inFinish ) 
+{ 
 	ret << "{";
 	ret << vCS() << " = (";
-	INLINE_LIST( ret, ilItem->children, 0, inFinish, false );
+	INLINE_LIST( ret, ilItem->children, 0, inFinish, false ); 
 	ret << "); ";
 
 	if ( inFinish && !noEnd )
@@ -691,39 +691,39 @@ void TabCodeGen::GOTO_EXPR( ostream &ret, GenInlineItem *ilItem, bool inFinish )
 	ret << CTRL_FLOW() << "goto _again;";
 
 	ret << "}";
-}
-
-void TabCodeGen::CURS( ostream &ret, bool inFinish )
-{
-	ret << "(_ps)";
-}
-
-void TabCodeGen::TARGS( ostream &ret, bool inFinish, int targState )
-{
-	ret << "(" << vCS() << ")";
-}
-
-void TabCodeGen::NEXT( ostream &ret, int nextDest, bool inFinish )
-{
-	ret << vCS() << " = " << nextDest << ";";
-}
-
-void TabCodeGen::NEXT_EXPR( ostream &ret, GenInlineItem *ilItem, bool inFinish )
-{
-	ret << vCS() << " = (";
-	INLINE_LIST( ret, ilItem->children, 0, inFinish, false );
-	ret << ");";
-}
-
-void TabCodeGen::CALL( ostream &ret, int callDest, int targState, bool inFinish )
-{
-	if ( prePushExpr != 0 ) {
-		ret << "{";
-		INLINE_LIST( ret, prePushExpr, 0, false, false );
-	}
-
+} 
+ 
+void TabCodeGen::CURS( ostream &ret, bool inFinish ) 
+{ 
+	ret << "(_ps)"; 
+} 
+ 
+void TabCodeGen::TARGS( ostream &ret, bool inFinish, int targState ) 
+{ 
+	ret << "(" << vCS() << ")"; 
+} 
+ 
+void TabCodeGen::NEXT( ostream &ret, int nextDest, bool inFinish ) 
+{ 
+	ret << vCS() << " = " << nextDest << ";"; 
+} 
+ 
+void TabCodeGen::NEXT_EXPR( ostream &ret, GenInlineItem *ilItem, bool inFinish ) 
+{ 
+	ret << vCS() << " = ("; 
+	INLINE_LIST( ret, ilItem->children, 0, inFinish, false ); 
+	ret << ");"; 
+} 
+ 
+void TabCodeGen::CALL( ostream &ret, int callDest, int targState, bool inFinish ) 
+{ 
+	if ( prePushExpr != 0 ) { 
+		ret << "{"; 
+		INLINE_LIST( ret, prePushExpr, 0, false, false ); 
+	} 
+ 
 	ret << "{" << STACK() << "[" << TOP() << "++] = " << vCS() << "; " << vCS() << " = " << callDest << ";";
-
+ 
 	if ( inFinish && !noEnd )
 		EOF_CHECK( ret );
 
@@ -731,23 +731,23 @@ void TabCodeGen::CALL( ostream &ret, int callDest, int targState, bool inFinish
 
 	ret << "}";
 
-	if ( prePushExpr != 0 )
-		ret << "}";
-}
-
-void TabCodeGen::CALL_EXPR( ostream &ret, GenInlineItem *ilItem, int targState, bool inFinish )
-{
-	if ( prePushExpr != 0 ) {
-		ret << "{";
-		INLINE_LIST( ret, prePushExpr, 0, false, false );
-	}
-
+	if ( prePushExpr != 0 ) 
+		ret << "}"; 
+} 
+ 
+void TabCodeGen::CALL_EXPR( ostream &ret, GenInlineItem *ilItem, int targState, bool inFinish ) 
+{ 
+	if ( prePushExpr != 0 ) { 
+		ret << "{"; 
+		INLINE_LIST( ret, prePushExpr, 0, false, false ); 
+	} 
+ 
 	ret << "{";
 
 	ret << STACK() << "[" << TOP() << "++] = " << vCS() << "; " << vCS() << " = (";
-	INLINE_LIST( ret, ilItem->children, targState, inFinish, false );
+	INLINE_LIST( ret, ilItem->children, targState, inFinish, false ); 
 	ret << ");";
-
+ 
 	if ( inFinish && !noEnd )
 		EOF_CHECK( ret );
 
@@ -755,378 +755,378 @@ void TabCodeGen::CALL_EXPR( ostream &ret, GenInlineItem *ilItem, int targState,
 
 	ret << "}";
 
-	if ( prePushExpr != 0 )
-		ret << "}";
-}
-
-void TabCodeGen::RET( ostream &ret, bool inFinish )
-{
-	ret << "{" << vCS() << " = " << STACK() << "[--" << 
-			TOP() << "]; ";
-
-	if ( postPopExpr != 0 ) {
-		ret << "{";
-		INLINE_LIST( ret, postPopExpr, 0, false, false );
-		ret << "}";
-	}
-
+	if ( prePushExpr != 0 ) 
+		ret << "}"; 
+} 
+ 
+void TabCodeGen::RET( ostream &ret, bool inFinish ) 
+{ 
+	ret << "{" << vCS() << " = " << STACK() << "[--" <<  
+			TOP() << "]; "; 
+ 
+	if ( postPopExpr != 0 ) { 
+		ret << "{"; 
+		INLINE_LIST( ret, postPopExpr, 0, false, false ); 
+		ret << "}"; 
+	} 
+ 
 	if ( inFinish && !noEnd )
 		EOF_CHECK( ret );
 
 	ret << CTRL_FLOW() <<  "goto _again;";
 
 	ret << "}";
-}
-
-void TabCodeGen::BREAK( ostream &ret, int targState, bool csForced )
-{
-	outLabelUsed = true;
-	ret << "{" << P() << "++; " << CTRL_FLOW() << "goto _out; }";
-}
-
-void TabCodeGen::writeData()
-{
-	/* If there are any transtion functions then output the array. If there
-	 * are none, don't bother emitting an empty array that won't be used. */
-	if ( redFsm->anyActions() ) {
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActArrItem), A() );
-		ACTIONS_ARRAY();
-		CLOSE_ARRAY() <<
-		"\n";
-	}
-
-	if ( redFsm->anyConditions() ) {
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondOffset), CO() );
-		COND_OFFSETS();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondLen), CL() );
-		COND_LENS();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		OPEN_ARRAY( WIDE_ALPH_TYPE(), CK() );
-		COND_KEYS();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondSpaceId), C() );
-		COND_SPACES();
-		CLOSE_ARRAY() <<
-		"\n";
-	}
-
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxKeyOffset), KO() );
-	KEY_OFFSETS();
-	CLOSE_ARRAY() <<
-	"\n";
-
-	OPEN_ARRAY( WIDE_ALPH_TYPE(), K() );
-	KEYS();
-	CLOSE_ARRAY() <<
-	"\n";
-
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxSingleLen), SL() );
-	SINGLE_LENS();
-	CLOSE_ARRAY() <<
-	"\n";
-
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxRangeLen), RL() );
-	RANGE_LENS();
-	CLOSE_ARRAY() <<
-	"\n";
-
-	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset), IO() );
-	INDEX_OFFSETS();
-	CLOSE_ARRAY() <<
-	"\n";
-
-	if ( useIndicies ) {
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex), I() );
-		INDICIES();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() );
-		TRANS_TARGS_WI();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		if ( redFsm->anyActions() ) {
-			OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), TA() );
-			TRANS_ACTIONS_WI();
-			CLOSE_ARRAY() <<
-			"\n";
-		}
-	}
-	else {
-		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() );
-		TRANS_TARGS();
-		CLOSE_ARRAY() <<
-		"\n";
-
-		if ( redFsm->anyActions() ) {
-			OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), 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->maxActionLoc), 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 TabCodeGen::COND_TRANSLATE()
-{
-	out << 
-		"	_widec = " << GET_KEY() << ";\n"
-		"	_klen = " << CL() << "[" << vCS() << "];\n"
-		"	_keys = " << ARR_OFF( CK(), "(" + CO() + "[" + vCS() + "]*2)" ) << ";\n"
-		"	if ( _klen > 0 ) {\n"
+} 
+ 
+void TabCodeGen::BREAK( ostream &ret, int targState, bool csForced ) 
+{ 
+	outLabelUsed = true; 
+	ret << "{" << P() << "++; " << CTRL_FLOW() << "goto _out; }"; 
+} 
+ 
+void TabCodeGen::writeData() 
+{ 
+	/* If there are any transtion functions then output the array. If there 
+	 * are none, don't bother emitting an empty array that won't be used. */ 
+	if ( redFsm->anyActions() ) { 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActArrItem), A() ); 
+		ACTIONS_ARRAY(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+	} 
+ 
+	if ( redFsm->anyConditions() ) { 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondOffset), CO() ); 
+		COND_OFFSETS(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondLen), CL() ); 
+		COND_LENS(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		OPEN_ARRAY( WIDE_ALPH_TYPE(), CK() ); 
+		COND_KEYS(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxCondSpaceId), C() ); 
+		COND_SPACES(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+	} 
+ 
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxKeyOffset), KO() ); 
+	KEY_OFFSETS(); 
+	CLOSE_ARRAY() << 
+	"\n"; 
+ 
+	OPEN_ARRAY( WIDE_ALPH_TYPE(), K() ); 
+	KEYS(); 
+	CLOSE_ARRAY() << 
+	"\n"; 
+ 
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxSingleLen), SL() ); 
+	SINGLE_LENS(); 
+	CLOSE_ARRAY() << 
+	"\n"; 
+ 
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxRangeLen), RL() ); 
+	RANGE_LENS(); 
+	CLOSE_ARRAY() << 
+	"\n"; 
+ 
+	OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndexOffset), IO() ); 
+	INDEX_OFFSETS(); 
+	CLOSE_ARRAY() << 
+	"\n"; 
+ 
+	if ( useIndicies ) { 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxIndex), I() ); 
+		INDICIES(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() ); 
+		TRANS_TARGS_WI(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		if ( redFsm->anyActions() ) { 
+			OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), TA() ); 
+			TRANS_ACTIONS_WI(); 
+			CLOSE_ARRAY() << 
+			"\n"; 
+		} 
+	} 
+	else { 
+		OPEN_ARRAY( ARRAY_TYPE(redFsm->maxState), TT() ); 
+		TRANS_TARGS(); 
+		CLOSE_ARRAY() << 
+		"\n"; 
+ 
+		if ( redFsm->anyActions() ) { 
+			OPEN_ARRAY( ARRAY_TYPE(redFsm->maxActionLoc), 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->maxActionLoc), 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 TabCodeGen::COND_TRANSLATE() 
+{ 
+	out <<  
+		"	_widec = " << GET_KEY() << ";\n" 
+		"	_klen = " << CL() << "[" << vCS() << "];\n" 
+		"	_keys = " << ARR_OFF( CK(), "(" + CO() + "[" + vCS() + "]*2)" ) << ";\n" 
+		"	if ( _klen > 0 ) {\n" 
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_lower = _keys;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_mid;\n"
 		"		" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_upper = _keys + (_klen<<1) - 2;\n"
-		"		while (1) {\n"
-		"			if ( _upper < _lower )\n"
-		"				break;\n"
-		"\n"
-		"			_mid = _lower + (((_upper-_lower) >> 1) & ~1);\n"
-		"			if ( " << GET_WIDE_KEY() << " < _mid[0] )\n"
-		"				_upper = _mid - 2;\n"
-		"			else if ( " << GET_WIDE_KEY() << " > _mid[1] )\n"
-		"				_lower = _mid + 2;\n"
-		"			else {\n"
-		"				switch ( " << C() << "[" << CO() << "[" << vCS() << "]"
-							" + ((_mid - _keys)>>1)] ) {\n";
-
-	for ( CondSpaceList::Iter csi = condSpaceList; csi.lte(); csi++ ) {
-		GenCondSpace *condSpace = csi;
-		out << "	case " << condSpace->condSpaceId << ": {\n";
-		out << TABS(2) << "_widec = " << CAST(WIDE_ALPH_TYPE()) << "(" <<
-				KEY(condSpace->baseKey) << " + (" << GET_KEY() << 
-				" - " << KEY(keyOps->minKey) << "));\n";
-
-		for ( GenCondSet::Iter csi = condSpace->condSet; csi.lte(); csi++ ) {
-			out << TABS(2) << "if ( ";
-			CONDITION( out, *csi );
-			Size condValOffset = ((1 << csi.pos()) * keyOps->alphSize());
-			out << " ) _widec += " << condValOffset << ";\n";
-		}
-
-		out << 
-			"		break;\n"
-			"	}\n";
-	}
-
-	SWITCH_DEFAULT();
-
-	out << 
-		"				}\n"
-		"				break;\n"
-		"			}\n"
-		"		}\n"
-		"	}\n"
-		"\n";
-}
-
-void TabCodeGen::writeExec()
-{
-	testEofUsed = false;
-	outLabelUsed = false;
-
-	out <<
-		"	{\n"
-		"	int _klen";
-
-	if ( redFsm->anyRegCurStateRef() )
-		out << ", _ps";
-
+		"		while (1) {\n" 
+		"			if ( _upper < _lower )\n" 
+		"				break;\n" 
+		"\n" 
+		"			_mid = _lower + (((_upper-_lower) >> 1) & ~1);\n" 
+		"			if ( " << GET_WIDE_KEY() << " < _mid[0] )\n" 
+		"				_upper = _mid - 2;\n" 
+		"			else if ( " << GET_WIDE_KEY() << " > _mid[1] )\n" 
+		"				_lower = _mid + 2;\n" 
+		"			else {\n" 
+		"				switch ( " << C() << "[" << CO() << "[" << vCS() << "]" 
+							" + ((_mid - _keys)>>1)] ) {\n"; 
+ 
+	for ( CondSpaceList::Iter csi = condSpaceList; csi.lte(); csi++ ) { 
+		GenCondSpace *condSpace = csi; 
+		out << "	case " << condSpace->condSpaceId << ": {\n"; 
+		out << TABS(2) << "_widec = " << CAST(WIDE_ALPH_TYPE()) << "(" << 
+				KEY(condSpace->baseKey) << " + (" << GET_KEY() <<  
+				" - " << KEY(keyOps->minKey) << "));\n"; 
+ 
+		for ( GenCondSet::Iter csi = condSpace->condSet; csi.lte(); csi++ ) { 
+			out << TABS(2) << "if ( "; 
+			CONDITION( out, *csi ); 
+			Size condValOffset = ((1 << csi.pos()) * keyOps->alphSize()); 
+			out << " ) _widec += " << condValOffset << ";\n"; 
+		} 
+ 
+		out <<  
+			"		break;\n" 
+			"	}\n"; 
+	} 
+ 
+	SWITCH_DEFAULT(); 
+ 
+	out <<  
+		"				}\n" 
+		"				break;\n" 
+		"			}\n" 
+		"		}\n" 
+		"	}\n" 
+		"\n"; 
+} 
+ 
+void TabCodeGen::writeExec() 
+{ 
+	testEofUsed = false; 
+	outLabelUsed = false; 
+ 
 	out << 
-		";\n"
-		"	" << UINT() << " _trans;\n";
-
-	if ( redFsm->anyConditions() )
-		out << "	" << WIDE_ALPH_TYPE() << " _widec;\n";
-
-	if ( redFsm->anyToStateActions() || redFsm->anyRegActions() 
-			|| redFsm->anyFromStateActions() )
-	{
-		out << 
+		"	{\n" 
+		"	int _klen"; 
+ 
+	if ( redFsm->anyRegCurStateRef() ) 
+		out << ", _ps"; 
+ 
+	out <<  
+		";\n" 
+		"	" << UINT() << " _trans;\n"; 
+ 
+	if ( redFsm->anyConditions() ) 
+		out << "	" << WIDE_ALPH_TYPE() << " _widec;\n"; 
+ 
+	if ( redFsm->anyToStateActions() || redFsm->anyRegActions()  
+			|| redFsm->anyFromStateActions() ) 
+	{ 
+		out <<  
 			"	" << PTR_CONST() << ARRAY_TYPE(redFsm->maxActArrItem) << PTR_CONST_END() << 
-					POINTER() << "_acts;\n"
-			"	" << UINT() << " _nacts;\n";
-	}
-
-	out <<
+					POINTER() << "_acts;\n" 
+			"	" << UINT() << " _nacts;\n"; 
+	} 
+ 
+	out << 
 		"	" << PTR_CONST() << WIDE_ALPH_TYPE() << PTR_CONST_END() << POINTER() << "_keys;\n"
-		"\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 <<
-			"	_acts = " << ARR_OFF( A(),  FSA() + "[" + vCS() + "]" ) << ";\n"
-			"	_nacts = " << CAST(UINT()) << " *_acts++;\n"
-			"	while ( _nacts-- > 0 ) {\n"
-			"		switch ( *_acts++ ) {\n";
-			FROM_STATE_ACTION_SWITCH();
-			SWITCH_DEFAULT() <<
-			"		}\n"
-			"	}\n"
-			"\n";
-	}
-
-	if ( redFsm->anyConditions() )
-		COND_TRANSLATE();
-
-	LOCATE_TRANS();
-
-	out << "_match:\n";
-
-	if ( useIndicies )
-		out << "	_trans = " << I() << "[_trans];\n";
-	
-	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"
-			"	_acts = " << ARR_OFF( A(), TA() + "[_trans]" ) << ";\n"
-			"	_nacts = " << CAST(UINT()) << " *_acts++;\n"
-			"	while ( _nacts-- > 0 )\n	{\n"
-			"		switch ( *_acts++ )\n		{\n";
-			ACTION_SWITCH();
-			SWITCH_DEFAULT() <<
-			"		}\n"
-			"	}\n"
-			"\n";
-	}
-
-	if ( redFsm->anyRegActions() || redFsm->anyActionGotos() || 
-			redFsm->anyActionCalls() || redFsm->anyActionRets() )
-		out << "_again:\n";
-
-	if ( redFsm->anyToStateActions() ) {
-		out <<
-			"	_acts = " << ARR_OFF( A(), TSA() + "[" + vCS() + "]" ) << ";\n"
-			"	_nacts = " << CAST(UINT()) << " *_acts++;\n"
-			"	while ( _nacts-- > 0 ) {\n"
-			"		switch ( *_acts++ ) {\n";
-			TO_STATE_ACTION_SWITCH();
-			SWITCH_DEFAULT() <<
-			"		}\n"
-			"	}\n"
-			"\n";
-	}
-
-	if ( redFsm->errState != 0 ) {
-		outLabelUsed = true;
+		"\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 << 
-			"	if ( " << vCS() << " == " << redFsm->errState->id << " )\n"
-			"		goto _out;\n";
-	}
-
-	if ( !noEnd ) {
+			"	_acts = " << ARR_OFF( A(),  FSA() + "[" + vCS() + "]" ) << ";\n" 
+			"	_nacts = " << CAST(UINT()) << " *_acts++;\n" 
+			"	while ( _nacts-- > 0 ) {\n" 
+			"		switch ( *_acts++ ) {\n"; 
+			FROM_STATE_ACTION_SWITCH(); 
+			SWITCH_DEFAULT() << 
+			"		}\n" 
+			"	}\n" 
+			"\n"; 
+	} 
+ 
+	if ( redFsm->anyConditions() ) 
+		COND_TRANSLATE(); 
+ 
+	LOCATE_TRANS(); 
+ 
+	out << "_match:\n"; 
+ 
+	if ( useIndicies ) 
+		out << "	_trans = " << I() << "[_trans];\n"; 
+	 
+	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 ( ++" << P() << " != " << PE() << " )\n"
-			"		goto _resume;\n";
-	}
-	else {
+			"	if ( " << TA() << "[_trans] == 0 )\n" 
+			"		goto _again;\n" 
+			"\n" 
+			"	_acts = " << ARR_OFF( A(), TA() + "[_trans]" ) << ";\n" 
+			"	_nacts = " << CAST(UINT()) << " *_acts++;\n" 
+			"	while ( _nacts-- > 0 )\n	{\n" 
+			"		switch ( *_acts++ )\n		{\n"; 
+			ACTION_SWITCH(); 
+			SWITCH_DEFAULT() << 
+			"		}\n" 
+			"	}\n" 
+			"\n"; 
+	} 
+ 
+	if ( redFsm->anyRegActions() || redFsm->anyActionGotos() ||  
+			redFsm->anyActionCalls() || redFsm->anyActionRets() ) 
+		out << "_again:\n"; 
+ 
+	if ( redFsm->anyToStateActions() ) { 
 		out << 
-			"	" << 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 = " << ET() << "[" << vCS() << "] - 1;\n"
-				"		goto _eof_trans;\n"
-				"	}\n";
-		}
-
-		if ( redFsm->anyEofActions() ) {
-			out <<
+			"	_acts = " << ARR_OFF( A(), TSA() + "[" + vCS() + "]" ) << ";\n" 
+			"	_nacts = " << CAST(UINT()) << " *_acts++;\n" 
+			"	while ( _nacts-- > 0 ) {\n" 
+			"		switch ( *_acts++ ) {\n"; 
+			TO_STATE_ACTION_SWITCH(); 
+			SWITCH_DEFAULT() << 
+			"		}\n" 
+			"	}\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() ) { 
+		out <<  
+			"	if ( " << P() << " == " << vEOF() << " )\n" 
+			"	{\n"; 
+ 
+		if ( redFsm->anyEofTrans() ) { 
+			out << 
+				"	if ( " << ET() << "[" << vCS() << "] > 0 ) {\n" 
+				"		_trans = " << ET() << "[" << vCS() << "] - 1;\n" 
+				"		goto _eof_trans;\n" 
+				"	}\n"; 
+		} 
+ 
+		if ( redFsm->anyEofActions() ) { 
+			out << 
 				"	" << PTR_CONST() << ARRAY_TYPE(redFsm->maxActArrItem) << PTR_CONST_END() << 
-						POINTER() << "__acts = " << 
-						ARR_OFF( A(), EA() + "[" + vCS() + "]" ) << ";\n"
-				"	" << UINT() << " __nacts = " << CAST(UINT()) << " *__acts++;\n"
-				"	while ( __nacts-- > 0 ) {\n"
-				"		switch ( *__acts++ ) {\n";
-				EOF_ACTION_SWITCH();
-				SWITCH_DEFAULT() <<
-				"		}\n"
-				"	}\n";
-		}
-		
-		out << 
-			"	}\n"
-			"\n";
-	}
-
-	if ( outLabelUsed )
-		out << "	_out: {}\n";
-
-	out << "	}\n";
-}
+						POINTER() << "__acts = " <<  
+						ARR_OFF( A(), EA() + "[" + vCS() + "]" ) << ";\n" 
+				"	" << UINT() << " __nacts = " << CAST(UINT()) << " *__acts++;\n" 
+				"	while ( __nacts-- > 0 ) {\n" 
+				"		switch ( *__acts++ ) {\n"; 
+				EOF_ACTION_SWITCH(); 
+				SWITCH_DEFAULT() << 
+				"		}\n" 
+				"	}\n"; 
+		} 
+		 
+		out <<  
+			"	}\n" 
+			"\n"; 
+	} 
+ 
+	if ( outLabelUsed ) 
+		out << "	_out: {}\n"; 
+ 
+	out << "	}\n"; 
+}