From 8e8d707db19c12ffa7c018206ebe2582f0d86355 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 25 Apr 2021 19:39:26 +0100 Subject: Support chaining persist calls for subclasses --- lib/persistance.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/persistance.h b/lib/persistance.h index 7f28ad1..0082d4c 100644 --- a/lib/persistance.h +++ b/lib/persistance.h @@ -59,8 +59,8 @@ namespace Persistanace { struct PersistanceStore { // virtual bool persistType(const std::type_info &) = 0; template - bool - persistValue(const std::string_view & key, T & value) + inline bool + persistValue(const std::string_view key, T & value) { if (key == name) { sel = std::make_unique>(std::ref(value)); @@ -115,7 +115,7 @@ namespace Persistanace { virtual ~Persistable() = default; DEFAULT_MOVE_COPY(Persistable); - virtual void persist(PersistanceStore & store) = 0; + virtual bool persist(PersistanceStore & store) = 0; static void addFactory(const std::string_view, std::function()>); static std::unique_ptr callFactory(const std::string_view); @@ -166,7 +166,9 @@ namespace Persistanace { } } PersistanceStore ps {mbr}; - v->persist(ps); + if (v->persist(ps)) { + throw std::runtime_error("cannot find member: " + mbr); + } return std::move(ps.sel); } } @@ -206,6 +208,7 @@ namespace Persistanace { { stk.push(std::make_unique(v)); } + void EndObject(Stack & stk) override { -- cgit v1.2.3