Move all exception classes to except.h, for real this time

diff --git a/source/except.cpp b/source/except.cpp
index eea692e06fd6ee042a3732a52f4ee5fcb96812a8..d3929f6c7a8592fb6cf26fef9956c9e916f7965d 100644 (file)
--- a/source/except.cpp
+++ b/source/except.cpp
@@ -1,4 +1,3 @@
-#include <typeinfo>
 #include <msp/debug/demangle.h>
 #include <msp/strings/format.h>
 #include "except.h"
@@ -48,5 +47,20 @@ nesting_error::nesting_error(const string &w):
        logic_error(w)
 { }
 
+
+unknown_keyword::unknown_keyword(const string &k):
+       runtime_error(k)
+{ }
+
+
+invalid_signature::invalid_signature(const string &k, const string &s):
+       runtime_error(format("%s %s", k, s))
+{ }
+
+
+no_collection::no_collection(const type_info &t):
+       runtime_error(Debug::demangle(t.name()))
+{ }
+
 } // namespace DataFile
 } // namespace Msp

diff --git a/source/except.h b/source/except.h
index e68ec481f4aa869ada66a660c59e06e195b6b34b..ed9ca2337f98c667a4fa40014f9f8477cdf86314 100644 (file)
--- a/source/except.h
+++ b/source/except.h
@@ -2,6 +2,7 @@
 #define MSP_DATAFILE_EXCEPT_H_
 
 #include <stdexcept>
+#include <typeinfo>
 
 namespace Msp {
 namespace DataFile {
@@ -56,6 +57,29 @@ public:
        virtual ~nesting_error() throw() { }
 };
 
+
+class unknown_keyword: public std::runtime_error
+{
+public:
+       unknown_keyword(const std::string &);
+       virtual ~unknown_keyword() throw() { }
+};
+
+
+class invalid_signature: public std::runtime_error
+{
+public:
+       invalid_signature(const std::string &, const std::string &);
+       virtual ~invalid_signature() throw() { }
+};
+
+
+class no_collection: public std::runtime_error
+{
+public:
+       no_collection(const std::type_info &);
+};
+
 } // namespace DataFile
 } // namespace Msp
 

diff --git a/source/loader.cpp b/source/loader.cpp
index 4bc715aff01597c4164f19b206f5a31ae8db87fb..81fd27eecebf87c16e3418ae6d11e3ead9ba8d80 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -47,28 +47,6 @@ bool signature_match(const string &st_sig, const string &act_sig)
 namespace Msp {
 namespace DataFile {
 
-class unknown_keyword: public runtime_error
-{
-public:
-       unknown_keyword(const std::string &k):
-               runtime_error(k)
-       { }
-
-       virtual ~unknown_keyword() throw() { }
-};
-
-
-class invalid_signature: public runtime_error
-{
-public:
-       invalid_signature(const std::string &k, const std::string &s):
-               runtime_error(format("%s %s", k, s))
-       { }
-
-       virtual ~invalid_signature() throw() { }
-};
-
-
 Loader::Loader():
        cur_st(0),
        direct(false),

diff --git a/source/objectloader.cpp b/source/objectloader.cpp
deleted file mode 100644 (file)
index 6d59812..0000000
--- a/source/objectloader.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <msp/debug/demangle.h>
-#include "objectloader.h"
-
-using namespace std;
-
-namespace Msp {
-namespace DataFile {
-
-no_collection::no_collection(const type_info &t):
-       runtime_error(Debug::demangle(t.name()))
-{ }
-
-} // namespace DataFile
-} // namespace Msp

diff --git a/source/objectloader.h b/source/objectloader.h
index 76fc412abed60db13c7b7e4b80837ffad0ca93df..e383109f791937739c7e80e5e3d10486bc1641ff 100644 (file)
--- a/source/objectloader.h
+++ b/source/objectloader.h
@@ -1,18 +1,12 @@
 #ifndef MSP_DATAFILE_OBJECTLOADER_H_
 #define MSP_DATAFILE_OBJECTLOADER_H_
 
-#include <typeinfo>
+#include "except.h"
 #include "loader.h"
 
 namespace Msp {
 namespace DataFile {
 
-class no_collection: public std::runtime_error
-{
-public:
-       no_collection(const std::type_info &);
-};
-
 class Collection;
 
 /**