flow seq comments working with round trips

set -xe ; cd ~/proj/rapidyaml/ ; export C4_EXTERN_DIR=`pwd`/build/extern ; export CTEST_PARALLEL_LEVEL=`nproc` ; function cm() { cmany "$@" -V RYML_DEV=ON -t Debug -V RYML_VALGRIND=OFF -V RYML_BUILD_BENCHMARKS=OFF -V CMAKE_C_COMPILER_LAUNCHER=ccache -V CMAKE_CXX_COMPILER_LAUNCHER=ccache ; } ; cm rtg ryml-test-engine_9_comments_2_flow_seq -v comm-dbg -ta ' --gtest_filter=**5*.round* '

Author: biojppm

src/c4/yml/event_handler_tree.hpp

@@ -598,7 +598,7 @@ struct EventHandlerTree : public EventHandlerStack<EventHandlerTree, EventHandle
     void add_comment(csubstr txt, CommentType_e type)
     {
         NodeData * d = m_curr->tr_data;
-        _c4dbgpf("node[{}]: comment! [{}]~~~{}~~~", m_tree->id(d), txt.len, txt);
+        _c4dbgpf("node[{}]: comment! type={} txt=[{}]~~~{}~~~", m_tree->id(d), type, txt.len, txt);
         if(type == COMM_VAL_BRACKET_TRAILING || type == COMM_VAL_BRACKET_LEADING)
         {
              _RYML_ASSERT_BASIC_(m_stack.m_callbacks, m_parent && m_parent->tr_data->m_type.is_flow());

src/c4/yml/parse_engine.def.hpp

@@ -4772,12 +4772,17 @@ void ParseEngine<EventHandler>::_maybe_handle_leading_comment(CommentType_e curr
 {
     if(m_pending_comment.type != COMM_NONE)
     {
+        bool leading_exists = (m_evt_handler->m_curr->leading_comments & COMM_LEADING);
         _RYML_ASSERT_BASIC_(m_evt_handler->m_stack.m_callbacks, m_pending_comment.type == COMM_LEADING);
-        CommentType_e actual = (m_evt_handler->m_curr->leading_comments & COMM_LEADING) ? current : COMM_LEADING;
+        CommentType_e actual = leading_exists ? current : COMM_LEADING;
+        _c4dbgpf("pending leading comment! context={} leading_exists={} actual={}", current, leading_exists, actual);
         _apply_pending_comment(COMM_LEADING, actual);
         m_evt_handler->m_curr->leading_comments |= actual;
     }
-    m_evt_handler->m_curr->leading_comments |= COMM_LEADING;
+    else if(current & (COMM_VAL_LEADING2|COMM_VAL_ANCHOR_LEADING))
+    {
+        m_evt_handler->m_curr->leading_comments |= COMM_LEADING;
+    }
 }
 #endif // RYML_WITH_COMMENTS
 

test/test_engine_9_comments_2_flow_seq.cpp

@@ -783,7 +783,7 @@ COMMENT_TEST(FlowSeqWithTagAndAnchor5,
              "=COMM #[LEADING] 1"                                  "\n"
              "+DOC"                                                "\n"
              "+SEQ []"                                             "\n"
-             "=COMM #[VAL_ANCHOR_LEADING] 5"                       "\n"
+             "=COMM #[LEADING] 5"                                  "\n"
              "=COMM #[VAL_LEADING2] 7"                             "\n"
              "=VAL &a <!atag> :a"                                  "\n"
              "=COMM #[VAL_BRACKET_LEADING] 9"                      "\n"
@@ -798,7 +798,7 @@ COMMENT_TEST(FlowSeqWithTagAndAnchor5,
     ___(ps.begin_doc());
     ___(ps.begin_seq_val_flow());
     ___(ps.set_val_tag("!atag"));
-    ___(ps.add_comment(" 5", COMM_VAL_ANCHOR_LEADING));
+    ___(ps.add_comment(" 5", COMM_LEADING));
     ___(ps.set_val_anchor("a"));
     ___(ps.add_comment(" 7", COMM_VAL_LEADING2));
     ___(ps.set_val_scalar_plain("a"));

test/test_lib/test_engine.cpp

@@ -173,7 +173,7 @@ void test_engine_tree_from_yaml(EngineEvtTestCase const& test_case, std::string
     std::string copy = yaml;
     parser.parse_in_place_ev("(testyaml)", to_substr(copy));
     #ifdef RYML_DBG
-    print_tree(tree);
+    print_tree("parsed_tree", tree);
     #endif
     std::string actual = emitrs_yaml<std::string>(tree);
     _c4dbgpf("~~~\n{}~~~\n", actual);
@@ -186,15 +186,18 @@ void test_engine_roundtrip_from_yaml(EngineEvtTestCase const& test_case, std::st
         return;
     csubstr filename = "(testyaml)";
     std::string copy = yaml;
-    Tree parsed_tree = parse_in_place(filename, to_substr(copy), test_case.opts);
+    const Tree parsed_tree = parse_in_place(filename, to_substr(copy), test_case.opts);
+    #ifdef RYML_DBG
+    print_tree("parsed_tree", parsed_tree);
+    #endif
     {
         SCOPED_TRACE("invariants_after_parse");
         test_invariants(parsed_tree);
     }
     const std::string parsed_tree_emitted = emitrs_yaml<std::string>(parsed_tree);
     EXPECT_EQ(test_case.expected_emitted, parsed_tree_emitted);
     std::string emitted0_copy = parsed_tree_emitted;
-    Tree after_roundtrip = parse_in_place(filename, to_substr(emitted0_copy), test_case.opts);
+    const Tree after_roundtrip = parse_in_place(filename, to_substr(emitted0_copy), test_case.opts);
     {
         SCOPED_TRACE("invariants_after_roundtrip");
         test_invariants(after_roundtrip);