comments wip [ci skip]

Author: biojppm

src/c4/yml/tree.cpp

@@ -114,6 +114,10 @@ Tree::Tree(id_type node_capacity, size_t arena_capacity, id_type comment_capacit
     reserve_arena(arena_capacity);
     reserve_comments(comment_capacity);
 }
+Tree::Tree(id_type node_capacity, size_t arena_capacity, id_type comment_capacity)
+    : Tree(node_capacity, arena_capacity, comment_capacity, get_callbacks())
+{
+}
 #endif // RYML_WITH_COMMENTS
 
 Tree::~Tree()
@@ -161,20 +165,20 @@ void Tree::_free()
         _RYML_ASSERT_VISIT_(m_callbacks, m_cap > 0, this, NONE);
         _RYML_CB_FREE(m_callbacks, m_buf, NodeData, (size_t)m_cap);
     }
-    if(m_arena.str)
-    {
-        _RYML_ASSERT_VISIT_(m_callbacks, m_arena.len > 0, this, NONE);
-        _RYML_CB_FREE(m_callbacks, m_arena.str, char, m_arena.len);
-    }
-    _clear();
     #ifdef RYML_WITH_COMMENTS
     if(m_comments_buf)
     {
         _RYML_ASSERT_VISIT_(m_callbacks, m_comments_cap > 0, this, NONE);
         _RYML_ASSERT_VISIT_(m_callbacks, m_comments_cap >= m_comments_size, this, NONE);
-        _RYML_CB_FREE(m_callbacks, m_comments_buf, CommentData, m_comments_cap);
+        _RYML_CB_FREE(m_callbacks, m_comments_buf, CommentData, (size_t)m_comments_cap);
     }
     #endif // RYML_WITH_COMMENTS
+    if(m_arena.str)
+    {
+        _RYML_ASSERT_VISIT_(m_callbacks, m_arena.len > 0, this, NONE);
+        _RYML_CB_FREE(m_callbacks, m_arena.str, char, m_arena.len);
+    }
+    _clear();
 }
 
 
@@ -192,20 +196,22 @@ void Tree::_clear()
     m_free_tail = 0;
     m_arena = {};
     m_arena_pos = 0;
-    for(id_type i = 0; i < RYML_MAX_TAG_DIRECTIVES; ++i)
-        m_tag_directives[i] = {};
     #ifdef RYML_WITH_COMMENTS
     m_comments_buf = nullptr;
     m_comments_cap = 0;
     m_comments_size = 0;
     #endif // RYML_WITH_COMMENTS
+    for(id_type i = 0; i < RYML_MAX_TAG_DIRECTIVES; ++i)
+        m_tag_directives[i] = {};
 }
 
 void Tree::_copy(Tree const& that)
 {
     _RYML_ASSERT_VISIT_(m_callbacks, m_buf == nullptr, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, m_cap == 0, this, NONE);
     _RYML_ASSERT_VISIT_(m_callbacks, m_arena.str == nullptr, this, NONE);
     _RYML_ASSERT_VISIT_(m_callbacks, m_arena.len == 0, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, that.m_cap >= that.m_size, this, NONE);
     if(that.m_cap)
     {
         m_buf = _RYML_CB_ALLOC_HINT(m_callbacks, NodeData, (size_t)that.m_cap, that.m_buf);
@@ -217,6 +223,19 @@ void Tree::_copy(Tree const& that)
     m_free_tail = that.m_free_tail;
     m_arena_pos = that.m_arena_pos;
     m_arena = that.m_arena;
+    #ifdef RYML_WITH_COMMENTS
+    _RYML_ASSERT_VISIT_(m_callbacks, m_comments_buf == nullptr, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, m_comments_cap == 0, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, that.m_comments_cap >= that.m_comments_size, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, !!that.m_comments_cap == !!that.m_comments_buf, this, NONE);
+    if(that.m_comments_size)
+    {
+        m_comments_buf = _RYML_CB_ALLOC_HINT(m_callbacks, CommentData, (size_t)that.m_comments_cap, that.m_comments_buf);
+        memcpy(m_comments_buf, that.m_comments_buf, (size_t)that.m_comments_size * sizeof(CommentData));
+    }
+    m_comments_size = that.m_comments_size;
+    m_comments_cap = that.m_comments_cap;
+    #endif // RYML_WITH_COMMENTS
     if(that.m_arena.str)
     {
         _RYML_ASSERT_VISIT_(m_callbacks, that.m_arena.len > 0, this, NONE);
@@ -228,21 +247,12 @@ void Tree::_copy(Tree const& that)
     }
     for(id_type i = 0; i < RYML_MAX_TAG_DIRECTIVES; ++i)
         m_tag_directives[i] = that.m_tag_directives[i];
-    #ifdef RYML_WITH_COMMENTS
-    _RYML_ASSERT_VISIT_(m_callbacks, m_comments_buf == nullptr, this, NONE);
-    _RYML_ASSERT_VISIT_(m_callbacks, m_comments_cap == 0, this, NONE);
-    if(that.m_comments_size)
-    {
-        _RYML_ASSERT_VISIT_(m_callbacks, that.m_comments_cap >= that.m_comments_size, this, NONE);
-        m_comments_buf = _RYML_CB_ALLOC(m_callbacks, CommentData, that.m_comments_size);
-        memcpy(m_comments_buf, that.m_comments_buf, (size_t)that.m_comments_size * sizeof(CommentData));
-    }
-    #endif // RYML_WITH_COMMENTS
 }
 
 void Tree::_move(Tree & that) noexcept
 {
     _RYML_ASSERT_VISIT_(m_callbacks, m_buf == nullptr, this, NONE);
+    _RYML_ASSERT_VISIT_(m_callbacks, m_cap == 0, this, NONE);
     _RYML_ASSERT_VISIT_(m_callbacks, m_arena.str == nullptr, this, NONE);
     _RYML_ASSERT_VISIT_(m_callbacks, m_arena.len == 0, this, NONE);
     m_buf = that.m_buf;
@@ -252,16 +262,16 @@ void Tree::_move(Tree & that) noexcept
     m_free_tail = that.m_free_tail;
     m_arena = that.m_arena;
     m_arena_pos = that.m_arena_pos;
-    for(id_type i = 0; i < RYML_MAX_TAG_DIRECTIVES; ++i)
-        m_tag_directives[i] = that.m_tag_directives[i];
-    that._clear();
     #ifdef RYML_WITH_COMMENTS
     _RYML_ASSERT_VISIT_(m_callbacks, m_comments_buf == nullptr, this, NONE);
     _RYML_ASSERT_VISIT_(m_callbacks, m_comments_cap == 0, this, NONE);
     m_comments_buf = that.m_comments_buf;
     m_comments_cap = that.m_comments_cap;
     m_comments_size = that.m_comments_size;
     #endif // RYML_WITH_COMMENTS
+    for(id_type i = 0; i < RYML_MAX_TAG_DIRECTIVES; ++i)
+        m_tag_directives[i] = that.m_tag_directives[i];
+    that._clear();
 }
 
 void Tree::_relocate(substr next_arena)

src/c4/yml/tree.hpp

@@ -244,6 +244,7 @@ class RYML_EXPORT Tree
     Tree(id_type node_capacity, size_t arena_capacity, Callbacks const& cb);
 
     #ifdef RYML_WITH_COMMENTS
+    Tree(id_type node_capacity, size_t arena_capacity, id_type comment_capacity);
     Tree(id_type node_capacity, size_t arena_capacity, id_type comment_capacity, Callbacks const& cb);
     #endif
 
@@ -1144,6 +1145,8 @@ class RYML_EXPORT Tree
     /** @{ */
 
     void reserve_comments(id_type comment_capacity);
+    size_t comments_capacity() const { return m_comments_cap; }
+    size_t comments_size() const { return m_comments_size; }
 
     CommentData const* comment(id_type node_id,                          comment_data_type type_flags=COMM_ANY) const;
     CommentData const* comment(id_type node_id, id_type comment_id,      comment_data_type type_flags=COMM_ANY) const;

test/test_lib/test_case.cpp

@@ -201,6 +201,14 @@ void test_arena_not_shared(Tree const& a, Tree const& b)
         EXPECT_FALSE(a.in_arena(td.prefix));
     }
     #ifdef RYML_WITH_COMMENTS
+    for(id_type i = 0; i < a.m_comments_size; ++i)
+    {
+        EXPECT_FALSE(b.in_arena(a.m_comments_buf[i].m_text)) << i;
+    }
+    for(id_type i = 0; i < b.m_comments_size; ++i)
+    {
+        EXPECT_FALSE(a.in_arena(b.m_comments_buf[i].m_text)) << i;
+    }
     #endif
 }