Changes in src/Parser/FormatParser_Parameters.cpp [7f570c:41d023]

File:

• src/Parser/FormatParser_Parameters.cpp (modified) (2 diffs)

src/Parser/FormatParser_Parameters.cpp

@@ -129 +129 @@
       iter != params.storage->getEndIter();
       ++iter)
-    output << iter->first
-           <<  "=" << iter->second->get() << ";";
+    if (!iter->second->get().empty())
+      output << iter->first <<  "=" << iter->second->get() << ";";
   ost << output.str();
   return ost;
@@ -160 +160 @@
     if (paramtokens.begin() != paramtokens.end()) {
       tokenizer::iterator tok_paramiter = paramtokens.begin();
+      ASSERT(tok_paramiter != paramtokens.end(),
+          "operator<< on FormatParser_Parameters - missing value before ' =' in token "+*tok_iter+"!");
       tokenizer::iterator tok_valueiter = tok_paramiter;
       tokenizer::iterator tok_checkiter = ++tok_valueiter;
-      ++tok_checkiter;
-      LOG(3, "INFO: key is '" << *tok_paramiter << "', value is '" << *tok_valueiter << "'.");
-      // TODO: throw exception instead of ASSERT
-      ASSERT(tok_paramiter != paramtokens.end(),
-          "operator<< on FormatParser_Parameters - missing value before ' =' in token "+*tok_iter+"!");
       ASSERT(tok_valueiter != paramtokens.end(),
           "operator<< on FormatParser_Parameters - missing value after ' =' in token "+*tok_iter+"!");
+      ++tok_checkiter;
       ASSERT(tok_checkiter == paramtokens.end(),
           "operator<< on FormatParser_Parameters - still more tokens after ' =' in token "+*tok_iter+":"
           +*tok_checkiter+"!");
+      LOG(3, "INFO: key is '" << *tok_paramiter << "', value is '" << *tok_valueiter << "'.");
+      // TODO: throw exception instead of ASSERT
       std::string key(*tok_paramiter);
       std::string value(*tok_valueiter);