Use mef::errinfo_container for MEF errors

MEF containers can act as namespaces
to clarify the error location.
This is currently used for event trees.

Issue #219

src/error.h

@@ -114,6 +114,9 @@ struct SettingsError : public Error {
 
 namespace mef {  // MEF specific errors.
 
+/// The MEF container element as namespace.
+using errinfo_container = boost::error_info<struct tag_contianer, std::string>;
+
 /// For validating input parameters or user arguments.
 struct ValidityError : public Error {
   using Error::Error;

src/initializer.cc

@@ -751,7 +751,7 @@ void Initializer::DefineBranchTarget(const xml::Element& target_node,
         event_tree->Add(std::move(fork));
         (*it)->usage(true);
       } catch (ValidityError& err) {
-        err.msg("In event tree " + event_tree->name() + ", " + err.msg());
+        err << errinfo_container("Event tree '" + event_tree->name() + "'");
         throw;
       }
     } else {
@@ -1541,7 +1541,7 @@ void Initializer::ValidateInitialization() {
     try {
       cycle::CheckCycle<NamedBranch>(event_tree->branches(), "branch");
     } catch (CycleError& err) {
-      err.msg("In event tree " + event_tree->name() + ", " + err.msg());
+      err << errinfo_container("Event tree '" + event_tree->name() + "'");
       throw;
     }
   }
@@ -1556,7 +1556,7 @@ void Initializer::ValidateInitialization() {
       CheckFunctionalEventOrder(event_tree->initial_state());
       EnsureLinksOnlyInSequences(event_tree->initial_state());
     } catch (ValidityError& err) {
-      err.msg("In event tree " + event_tree->name() + ", " + err.msg());
+      err << errinfo_container("Event tree '" + event_tree->name() + "'");
       throw;
     }
   }
@@ -1572,7 +1572,7 @@ void Initializer::ValidateInitialization() {
       }
       EnsureHomogeneousEventTree(event_tree->initial_state());
     } catch (ValidityError& err) {
-      err.msg("In event tree " + event_tree->name() + ", " + err.msg());
+      err << errinfo_container("Event tree '" + event_tree->name() + "'");
       throw;
     }
   }

src/scram.cc

@@ -310,11 +310,12 @@ int main(int argc, char* argv[]) {
 
 #ifdef NDEBUG
   } catch (const scram::IOError& err) {
-    std::cerr << boost::core::demangled_name(typeid(err)) << "\n";
+    LOG(scram::DEBUG1) << boost::diagnostic_information(err);
+    std::cerr << boost::core::demangled_name(typeid(err)) << "\n\n";
     const std::string* filename =
         boost::get_error_info<boost::errinfo_file_name>(err);
     assert(filename);
-    std::cerr << "\nFile: " << *filename << "\n";
+    std::cerr << "File: " << *filename << "\n";
     if (const std::string* mode =
             boost::get_error_info<boost::errinfo_file_open_mode>(err)) {
       std::cerr << "Open mode: " << *mode << "\n";
@@ -327,13 +328,18 @@ int main(int argc, char* argv[]) {
     std::cerr << "\n" << err.what() << std::endl;
     return 1;
   } catch (const scram::Error& err) {
-    std::cerr << boost::core::demangled_name(typeid(err)) << "\n";
+    LOG(scram::DEBUG1) << boost::diagnostic_information(err);
+    std::cerr << boost::core::demangled_name(typeid(err)) << "\n\n";
     if (const std::string* filename =
             boost::get_error_info<boost::errinfo_file_name>(err)) {
-      std::cerr << "\nFile: " << *filename << "\n";
+      std::cerr << "File: " << *filename << "\n";
       if (const int* line = boost::get_error_info<boost::errinfo_at_line>(err))
         std::cerr << "Line: " << *line << "\n";
     }
+    if (const std::string* container =
+            boost::get_error_info<scram::mef::errinfo_container>(err)) {
+      std::cerr << "MEF Container: " << *container << "\n";
+    }
     std::cerr << "\n" << err.what() << std::endl;
     return 1;
   } catch (const boost::exception& boost_err) {