X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floader.h;h=4a1faa3f7af650ff4f4ec3726cc768fea77255cb;hp=4ea7994e757f76476dda000f20c67fa44e21fee9;hb=b0b9af7216560da2a46ea38fe2df959f4dfb126f;hpb=e4beb0453a1cfe200fc97607afab94c3ddee1c65

diff --git a/source/loader.h b/source/loader.h
index 4ea7994..4a1faa3 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <msp/io/file.h>
-#include "except.h"
 #include "loaderaction.h"
 #include "parser.h"
 #include "statement.h"
@@ -138,12 +137,10 @@ protected:
 	/** Returns the source of the statement being processed.  This can be used
 	to implement relative paths in include-like statements.  Note that the
 	source may not necessarily be a file. */
-	const std::string &get_source() const
-	{
-		if(!cur_st)
-			throw InvalidState("get_source called without current statement");
-		return cur_st->source;
-	}
+	const std::string &get_source() const;
+
+	/** Throws a data_error from the current line. */
+	void error(const std::string &) const;
 
 	virtual void finish() { }
 };