Require mspcore instead of mspmisc

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

diff --git a/source/loader.h b/source/loader.h
index 6e9c4f8012e42c952a36bc21f392a7559ef22e47..39a50d0b7fe4a56b88a28ec1be68c82e78ed0d5e 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -6,8 +6,9 @@ Distributed under the LGPL
 #ifndef MSP_PARSER_LOADER_H_
 #define MSP_PARSER_LOADER_H_
 
+#include <fstream>
 #include <map>
-#include <msp/error.h>
+#include "error.h"
 #include "parser.h"
 #include "statement.h"
 #include "value.h"
@@ -36,7 +37,7 @@ public:
        LoaderFunc0(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=0) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)();
        };
 private:
@@ -52,7 +53,7 @@ public:
        LoaderFunc1(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
        }
 private:
@@ -68,7 +69,7 @@ public:
        LoaderFunc2(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
        }
 private:
@@ -84,7 +85,7 @@ public:
        LoaderFunc3(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=3) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=3) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
        }
 private:
@@ -100,7 +101,7 @@ public:
        LoaderFunc4(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=4) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=4) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>());
        }
 private:
@@ -116,7 +117,7 @@ public:
        LoadValue(PointerType p): ptr(p) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
                dynamic_cast<typename L::Loader &>(l).get_object().*ptr=st.args[0].get<T>();
        }
 private:
@@ -205,6 +206,18 @@ private:
        }
 };
 
+template<typename T>
+void load(T &obj, const std::string &fn)
+{
+       std::ifstream in(fn.c_str());
+       if(!in)
+               throw Exception("Couldn't open "+fn);
+
+       Parser parser(in, fn);
+       typename T::Loader loader(obj);
+       loader.load(parser);
+}
+
 } // namespace Parser
 } // namespace Msp