jsonpath union with paths works with star

Author: danielaparker

include/jsoncons_ext/jsonpath/json_query.hpp

@@ -184,6 +184,7 @@ enum class path_state
     bracketed_single_quoted_name,
     bracketed_double_quoted_name,
     bracketed_name_or_path,
+    bracketed_star_or_path,
     expr_or_filter_or_slice_or_key,
     slice_end_or_end_step,
     slice_end,
@@ -216,7 +217,7 @@ struct state_item
     {
     }
 
-    state_item(path_state state)
+    explicit state_item(path_state state)
         : state(state), is_recursive_descent(false), is_union(false)
     {
     }
@@ -749,6 +750,13 @@ class jsonpath_evaluator : private ser_context
                             state_stack_.back().state = path_state::dot;
                             break;
                         }
+                        case '*':
+                        {
+                            end_all();
+                            transfer_nodes();
+                            state_stack_.back().state = path_state::dot;
+                            break;
+                        }
                         case ' ':case '\t':
                         {
                             selectors_.push_back(make_unique_ptr<name_selector>(buffer));
@@ -1267,8 +1275,8 @@ class jsonpath_evaluator : private ser_context
                             ++column_;
                             break;
                         case '*':
-                            end_all();
                             state_stack_.back().state = path_state::comma_or_right_bracket;
+                            state_stack_.emplace_back(path_state::bracketed_star_or_path, state_stack_.back());
                             ++p_;
                             ++column_;
                             break;
@@ -1354,6 +1362,37 @@ class jsonpath_evaluator : private ser_context
                             return;
                     }
                     break;
+                case path_state::bracketed_star_or_path:
+                    switch (*p_)
+                    {
+                        case ' ':case '\t':
+                            ++p_;
+                            ++column_;
+                            break;
+                        case '.':
+                            buffer.push_back('*');
+                            buffer.push_back(*p_);
+                            state_stack_.back().state = path_state::path;
+                            ++p_;
+                            ++column_;
+                            break;
+                        case '[':
+                            buffer.push_back('*');
+                            buffer.push_back(*p_);
+                            state_stack_.back().state = path_state::path2;
+                            ++p_;
+                            ++column_;
+                            break;
+                        case ',': 
+                        case ']': 
+                            end_all();
+                            state_stack_.pop_back();
+                            break;
+                        default:
+                            ec = jsonpath_errc::expected_right_bracket;
+                            return;
+                    }
+                    break;
                 case path_state::path:
                     switch (*p_)
                     {

tests/src/jsonpath/jsonpath_tests.cpp

@@ -1573,21 +1573,28 @@ TEST_CASE("jsonpath object union test")
   ]
 }    )");
 
-    SECTION("Test 1")
+    SECTION("$[firstName,address.city]")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = "$[firstName,address.city]";
         json result = json_query(root,path);
         CHECK(result == expected);
     }
-    SECTION("Test 2")
+    SECTION("$[firstName,*.city]")
+    {
+        json expected = json::parse(R"(["John","Nara"])");
+        std::string path = "$[firstName,*.city]";
+        json result = json_query(root,path);
+        CHECK(result == expected);
+    }
+    SECTION("$[firstName,address[city]]")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = "$[firstName,address[city]]";
         json result = json_query(root,path);
         CHECK(result == expected);
     }
-    SECTION("Test 3")
+    SECTION("$[firstName,address['city']]")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = "$[firstName,address['city']]";
@@ -1608,21 +1615,21 @@ TEST_CASE("jsonpath object union test")
         json result = json_query(root,path);
         CHECK(result == expected);
     }
-    SECTION("Test 4")
+    SECTION(R"($[firstName,address["city"]])")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = R"($[firstName,address["city"]])";
         json result = json_query(root,path);
         CHECK(result == expected);
     }
-    SECTION("Test 5")
+    SECTION(R"($['firstName','address'["city"]])")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = R"($['firstName','address'["city"]])";
         json result = json_query(root,path);
         CHECK(result == expected);
     }
-    SECTION("Test 6")
+    SECTION(R"($["firstName","address"["city"]])")
     {
         json expected = json::parse(R"(["John","Nara"])");
         std::string path = R"($["firstName","address"["city"]])";