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

[libs/datafile.git] / source / except.h

diff --git a/source/except.h b/source/except.h
index ff256a4449c0a0eef903857ccfc3312dc4f79569..ed9ca2337f98c667a4fa40014f9f8477cdf86314 100644 (file)
--- a/source/except.h
+++ b/source/except.h
@@ -1,21 +1,83 @@
 #ifndef MSP_DATAFILE_EXCEPT_H_
 #define MSP_DATAFILE_EXCEPT_H_
 
-#include <msp/core/except.h>
+#include <stdexcept>
+#include <typeinfo>
 
 namespace Msp {
 namespace DataFile {
 
-class TypeError: public Exception
+class data_error: public std::runtime_error
+{
+private:
+       std::string source;
+       unsigned line;
+
+public:
+       data_error(const std::string &, unsigned, const std::string &);
+       data_error(const std::string &, unsigned, const std::exception &);
+       virtual ~data_error() throw() { }
+
+       const std::string &get_source() const { return source; }
+       unsigned get_line() const { return line; }
+
+private:
+       std::string make_what(const std::string &, unsigned, const std::string &);
+};
+
+
+class parse_error: public std::runtime_error
+{
+public:
+       parse_error(const std::string &);
+       virtual ~parse_error() throw() { }
+};
+
+
+class syntax_error: public std::runtime_error
+{
+public:
+       syntax_error(const std::string &t);
+       virtual ~syntax_error() throw() { }
+};
+
+
+class bad_definition: public std::runtime_error
 {
 public:
-       TypeError(const std::string &w): Exception(w) { }
+       bad_definition(const std::string &w);
+       virtual ~bad_definition() throw() { }
 };
 
-class ParseError: public Exception
+
+class nesting_error: public std::logic_error
+{
+public:
+       nesting_error(const std::string &);
+       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:
-       ParseError(const std::string &w): Exception(w) { }
+       no_collection(const std::type_info &);
 };
 
 } // namespace DataFile