X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexcept.h;h=3ae83465496b4bc3d050840f6541e04a941c4f18;hb=refs%2Fheads%2Fwip;hp=ff256a4449c0a0eef903857ccfc3312dc4f79569;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/except.h b/source/except.h
index ff256a4..3ae8346 100644
--- a/source/except.h
+++ b/source/except.h
@@ -1,21 +1,79 @@
 #ifndef MSP_DATAFILE_EXCEPT_H_
 #define MSP_DATAFILE_EXCEPT_H_
 
-#include <msp/core/except.h>
+#include <stdexcept>
+#include <string>
+#include <typeinfo>
+#include "mspdatafile_api.h"
 
 namespace Msp {
 namespace DataFile {
 
-class TypeError: public Exception
+class MSPDATAFILE_API data_error: public std::runtime_error
+{
+private:
+	std::string source;
+	unsigned line = 0;
+
+public:
+	data_error(const std::string &, unsigned, const std::string &);
+	data_error(const std::string &, unsigned, const std::exception &);
+	data_error(const std::string &, unsigned, const data_error &);
+
+	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 MSPDATAFILE_API parse_error: public std::runtime_error
+{
+public:
+	parse_error(const std::string &);
+};
+
+
+class MSPDATAFILE_API syntax_error: public std::runtime_error
+{
+public:
+	syntax_error(const std::string &t);
+};
+
+
+class MSPDATAFILE_API bad_definition: public std::runtime_error
 {
 public:
-	TypeError(const std::string &w): Exception(w) { }
+	bad_definition(const std::string &w);
 };
 
-class ParseError: public Exception
+
+class MSPDATAFILE_API nesting_error: public std::logic_error
+{
+public:
+	nesting_error(const std::string &);
+};
+
+
+class MSPDATAFILE_API unknown_keyword: public std::runtime_error
+{
+public:
+	unknown_keyword(const std::string &);
+};
+
+
+class MSPDATAFILE_API invalid_signature: public std::runtime_error
+{
+public:
+	invalid_signature(const std::string &, const std::string &);
+};
+
+
+class MSPDATAFILE_API no_collection: public std::runtime_error
 {
 public:
-	ParseError(const std::string &w): Exception(w) { }
+	no_collection(const std::type_info &);
 };
 
 } // namespace DataFile