More flexible framework for loading substatements with custom loaders

diff --git a/source/loader.cpp b/source/loader.cpp
index 284588afde9fba1462d4808d9891f49569b9c650..e4993868ab3adfac95c385ef7c5d9e6a3c638a1c 100644 (file)
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -36,6 +36,14 @@ Loader::~Loader()
                delete i->second;
 }
 
+void Loader::load_sub_with(Loader &ldr)
+{
+       if(!cur_st)
+               throw InvalidState("load_sub called without current statement");
+
+       ldr.load(*cur_st);
+}
+
 void Loader::add(const string &k, LoaderAction *a)
 {
        ActionMap::iterator i=actions.find(k);

diff --git a/source/loader.h b/source/loader.h
index a7d2dbdfbc9eb70f191e9e9c979f355a55174315..5f4037c73dbedbe846cd13213b31784b1510df2d 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -302,37 +302,27 @@ protected:
        */
        template<typename S>
        void load_sub(S &s)
-       { load_sub<typename S::Loader, S>(s); }
-
-       /**
-       Loads a sub-object with a custom Loader class.
-       */
-       template<typename L, typename S>
-       void load_sub(S &s)
        {
-               if(!cur_st)
-                       throw InvalidState("load_sub called without current statement");
-               L loader(s);
-               loader.load(*cur_st);
+               typename S::Loader ldr(s);
+               load_sub_with(ldr);
        }
 
-       template<typename S, typename T>
-       void load_sub(S &s, T &p)
-       { load_sub<typename S::Loader, S, T>(s, p); }
-
        /**
-       Loads a sub-object with a custom Loader class that takes one argument in
-       addition to to object to be loaded.
+       Loads a sub-object from the statement being processed with an extra parameter
+       for the Loader.  The Loader class of the sub-object is automatically used.
        */
-       template<typename L, typename S, typename T>
+       template<typename S, typename T>
        void load_sub(S &s, T &p)
        {
-               if(!cur_st)
-                       throw InvalidState("load_sub called without current statement");
-               L loader(s, p);
-               loader.load(*cur_st);
+               typename S::Loader ldr(s, p);
+               load_sub_with(ldr);
        }
 
+       /**
+       Processes the current statement's substatements with another Loader.
+       */
+       void load_sub_with(Loader &);
+
        /**
        Returns the source of the statement being processed.  This can be used to
        implement relative paths in include-like statements.  Note that the source