Convenience function for reporting errors in loaded data

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

diff --git a/source/loader.h b/source/loader.h
index 3c4785c493017eadeef3f2c20bb70e05b4bb9cf8..4a1faa3f7af650ff4f4ec3726cc768fea77255cb 100644 (file)
--- 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"
@@ -31,7 +30,7 @@ When loading has finished successfully, the virtual function finish() is
 called.  Any post-processing of the data should be placed here and not in the
 destructor.
 
-See also classes BasicLoader and BasicLoader2.
+See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
 class Loader
 {
@@ -52,15 +51,12 @@ private:
        const Statement *cur_st;
        bool sub_loaded;
 protected:
-       bool allow_pointer_reload;
        bool check_sub_loads;
 
        Loader();
 public:
        virtual ~Loader();
 
-       bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
-
        /** Loads statements from a parser. */
        void load(Parser &p);
 
@@ -141,50 +137,12 @@ 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;
-       }
-
-       virtual void finish() { }
-};
-
-
-/**
-Deprecated.  See ObjectLoader in objectloader.h.
-*/
-template<typename O>
-class BasicLoader: public Loader
-{
-public:
-       typedef O Object;
-
-protected:
-       O &obj;
-
-public:
-       BasicLoader(O &o): obj(o) { }
-       O &get_object() const { return obj; }
-};
+       const std::string &get_source() const;
 
+       /** Throws a data_error from the current line. */
+       void error(const std::string &) const;
 
-/**
-Deprecated.  See CollectionObjectLoader in objectloader.h.
-*/
-template<typename O, typename C>
-class BasicLoader2: public BasicLoader<O>
-{
-public:
-       typedef C Collection;
-
-protected:
-       C &coll;
-
-public:
-       BasicLoader2(O &o, C &c): BasicLoader<O>(o), coll(c) { }
-       C &get_collection() const { return coll; }
+       virtual void finish() { }
 };