X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fexcept.h;h=e68ec481f4aa869ada66a660c59e06e195b6b34b;hb=ed78b585cfc4ecb44972e346857e887b183fd7a7;hp=7892db5be1c292a34ff9c239d0d309b937f708fb;hpb=256f7238bc60d6dcc31a564988f5cc02a60c4537;p=libs%2Fdatafile.git

diff --git a/source/except.h b/source/except.h
index 7892db5..e68ec48 100644
--- a/source/except.h
+++ b/source/except.h
@@ -1,28 +1,59 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_EXCEPT_H_
 #define MSP_DATAFILE_EXCEPT_H_
 
-#include <msp/core/except.h>
+#include <stdexcept>
 
 namespace Msp {
 namespace DataFile {
 
-class TypeError: public Exception
+class data_error: public std::runtime_error
 {
+private:
+	std::string source;
+	unsigned line;
+
 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 &);
+	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 ParseError: public Exception
+
+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:
+	bad_definition(const std::string &w);
+	virtual ~bad_definition() throw() { }
+};
+
+
+class nesting_error: public std::logic_error
 {
 public:
-	ParseError(const std::string &w): Exception(w) { }
+	nesting_error(const std::string &);
+	virtual ~nesting_error() throw() { }
 };
 
 } // namespace DataFile