X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=rlgen-csharp%2Ftabcodegen.cpp;h=ab1a67260b2d560aaab4d248a2f35f78caf6dad1;hb=b7bbc4afa85019ccddd4a8ecb297619a12930500;hp=c209d473e901aaab0aba79bc01b6f90844b387a4;hpb=8ca48cc3abef6eea4c1a15e61ce4c268978d98e9;p=external%2Fragel.git

diff --git a/rlgen-csharp/tabcodegen.cpp b/rlgen-csharp/tabcodegen.cpp
index c209d47..ab1a672 100644
--- a/rlgen-csharp/tabcodegen.cpp
+++ b/rlgen-csharp/tabcodegen.cpp
@@ -95,7 +95,7 @@ std::ostream &CSharpTabCodeGen::TRANS_ACTION( RedTransAp *trans )
 std::ostream &CSharpTabCodeGen::TO_STATE_ACTION_SWITCH()
 {
 	/* Walk the list of functions, printing the cases. */
-	for ( ActionList::Iter act = actionList; act.lte(); act++ ) {
+	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. */
@@ -112,7 +112,7 @@ std::ostream &CSharpTabCodeGen::TO_STATE_ACTION_SWITCH()
 std::ostream &CSharpTabCodeGen::FROM_STATE_ACTION_SWITCH()
 {
 	/* Walk the list of functions, printing the cases. */
-	for ( ActionList::Iter act = actionList; act.lte(); act++ ) {
+	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. */
@@ -129,7 +129,7 @@ std::ostream &CSharpTabCodeGen::FROM_STATE_ACTION_SWITCH()
 std::ostream &CSharpTabCodeGen::EOF_ACTION_SWITCH()
 {
 	/* Walk the list of functions, printing the cases. */
-	for ( ActionList::Iter act = actionList; act.lte(); act++ ) {
+	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. */
@@ -147,7 +147,7 @@ std::ostream &CSharpTabCodeGen::EOF_ACTION_SWITCH()
 std::ostream &CSharpTabCodeGen::ACTION_SWITCH()
 {
 	/* Walk the list of functions, printing the cases. */
-	for ( ActionList::Iter act = actionList; act.lte(); act++ ) {
+	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. */
@@ -357,7 +357,7 @@ std::ostream &CSharpTabCodeGen::COND_KEYS()
 	int totalTrans = 0;
 	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
 		/* Loop the state's transitions. */
-		for ( StateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
+		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
 			/* Lower key. */
 			out << ALPHA_KEY( sc->lowKey ) << ", ";
 			if ( ++totalTrans % IALL == 0 )
@@ -382,7 +382,7 @@ std::ostream &CSharpTabCodeGen::COND_SPACES()
 	int totalTrans = 0;
 	for ( RedStateList::Iter st = redFsm->stateList; st.lte(); st++ ) {
 		/* Loop the state's transitions. */
-		for ( StateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
+		for ( GenStateCondList::Iter sc = st->stateCondList; sc.lte(); sc++ ) {
 			/* Cond Space id. */
 			out << sc->condSpace->condSpaceId << ", ";
 			if ( ++totalTrans % IALL == 0 )
@@ -896,13 +896,13 @@ void CSharpTabCodeGen::COND_TRANSLATE()
 							" + ((_mid - _keys)>>1)] ) {\n";
 
 	for ( CondSpaceList::Iter csi = condSpaceList; csi.lte(); csi++ ) {
-		CondSpace *condSpace = 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 ( CondSet::Iter csi = condSpace->condSet; csi.lte(); csi++ ) {
+		for ( GenCondSet::Iter csi = condSpace->condSet; csi.lte(); csi++ ) {
 			out << TABS(2) << "if ( ";
 			CONDITION( out, *csi );
 			Size condValOffset = ((1 << csi.pos()) * keyOps->alphSize());