remove some clumsiness of previous commit

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25302 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 28, 2015 · 5bffb6b · 5bffb6b
1 parent 0aa3aa3
commit 5bffb6b
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -2127,26 +2127,22 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
           if ((it = opts.find(argv[i])) != opts.end() && i < argc - 1)
               opts[it->first] = argv[++i]; // regular override
           else if (strncmp(argv[i], "-override=", 10) == 0) {
-              override = "-override=";
+              std::map<std::string, std::string> supported = map_list_of
+                  ("startTime", "-s")("stopTime", "-e")("stepSize", "-f")
+                  ("tolerance", "-y")("solver", "-i")("outputFormat", "-o");
               std::vector<std::string> strs;
               boost::split(strs, argv[i], boost::is_any_of(",="));
               for (int j = 1; j < strs.size(); j++) {
-                  if (strs[j] == "startTime" && j < strs.size() - 1)
-                      opts["-s"] = strs[++j];
-                  else if (strs[j] == "stopTime" && j < strs.size() - 1)
-                      opts["-e"] = strs[++j];
-                  else if (strs[j] == "stepSize" && j < strs.size() - 1)
-                      opts["-f"] = strs[++j];
-                  else if (strs[j] == "tolerance" && j < strs.size() - 1)
-                      opts["-y"] = strs[++j];
-                  else if (strs[j] == "solver" && j < strs.size() - 1)
-                      opts["-i"] = strs[++j];
-                  else if (strs[j] == "outputFormat" && j < strs.size() - 1)
-                      opts["-o"] = strs[++j];
+                  if ((it = supported.find(strs[j])) != supported.end()
+                      && j < strs.size() - 1) {
+                      opts[it->second] = strs[++j];
+                  }
                   else {
                       // leave untreated overrides
-                      if (override.size() > 10)
+                      if (override.size() > 0)
                           override += ",";
+                      else
+                          override = "-override=";
                       override += strs[j];
                       if (j < strs.size() - 1)
                           override += "=" + strs[++j];