From ce3406e93f0de0946d2abed6179579caf1433d4e Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 30 Jan 2022 08:18:04 -0500 Subject: JSONHandler: pass JSON object to dict start function If some keys depend on others, we have to check up front since there is no control of what order key handlers will be called. Anyway, keys are unordered in json, so we don't want to depend on ordering. --- libtests/json_handler.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libtests/json_handler.cc') diff --git a/libtests/json_handler.cc b/libtests/json_handler.cc index 618395d5..dcc8e66e 100644 --- a/libtests/json_handler.cc +++ b/libtests/json_handler.cc @@ -49,8 +49,7 @@ static std::shared_ptr make_all_handler() { auto h = std::make_shared(); h->addDictHandlers( - make_print_message("dict begin"), - make_print_message("dict end")); + print_json, make_print_message("dict end")); auto h1 = std::make_shared(); h1->addStringHandler(print_string); h->addDictKeyHandler("one", h1); @@ -77,13 +76,11 @@ static std::shared_ptr make_all_handler() h5); auto h6 = std::make_shared(); h6->addDictHandlers( - make_print_message("dict begin"), - make_print_message("dict end")); + print_json, make_print_message("dict end")); auto h6a = std::make_shared(); h6->addDictKeyHandler("a", h6a); h6a->addDictHandlers( - make_print_message("dict begin"), - make_print_message("dict end")); + print_json, make_print_message("dict end")); auto h6ab = std::make_shared(); h6a->addDictKeyHandler("b", h6ab); auto h6ax = std::make_shared(); -- cgit v1.2.3-54-g00ecf