Refactor exceptions

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

diff --git a/source/loader.h b/source/loader.h
index 5b39212e53c32beceda2cc3227109dc9eb4c9b6c..0c8118625918823ee2b5ebf6640bfd171a9d85fb 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -50,7 +50,7 @@ public:
        LoaderFunc0(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=0) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)();
        };
 private:
@@ -70,7 +70,7 @@ public:
        LoaderFunc1(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
        }
 private:
@@ -110,7 +110,7 @@ public:
        LoaderFunc2(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
        }
 private:
@@ -127,7 +127,7 @@ public:
        LoaderFunc3(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=3) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=3) throw TypeError("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:
@@ -144,7 +144,7 @@ public:
        LoaderFunc4(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=4) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=4) throw TypeError("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:
@@ -161,7 +161,7 @@ public:
        LoaderFunc5(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=5) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=5) throw TypeError("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>(), st.args[4].get<A4>());
        }
 private:
@@ -178,7 +178,7 @@ public:
        LoadValue1(Pointer0Type p0): ptr0(p0) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
                dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
        }
 private:
@@ -195,7 +195,7 @@ public:
        LoadValue1(Pointer0Type p0): ptr0(p0) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
                typename L::Loader &ldr=dynamic_cast<typename L::Loader &>(l);
                ldr.get_object().*ptr0=ldr.get_collection().template get<T0>(st.args[0].get<std::string>());
        }
@@ -214,7 +214,7 @@ public:
        LoadValue2(Pointer0Type p0, Pointer1Type p1): ptr0(p0), ptr1(p1) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
+               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
                dynamic_cast<typename L::Loader &>(l).get_object().*ptr0=st.args[0].get<T0>();
                dynamic_cast<typename L::Loader &>(l).get_object().*ptr1=st.args[1].get<T1>();
        }