Make Loader::ActionMap delete the actions

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

diff --git a/source/loader.h b/source/loader.h
index 7799a7eacb5dd404915f25cbfe87f0665f515436..fe8f0aa54f7621939b1bc2cba946f0f10ca58d0d 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -33,12 +33,18 @@ destructor.
 
 See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
-class Loader
+class Loader: private NonCopyable
 {
-private:
-       typedef std::map<StatementKey, LoaderAction *> ActionMap;
+protected:
+       class ActionMap: public std::map<StatementKey, LoaderAction *>, private NonCopyable
+       {
+       public:
+               ~ActionMap();
+       };
 
-       ActionMap actions;
+private:
+       ActionMap local_actions;
+       ActionMap *actions;
        Parser *cur_parser;
        unsigned cur_level;
        const Statement *cur_st;
@@ -50,7 +56,7 @@ protected:
 
        Loader();
 public:
-       virtual ~Loader();
+       virtual ~Loader() { }
 
        /** Loads statements from a parser. */
        void load(Parser &p);
@@ -88,6 +94,11 @@ protected:
        /** Processes the current statement's substatements with another Loader. */
        void load_sub_with(Loader &);
 
+       /** Sets the actions to be used when loading.  If the map is empty,
+       init_actions will be called. */
+       void set_actions(ActionMap &);
+       virtual void init_actions() { }
+
        /** Adds a keyword that is loaded by calling a function. */
        template<typename L>
        void add(const std::string &k, void (L::*func)())