X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Floaderaction.h;fp=source%2Floaderaction.h;h=9e08dac59edea834323c158e4807dba3ff3e61f2;hp=23298428df659303185075b212c7ada5604d6778;hb=d8bda96a0aac09774bb1e2a8b57ac2e48a93b3c1;hpb=fbe7e81c08a6b5a3f9ccdcbeb4dd4d351a5f4226 diff --git a/source/loaderaction.h b/source/loaderaction.h index 2329842..9e08dac 100644 --- a/source/loaderaction.h +++ b/source/loaderaction.h @@ -51,17 +51,17 @@ private: public: LoaderFunc0(FuncType f): func(f) { } - virtual void execute(Loader &l, const Statement &) const + void execute(Loader &l, const Statement &) const override { (dynamic_cast(l).*func)(); }; - virtual void execute(Loader &l, const ArgumentStore &) const + void execute(Loader &l, const ArgumentStore &) const override { (dynamic_cast(l).*func)(); }; - virtual std::string get_signature() const + std::string get_signature() const override { return std::string(); } }; @@ -80,17 +80,17 @@ private: public: LoaderFunc1(FuncType f): func(f) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { (dynamic_cast(l).*func)(st.args[0].get()); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { (dynamic_cast(l).*func)(as.get(0)); } - virtual std::string get_signature() const + std::string get_signature() const override { return std::string(1, TypeInfo::signature); } }; @@ -109,7 +109,7 @@ private: public: LoaderFunc1(FuncType f): func(f) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { std::vector values; values.reserve(st.args.size()); @@ -118,7 +118,7 @@ public: (dynamic_cast(l).*func)(values); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { std::vector values; unsigned n_args = as.get_info().key.signature.size(); @@ -128,7 +128,7 @@ public: (dynamic_cast(l).*func)(values); } - virtual std::string get_signature() const + std::string get_signature() const override { std::string result; result += TypeInfo::signature; @@ -152,17 +152,17 @@ private: public: LoaderFunc1(FuncType f): func(f) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { (dynamic_cast(l).*func)(st); } - virtual void execute(Loader &, const ArgumentStore &) const + void execute(Loader &, const ArgumentStore &) const override { throw std::logic_error("incompatible format"); } - virtual std::string get_signature() const + std::string get_signature() const override { return "*"; } }; @@ -214,17 +214,17 @@ protected: public: LoaderFuncN(FuncType f): func(f) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { Apply<0, Args...>::apply(dynamic_cast(l), func, st); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { Apply<0, Args...>::apply(dynamic_cast(l), func, as); } - virtual std::string get_signature() const + std::string get_signature() const override { return create_signature(); } }; @@ -243,17 +243,17 @@ public: LoaderFuncNBound1(FuncType f, const B0 &b0): func(f), bound0(b0) { } LoaderFuncNBound1(FuncType f, B0 &&b0): func(f), bound0(std::move(b0)) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { Apply<0, Args...>::apply(dynamic_cast(l), func, st, bound0); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { Apply<0, Args...>::apply(dynamic_cast(l), func, as, bound0); } - virtual std::string get_signature() const + std::string get_signature() const override { return create_signature(); } }; @@ -269,17 +269,17 @@ private: public: LoadValue1(Pointer0Type p0): ptr0(p0) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { dynamic_cast(l).get_object().*ptr0 = st.args[0].get(); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { dynamic_cast(l).get_object().*ptr0 = as.get(0); } - virtual std::string get_signature() const + std::string get_signature() const override { return std::string(1, TypeInfo::signature); } }; @@ -295,19 +295,19 @@ private: public: LoadValue1(Pointer0Type p0): ptr0(p0) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { typename L::Loader &ldr = dynamic_cast(l); ldr.get_object().*ptr0 = &ldr.get_collection().template get(st.args[0].get()); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { typename L::Loader &ldr = dynamic_cast(l); ldr.get_object().*ptr0 = &ldr.get_collection().template get(as.get(0)); } - virtual std::string get_signature() const + std::string get_signature() const override { return std::string(1, TypeInfo::signature); } }; @@ -325,19 +325,19 @@ private: public: LoadValue2(Pointer0Type p0, Pointer1Type p1): ptr0(p0), ptr1(p1) { } - virtual void execute(Loader &l, const Statement &st) const + void execute(Loader &l, const Statement &st) const override { dynamic_cast(l).get_object().*ptr0 = st.args[0].get(); dynamic_cast(l).get_object().*ptr1 = st.args[1].get(); } - virtual void execute(Loader &l, const ArgumentStore &as) const + void execute(Loader &l, const ArgumentStore &as) const override { dynamic_cast(l).get_object().*ptr0 = as.get(0); dynamic_cast(l).get_object().*ptr1 = as.get(1); } - virtual std::string get_signature() const + std::string get_signature() const override { std::string result; result += TypeInfo::signature;