Provide access to the keyword of the current statement

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

diff --git a/source/loader.h b/source/loader.h
index 126de575ba027fb0cd241ee4a8f5beb0654550b7..fe928048508d208aafe339def238a4cdc722dc2d 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,17 +1,8 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
 #include <map>
-#include <msp/io/buffered.h>
 #include <msp/io/file.h>
-#include "except.h"
 #include "loaderaction.h"
 #include "parser.h"
 #include "statement.h"
@@ -39,36 +30,27 @@ 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
 {
 private:
-       struct ActionKey
-       {
-               std::string keyword;
-               std::string signature;
-
-               ActionKey(const std::string &, const std::string &);
-
-               bool operator<(const ActionKey &) const;
-       };
-
-       typedef std::map<ActionKey, LoaderAction *> ActionMap;
+       typedef std::map<StatementKey, LoaderAction *> ActionMap;
 
        ActionMap actions;
+       Parser *cur_parser;
+       unsigned cur_level;
        const Statement *cur_st;
        bool sub_loaded;
+       bool direct;
+       std::list<Loader *> aux_loaders;
 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);
 
@@ -76,6 +58,9 @@ private:
        /** Loads data from a statement. */
        void load(const Statement &st);
 
+       /** Loads statemsnts from a parser, feeding them directly to actions. */
+       void load_direct(Parser &, unsigned);
+
        /** Processes a single statement */
        void load_statement(const Statement &st);
 
@@ -143,56 +128,24 @@ protected:
 private:
        void add(const std::string &, LoaderAction *);
 
-       LoaderAction *find_action(const ActionKey &) const;
+protected:
+       void add_auxiliary_loader(Loader &);
+
+private:
+       bool has_action(const StatementKey &) const;
+       LoaderAction *find_action(const StatementKey &) const;
 
 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() { }
-};
+       const std::string &get_source() const;
 
+       /** Returns the keyword of the statement being processed.  Can be used to
+       implement dynamic keywords. */
+       const std::string &get_keyword() const;
 
-/**
-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; }
-};
-
-
-/**
-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() { }
 };
 
 
@@ -202,10 +155,9 @@ Loads an object from a file.  The object must have a public Loader class.
 template<typename T>
 void load(T &obj, const std::string &fn)
 {
-       IO::File in(fn);
-       IO::Buffered buf(in);
+       IO::BufferedFile in(fn);
 
-       Parser parser(buf, fn);
+       Parser parser(in, fn);
        typename T::Loader loader(obj);
        loader.load(parser);
 }
@@ -213,10 +165,9 @@ void load(T &obj, const std::string &fn)
 template<typename T, typename U>
 void load(T &obj, const std::string &fn, U &arg)
 {
-       IO::File in(fn);
-       IO::Buffered buf(in);
+       IO::BufferedFile in(fn);
 
-       Parser parser(buf, fn);
+       Parser parser(in, fn);
        typename T::Loader loader(obj, arg);
        loader.load(parser);
 }