Changeset 11

Timestamp:

06/22/09 22:42:54 (4 years ago)

Author:

mwajcht

Message:

Added some checking against NULLs

Location:

cpp/f8-to-f1

Files:

• conv_f8tof1.cpp (modified) (1 diff)
• geno_f8.cpp (modified) (1 diff)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -697 +697 @@
         cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << endl;
 #endif
+        //final check
+        for (map<string, Production*>::iterator prodIter = lsys->productions.begin();
+                 prodIter != lsys->productions.end(); prodIter++) {
+                for (vector<SubProduction>::iterator subProdIter = prodIter->second->subproductions.begin();
+                         subProdIter != prodIter->second->subproductions.end(); subProdIter++) {
+                        SubProduction subProduction = *subProdIter;
+                        for (vector<ActionStrP>::iterator actionIter = subProduction.actions.begin();
+                                 actionIter != subProduction.actions.end(); actionIter++) {
+                                if ((*actionIter).action == NULL) {
+                                        subProduction.actions.erase(actionIter);
+                                }
+                        }
+                }
+        }
 #if CONV_DEBUG > 0
         cout << "createLsystem() end" << endl;

cpp/f8-to-f1/geno_f8.cpp

@@ -1140 +1140 @@
                         for (vector<ActionStrP>::iterator actionIter = (*subprodIter).actions.begin();
                                  actionIter != (*subprodIter).actions.end(); actionIter++) {
+                                if ((*actionIter).action == NULL) {
+                                        continue;
+                                }
                                 SString &actionName = (*actionIter).action->name;
                                 if (actionName[0] == 'n') {