X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexcept.h;h=8357c7e33b8ce5d25f9d03c4557869cd52dab48e;hb=HEAD;hp=4573e947297dedd3f8311b92842d7f62faa98aa4;hpb=aa8bfd3c13848dc27947d3947038bd66c258d288;p=libs%2Fdatafile.git

diff --git a/source/except.h b/source/except.h
index 4573e94..8357c7e 100644
--- a/source/except.h
+++ b/source/except.h
@@ -1,33 +1,85 @@
-/* $Id$
+#ifndef MSP_DATAFILE_EXCEPT_H_
+#define MSP_DATAFILE_EXCEPT_H_
 
-This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_DATAFILE_ERROR_H_
-#define MSP_DATAFILE_ERROR_H_
-
-#include <msp/core/except.h>
+#include <stdexcept>
+#include <string>
+#include <typeinfo>
 
 namespace Msp {
 namespace DataFile {
 
-class TypeError: public Exception
+class data_error: public std::runtime_error
 {
+private:
+	std::string source;
+	unsigned line = 0;
+
 public:
-	TypeError(const std::string &w_): Exception(w_) { }
+	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 &);
+	~data_error() throw() override = default;
+
+	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 ParseError: public Exception
+
+class parse_error: public std::runtime_error
 {
 public:
-	ParseError(const std::string &w_, const std::string &s, unsigned l): Exception(w_), source(s), line(l) { }
-	const std::string &get_source() const { return source; }
-	unsigned          get_line() const    { return line; }
-	~ParseError() throw() { }
-private:
-	std::string source;
-	unsigned    line;
+	parse_error(const std::string &);
+	~parse_error() throw() override = default;
+};
+
+
+class syntax_error: public std::runtime_error
+{
+public:
+	syntax_error(const std::string &t);
+	~syntax_error() throw() override = default;
+};
+
+
+class bad_definition: public std::runtime_error
+{
+public:
+	bad_definition(const std::string &w);
+	~bad_definition() throw() override = default;
+};
+
+
+class nesting_error: public std::logic_error
+{
+public:
+	nesting_error(const std::string &);
+	~nesting_error() throw() override = default;
+};
+
+
+class unknown_keyword: public std::runtime_error
+{
+public:
+	unknown_keyword(const std::string &);
+	~unknown_keyword() throw() override = default;
+};
+
+
+class invalid_signature: public std::runtime_error
+{
+public:
+	invalid_signature(const std::string &, const std::string &);
+	~invalid_signature() throw() override = default;
+};
+
+
+class no_collection: public std::runtime_error
+{
+public:
+	no_collection(const std::type_info &);
 };
 
 } // namespace DataFile