From 2bf9be67a1293879c8cbf460aa52a70d17de531a Mon Sep 17 00:00:00 2001 From: Daniel Parker Date: Thu, 12 Dec 2024 09:13:49 -0500 Subject: [PATCH] Revert evaluate returns pointer --- doc/ref/jmespath/jmespath.md | 123 +++--------------- .../src/jmespath_custom_function_examples.cpp | 4 +- include/jsoncons_ext/jmespath/jmespath.hpp | 4 +- 3 files changed, 23 insertions(+), 108 deletions(-) diff --git a/doc/ref/jmespath/jmespath.md b/doc/ref/jmespath/jmespath.md index 05740476a..d2c97ed82 100644 --- a/doc/ref/jmespath/jmespath.md +++ b/doc/ref/jmespath/jmespath.md @@ -175,24 +175,24 @@ public: 0, // number of arguments [](const jsoncons::span> params, jmespath::dynamic_resources& resources, - std::error_code& ec) -> pointer + std::error_code& ec) -> reference { - auto result = resources.make_json(current_index); - return result; + auto result = resources.create_json(current_index); + return *result; } ); this->register_function("generate_array", // function name 4, // number of arguments [](const jsoncons::span> params, jmespath::dynamic_resources& resources, - std::error_code& ec) -> pointer + std::error_code& ec) -> reference { JSONCONS_ASSERT(4 == params.size()); if (!(params[0].is_value() && params[2].is_expression())) { ec = jmespath::jmespath_errc::invalid_argument; - return resources.make_null(); + return resources.null_value(); } reference context = params[0].value(); @@ -203,45 +203,45 @@ public: if (!countValue.is_number()) { ec = jmespath::jmespath_errc::invalid_argument; - return resources.make_null(); + return resources.null_value(); } - auto result = resources.make_json(jsoncons::json_array_arg); + auto result = resources.create_json(jsoncons::json_array_arg); int count = countValue.template as(); for (size_t i = 0; i < count; i++) { current_index = i; std::error_code ec2; - auto ele = expr.evaluate(context, resources, ec2); + reference ele = expr.evaluate(context, resources, ec2); - if (ele->is_null()) + if (ele.is_null()) { auto defaultVal = get_value(context, resources, argDefault); result->emplace_back(defaultVal); } else { - result->emplace_back(jsoncons::json_const_pointer_arg, ele); + result->emplace_back(ele); } } current_index = 0; - return result; + return *result; } ); this->register_function("add", // function name 2, // number of arguments [](jsoncons::span> params, jmespath::dynamic_resources& resources, - std::error_code& ec) -> pointer + std::error_code& ec) -> reference { JSONCONS_ASSERT(2 == params.size()); if (!(params[0].is_value() && params[1].is_value())) { ec = jmespath::jmespath_errc::invalid_argument; - return resources.make_null(); + return resources.null_value(); } reference arg0 = params[0].value(); @@ -249,18 +249,18 @@ public: if (!(arg0.is_number() && arg1.is_number())) { ec = jmespath::jmespath_errc::invalid_argument; - return resources.make_null(); + return resources.null_value(); } if (arg0.is() && arg1.is()) { int64_t v = arg0.template as() + arg1.template as(); - return resources.make_json(v); + return *resources.create_json(v); } else { double v = arg0.template as() + arg1.template as(); - return resources.make_json(v); + return *resources.create_json(v); } } ); @@ -273,8 +273,8 @@ public: { const auto& expr = param.expression(); std::error_code ec; - auto value = expr.evaluate(context, resources, ec); - return *value; + reference value = expr.evaluate(context, resources, ec); + return value; } else { @@ -327,91 +327,4 @@ int main() } ``` -Output: - -``` -[ - { - "id": "id-xxx", - "position": 1, - "state": 1 - }, - { - "id": "", - "position": 2, - "state": 0 - }, - { - "id": "", - "position": 3, - "state": 0 - }, - { - "id": "", - "position": 4, - "state": 0 - }, - { - "id": "id-yyy", - "position": 5, - "state": 1 - }, - { - "id": "", - "position": 6, - "state": 0 - }, - { - "id": "", - "position": 7, - "state": 0 - }, - { - "id": "", - "position": 8, - "state": 0 - }, - { - "id": "id-mmm", - "position": 9, - "state": 2 - }, - { - "id": "", - "position": 10, - "state": 0 - }, - { - "id": "", - "position": 11, - "state": 0 - }, - { - "id": "", - "position": 12, - "state": 0 - }, - { - "id": "", - "position": 13, - "state": 0 - }, - { - "id": "", - "position": 14, - "state": 0 - }, - { - "id": "", - "position": 15, - "state": 0 - }, - { - "id": "", - "position": 16, - "state": 0 - } -] -``` - Credit to [PR #560](https://github.com/danielaparker/jsoncons/pull/560) for this example diff --git a/examples/src/jmespath_custom_function_examples.cpp b/examples/src/jmespath_custom_function_examples.cpp index c726ae384..4b834bb0d 100644 --- a/examples/src/jmespath_custom_function_examples.cpp +++ b/examples/src/jmespath_custom_function_examples.cpp @@ -85,7 +85,9 @@ class my_custom_functions : public jmespath::custom_functions } else { - result->emplace_back(ele); + result->emplace_back(ele); + //result->emplace_back(jsoncons::json_const_pointer_arg, &ele); + //result->emplace_back(*resources.create_json(deep_copy(ele))); } } current_index = 0; diff --git a/include/jsoncons_ext/jmespath/jmespath.hpp b/include/jsoncons_ext/jmespath/jmespath.hpp index b96f2ef44..76dc89ec4 100644 --- a/include/jsoncons_ext/jmespath/jmespath.hpp +++ b/include/jsoncons_ext/jmespath/jmespath.hpp @@ -191,6 +191,8 @@ namespace jmespath { public: using reference = const Json&; + virtual ~expr_base() = default; + virtual reference evaluate(reference val, dynamic_resources& resources, std::error_code& ec) const = 0; }; @@ -247,8 +249,6 @@ namespace jmespath { return is_projection_; } - virtual ~expr_base_impl() = default; - virtual void add_expression(std::unique_ptr&& expressions) = 0; virtual std::string to_string(std::size_t = 0) const