Renaming to avoid name conflicts following the merge of the frontend and backend.

[external/ragel.git] / rlgen-cd / ipgotocodegen.cpp

diff --git a/rlgen-cd/ipgotocodegen.cpp b/rlgen-cd/ipgotocodegen.cpp
index 220df53..9d10d9f 100644 (file)
--- a/rlgen-cd/ipgotocodegen.cpp
+++ b/rlgen-cd/ipgotocodegen.cpp
@@ -140,7 +140,7 @@ bool IpGotoCodeGen::IN_TRANS_ACTIONS( RedStateAp *state )
                                out << "        " << CS() << " = " << trans->targ->id << ";\n";
 
                        /* Write each action in the list. */
-                       for ( ActionTable::Iter item = trans->action->key; item.lte(); item++ ) {
+                       for ( GenActionTable::Iter item = trans->action->key; item.lte(); item++ ) {
                                ACTION( out, item->value, trans->targ->id, false, 
                                                trans->action->anyNextStmt() );
                        }
@@ -169,7 +169,7 @@ void IpGotoCodeGen::GOTO_HEADER( RedStateAp *state )
        if ( state->toStateAction != 0 ) {
                /* Remember that we wrote an action. Write every action in the list. */
                anyWritten = true;
-               for ( ActionTable::Iter item = state->toStateAction->key; item.lte(); item++ ) {
+               for ( GenActionTable::Iter item = state->toStateAction->key; item.lte(); item++ ) {
                        ACTION( out, item->value, state->id, false, 
                                        state->toStateAction->anyNextStmt() );
                }
@@ -194,7 +194,7 @@ void IpGotoCodeGen::GOTO_HEADER( RedStateAp *state )
        if ( state->fromStateAction != 0 ) {
                /* Remember that we wrote an action. Write every action in the list. */
                anyWritten = true;
-               for ( ActionTable::Iter item = state->fromStateAction->key; item.lte(); item++ ) {
+               for ( GenActionTable::Iter item = state->fromStateAction->key; item.lte(); item++ ) {
                        ACTION( out, item->value, state->id, false,
                                        state->fromStateAction->anyNextStmt() );
                }
@@ -291,7 +291,7 @@ std::ostream &IpGotoCodeGen::FINISH_CASES()
                        anyWritten = true;
 
                        /* Write each action in the eof action list. */
-                       for ( ActionTable::Iter item = act->key; item.lte(); item++ )
+                       for ( GenActionTable::Iter item = act->key; item.lte(); item++ )
                                ACTION( out, item->value, STATE_ERR_STATE, true, false );
                        out << "\tbreak;\n";
                }
@@ -344,7 +344,7 @@ void IpGotoCodeGen::setLabelsNeeded()
                         * invoked on characters (ie, not from out action code). */
                        if ( trans->action != 0 ) {
                                /* Loop the actions. */
-                               for ( ActionTable::Iter act = trans->action->key; act.lte(); act++ ) {
+                               for ( GenActionTable::Iter act = trans->action->key; act.lte(); act++ ) {
                                        /* Get the action and walk it's tree. */
                                        setLabelsNeeded( act->value->inlineList );
                                }