Handle properly the exceptions returned by FGCondition (#1244)

Author: bcoconni

src/input_output/FGScript.cpp

@@ -241,11 +241,12 @@ bool FGScript::LoadScript(const SGPath& script, double default_dT,
 
     // Process the conditions
     Element* condition_element = event_element->FindElement("condition");
-    if (condition_element != 0) {
+    if (condition_element) {
       try {
         newCondition = new FGCondition(condition_element, PropertyManager);
-      } catch(string& str) {
-        cout << endl << fgred << str << reset << endl << endl;
+      } catch(BaseException& e) {
+        cerr << condition_element->ReadFrom()
+             << fgred << e.what() << reset << endl << endl;
         delete newEvent;
         return false;
       }

src/math/FGCondition.cpp

@@ -65,9 +65,7 @@ FGCondition::FGCondition(Element* element, std::shared_ptr<FGPropertyManager> Pr
     if (logic == "OR") Logic = eOR;
     else if (logic == "AND") Logic = eAND;
     else { // error
-      cerr << element->ReadFrom()
-           << "Unrecognized LOGIC token " << logic << endl;
-      throw BaseException("FGCondition: unrecognized logic value:'" + logic + "'");
+      throw BaseException("FGCondition: unrecognized LOGIC token:'" + logic + "'");
     }
   } else {
     Logic = eAND; // default
@@ -87,21 +85,14 @@ FGCondition::FGCondition(Element* element, std::shared_ptr<FGPropertyManager> Pr
     string tagName = condition_element->GetName();
 
     if (tagName != elName) {
-      cerr << condition_element->ReadFrom()
-           << "Unrecognized tag <" << tagName << "> in the condition statement."
-           << endl;
-      throw BaseException("FGCondition: unrecognized tag:'" + tagName + "'");
+      throw BaseException("FGCondition: unrecognized TAG:'" + tagName + "' in the condition statement.");
     }
 
     conditions.push_back(make_shared<FGCondition>(condition_element, PropertyManager));
     condition_element = element->GetNextElement();
   }
 
-  if (conditions.empty()) {
-    cerr << element->ReadFrom()
-         << "Empty conditional" << endl;
-    throw BaseException("Empty conditional");
-  }
+  if (conditions.empty()) throw BaseException("Empty conditional");
 
   Debug(0);
 }
@@ -143,11 +134,11 @@ FGCondition::FGCondition(const string& test, std::shared_ptr<FGPropertyManager>
     conditional = test_strings[1];
     TestParam2 = new FGParameterValue(test_strings[2], PropertyManager, el);
   } else {
-    cerr << el->ReadFrom()
-         << "  Conditional test is invalid: \"" << test
-         << "\" has " << test_strings.size() << " elements in the "
-         << "test condition." << endl;
-    throw BaseException("FGCondition: incorrect number of test elements:" + std::to_string(test_strings.size()));
+    ostringstream s;
+    s << "  Conditional test is invalid: \"" << test
+      << "\" has " << test_strings.size() << " elements in the "
+      << "test condition.\n";
+    throw BaseException(s.str());
   }
 
   assert(Comparison == ecUndef);

src/models/flight_control/FGDistributor.cpp

@@ -63,14 +63,21 @@ FGDistributor::FGDistributor(FGFCS* fcs, Element* element)
   if (type_string == "inclusive") Type = eInclusive;
   else if (type_string == "exclusive") Type = eExclusive;
   else {
-    throw("Not a known Distributor type, "+type_string);
+    throw BaseException("Not a known Distributor type, "+type_string);
   }
 
   Element* case_element = element->FindElement("case");
   while (case_element) {
     Case* current_case = new Case;
     Element* test_element = case_element->FindElement("test");
-    if (test_element) current_case->SetTest(new FGCondition(test_element, PropertyManager));
+    try {
+      if (test_element) current_case->SetTest(new FGCondition(test_element, PropertyManager));
+    } catch (BaseException& e) {
+      FGXMLLogging log(fcs->GetExec()->GetLogger(), test_element, LogLevel::FATAL);
+      log << LogFormat::RED << e.what() << LogFormat::RESET << "\n\n";
+      delete current_case;
+      throw;
+    }
     Element* prop_val_element = case_element->FindElement("property");
     while (prop_val_element) {
       string value_string = prop_val_element->GetAttributeValue("value");