From 62f00b6d9c93e17ff1eb25cb19f2d82c1038f280 Mon Sep 17 00:00:00 2001 From: m-holger Date: Mon, 29 May 2023 14:35:45 +0100 Subject: Change JSONHandler::m to std::unique_ptr and declare Members in implementation file --- libqpdf/JSONHandler.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libqpdf/JSONHandler.cc') diff --git a/libqpdf/JSONHandler.cc b/libqpdf/JSONHandler.cc index b5c7c35d..d6021935 100644 --- a/libqpdf/JSONHandler.cc +++ b/libqpdf/JSONHandler.cc @@ -4,11 +4,29 @@ #include #include +class JSONHandler::Members +{ + friend class JSONHandler; + + public: + ~Members() = default; + + private: + Members() = default; + Members(Members const&) = delete; + + Handlers h; +}; + JSONHandler::JSONHandler() : m(new Members()) { } +JSONHandler::~JSONHandler() +{ +} + void JSONHandler::usage(std::string const& msg) { -- cgit v1.2.3-70-g09d2 From 75e74679c54ed6e51217530277b6bf45aa2b2dcd Mon Sep 17 00:00:00 2001 From: m-holger Date: Mon, 12 Jun 2023 09:02:20 +0100 Subject: Move struct JSONHandler::Handlers to implementation file --- libqpdf/JSONHandler.cc | 19 +++++++++++++++++++ libqpdf/qpdf/JSONHandler.hh | 18 ------------------ 2 files changed, 19 insertions(+), 18 deletions(-) (limited to 'libqpdf/JSONHandler.cc') diff --git a/libqpdf/JSONHandler.cc b/libqpdf/JSONHandler.cc index d6021935..a3ff4555 100644 --- a/libqpdf/JSONHandler.cc +++ b/libqpdf/JSONHandler.cc @@ -4,6 +4,25 @@ #include #include +struct Handlers +{ + Handlers() = default; + + JSONHandler::json_handler_t any_handler{nullptr}; + JSONHandler::void_handler_t null_handler{nullptr}; + JSONHandler::string_handler_t string_handler{nullptr}; + JSONHandler::string_handler_t number_handler{nullptr}; + JSONHandler::bool_handler_t bool_handler{nullptr}; + JSONHandler::json_handler_t dict_start_handler{nullptr}; + JSONHandler::void_handler_t dict_end_handler{nullptr}; + JSONHandler::json_handler_t array_start_handler{nullptr}; + JSONHandler::void_handler_t array_end_handler{nullptr}; + JSONHandler::void_handler_t final_handler{nullptr}; + std::map> dict_handlers; + std::shared_ptr fallback_dict_handler; + std::shared_ptr array_item_handler; +}; + class JSONHandler::Members { friend class JSONHandler; diff --git a/libqpdf/qpdf/JSONHandler.hh b/libqpdf/qpdf/JSONHandler.hh index 6439ff12..653924f6 100644 --- a/libqpdf/qpdf/JSONHandler.hh +++ b/libqpdf/qpdf/JSONHandler.hh @@ -53,24 +53,6 @@ class JSONHandler static void usage(std::string const& msg); - struct Handlers - { - Handlers() = default; - - json_handler_t any_handler{nullptr}; - void_handler_t null_handler{nullptr}; - string_handler_t string_handler{nullptr}; - string_handler_t number_handler{nullptr}; - bool_handler_t bool_handler{nullptr}; - json_handler_t dict_start_handler{nullptr}; - void_handler_t dict_end_handler{nullptr}; - json_handler_t array_start_handler{nullptr}; - void_handler_t array_end_handler{nullptr}; - void_handler_t final_handler{nullptr}; - std::map> dict_handlers; - std::shared_ptr fallback_dict_handler; - std::shared_ptr array_item_handler; - }; class Members; -- cgit v1.2.3-70-g09d2 From 8cb89529bd52ab40f5cf93024f6fbf6c0ef52f56 Mon Sep 17 00:00:00 2001 From: m-holger Date: Mon, 12 Jun 2023 13:29:58 +0100 Subject: Use early returns in JSONHandler::handle --- libqpdf/JSONHandler.cc | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'libqpdf/JSONHandler.cc') diff --git a/libqpdf/JSONHandler.cc b/libqpdf/JSONHandler.cc index a3ff4555..4a69fd60 100644 --- a/libqpdf/JSONHandler.cc +++ b/libqpdf/JSONHandler.cc @@ -117,24 +117,24 @@ JSONHandler::handle(std::string const& path, JSON j) m->h.any_handler(path, j); return; } - bool handled = false; + bool bvalue = false; std::string s_value; if (m->h.null_handler && j.isNull()) { m->h.null_handler(path); - handled = true; + return; } if (m->h.string_handler && j.getString(s_value)) { m->h.string_handler(path, s_value); - handled = true; + return; } if (m->h.number_handler && j.getNumber(s_value)) { m->h.number_handler(path, s_value); - handled = true; + return; } if (m->h.bool_handler && j.getBool(bvalue)) { m->h.bool_handler(path, bvalue); - handled = true; + return; } if (m->h.dict_start_handler && j.isDictionary()) { m->h.dict_start_handler(path, j); @@ -156,7 +156,7 @@ JSONHandler::handle(std::string const& path, JSON j) } }); m->h.dict_end_handler(path); - handled = true; + return; } if (m->h.array_start_handler && j.isArray()) { m->h.array_start_handler(path, j); @@ -166,15 +166,13 @@ JSONHandler::handle(std::string const& path, JSON j) ++i; }); m->h.array_end_handler(path); - handled = true; + return; } - if (!handled) { - // It would be nice to include information about what type the object was and what types - // were allowed, but we're relying on schema validation to make sure input is properly - // structured before calling the handlers. It would be different if this code were trying to - // be part of a general-purpose JSON package. - QTC::TC("libtests", "JSONHandler unhandled value"); - usage("JSON handler: value at " + path + " is not of expected type"); - } + // It would be nice to include information about what type the object was and what types were + // allowed, but we're relying on schema validation to make sure input is properly structured + // before calling the handlers. It would be different if this code were trying to be part of a + // general-purpose JSON package. + QTC::TC("libtests", "JSONHandler unhandled value"); + usage("JSON handler: value at " + path + " is not of expected type"); } -- cgit v1.2.3-70-g09d2