Move MEF specific Error classes to mef namespace

This is needed to further refine the data passed to exceptions.
The MEF specific validation errors should be used
instead of generic InvalidArgument error class.

Issue #219

gui/eventdialog.cpp

@@ -358,7 +358,7 @@ void EventDialog::validate()
                 tr("The event with name '%1' already exists.").arg(name));
             return;
         }
-    } catch (UndefinedElement &) {}
+    } catch (mef::UndefinedElement &) {}
 
     if (!tabFormula->isHidden() && hasFormulaArg(name)) {
         m_errorBar->showMessage(

gui/mainwindow.cpp

@@ -823,7 +823,7 @@ mef::FormulaPtr MainWindow::extract(const EventDialog &dialog)
     for (const std::string &arg : dialog.arguments()) {
         try {
             formula->AddArgument(m_model->GetEvent(arg));
-        } catch (UndefinedElement &) {
+        } catch (mef::UndefinedElement &) {
             auto argEvent = std::make_unique<mef::BasicEvent>(arg);
             argEvent->AddAttribute({"flavor", "undeveloped", ""});
             formula->AddArgument(argEvent.get());

src/error.h

@@ -84,11 +84,39 @@ class Error : virtual public std::exception, virtual public boost::exception {
   std::string thrown_;  ///< The message to throw with the prefix.
 };
 
+/// For input/output related errors.
+struct IOError : public Error {
+  using Error::Error;
+};
+
+/// This error class can be used
+/// to indicate unacceptable arguments.
+struct InvalidArgument : public Error {
+  using Error::Error;
+};
+
+/// Signals internal logic errors,
+/// for example, pre-condition failure
+/// or use of functionality in ways not designed to.
+struct LogicError : public Error {
+  using Error::Error;
+};
+
+/// This error can be used to indicate
+/// that call for a function or operation is not legal.
+/// For example, a derived class can make illegal
+/// the call of the virtual function of the base class.
+struct IllegalOperation : public Error {
+  using Error::Error;
+};
+
 /// The error in analysis settings.
 struct SettingsError : public Error {
   using Error::Error;
 };
 
+namespace mef {  // MEF specific errors.
+
 /// For validating input parameters or user arguments.
 struct ValidationError : public Error {
   using Error::Error;
@@ -114,31 +142,7 @@ struct CycleError : public ValidationError {
   using ValidationError::ValidationError;
 };
 
-/// For input/output related errors.
-struct IOError : public Error {
-  using Error::Error;
-};
-
-/// This error class can be used
-/// to indicate unacceptable arguments.
-struct InvalidArgument : public Error {
-  using Error::Error;
-};
-
-/// Signals internal logic errors,
-/// for example, pre-condition failure
-/// or use of functionality in ways not designed to.
-struct LogicError : public Error {
-  using Error::Error;
-};
-
-/// This error can be used to indicate
-/// that call for a function or operation is not legal.
-/// For example, a derived class can make illegal
-/// the call of the virtual function of the base class.
-struct IllegalOperation : public Error {
-  using Error::Error;
-};
+}  // namespace mef
 
 }  // namespace scram
 

src/xml.h

@@ -59,11 +59,7 @@ namespace scram {
 
 namespace xml {
 
-class Element;
-
-}  // namespace xml
-
-namespace xml {
+using mef::ValidationError;  ///< @todo Create XML specific exception classes.
 
 using string_view = boost::string_ref;  ///< Non-owning, immutable string view.
 

tests/config_tests.cc

@@ -34,13 +34,13 @@ TEST(ConfigTest, IOError) {
 // Test with XML content validation issues.
 TEST(ConfigTest, ValidationError) {
   std::string config_file = "./share/scram/input/fta/invalid_configuration.xml";
-  ASSERT_THROW(Config config(config_file), ValidationError);
+  ASSERT_THROW(Config config(config_file), xml::ValidationError);
 }
 
 // Test with XML content numerical issues.
 TEST(ConfigTest, NumericalErrors) {
   std::string config_file = "./share/scram/input/fta/int_overflow_config.xml";
-  ASSERT_THROW(Config config(config_file), ValidationError);
+  ASSERT_THROW(Config config(config_file), xml::ValidationError);
 }
 
 // Tests all settings with one file.