Changeset 24 for cpp/f8-to-f1/conv_f8tof1.cpp

Timestamp:

06/28/09 19:40:32 (16 years ago)

Author:

mwajcht

Message:

Once again changed 'for' loops inside which vector's element is erased. This time it should be correct, I hope.

File:

• cpp/f8-to-f1/conv_f8tof1.cpp (modified) (3 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -189 +189 @@
                  prodIter != this->productions.end(); prodIter++) {
                 vector<SubProduction> *subproductions = &(prodIter->second->subproductions);
-                for (int i = 0; i < subproductions->size(); i++) {
-                        if (subproductions->at(i).actions.size() == 0) {
-                                subproductions->erase(subproductions->begin() + i);
+                for (vector<SubProduction>::iterator i = subproductions->begin(); i != subproductions->end(); /*nothing*/) {
+                        if ((*i).actions.size() == 0) {
+                                i = subproductions->erase(i);
+                        } else {
+                                i++;
                         }
                 }
@@ -213 +215 @@
                          subProdIter != subproductions->end(); subProdIter++) {
                         SubProduction *sp = &(*subProdIter);
-                        for (int actionIter = 0; actionIter < sp->actions.size(); actionIter++) {
-                                ActionStrP *actionstrp = &(sp->actions.at(actionIter));
-                                if (actionstrp->action != NULL) {
+                        for (vector<ActionStrP>::iterator actionIter = sp->actions.begin(); 
+                                 actionIter != sp->actions.end(); /*nothing*/) {
+                                bool deleted = false;
+                                if ((*actionIter).action != NULL) {
                                         vector<SString>::iterator result = find(emptyProductionNames.begin(), emptyProductionNames.end(), 
-                                                                                                                        actionstrp->action->name);
+                                                                                                                        (*actionIter).action->name);
                                         if (result != emptyProductionNames.end()) { //emptyProductionNames contains the action name
-                                                sp->actions.erase(sp->actions.begin() + actionIter);
-                                        }
+                                                actionIter = sp->actions.erase(actionIter);
+                                                deleted = true;
+                                        }
+                                }
+                                if (!deleted) {
+                                        actionIter++;
                                 }
                         }
@@ -702 +709 @@
                          subProdIter != prodIter->second->subproductions.end(); subProdIter++) {
                         SubProduction subProduction = *subProdIter;
-                        for (int i = 0; i < subProduction.actions.size(); i++) {
-                                if (subProduction.actions.at(i).action == NULL) {
-                                        subProduction.actions.erase(subProduction.actions.begin() + i);
+                        for (vector<ActionStrP>::iterator i = subProduction.actions.begin();
+                                 i != subProduction.actions.end(); /*nothing*/) {
+                                if ((*i).action == NULL) {
+                                        i = subProduction.actions.erase(i);
+                                } else {
+                                        i++;
                                 }
                         }