Mirrors/rapidyaml
0
0
Fork 0
mirror of https://github.com/biojppm/rapidyaml.git synced 2026-01-18 21:41:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

soa tree wip: pass all tests!

Browse Source
This commit is contained in:
Joao Paulo Magalhaes
2024-05-12 11:58:25 +01:00
parent 758e7c0ebe
commit 5d0763056c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/c4/yml/event_handler_tree.hpp
View File

@@ -302,26 +302,31 @@ public:
*/
void actually_val_is_first_key_of_new_map_flow()
{
const id_type id = m_curr->node_id;
_c4dbgpf("node[{}]: actually first key of new map. parent={}", m_curr->node_id, m_parent ? m_parent->node_id : NONE);
id_type id = m_curr->node_id;
if(C4_UNLIKELY(m_tree->is_container(id)))
_RYML_CB_ERR_(m_stack.m_callbacks, "ryml trees cannot handle containers as keys", m_curr->pos);
_RYML_CB_ASSERT(m_stack.m_callbacks, m_parent);
_RYML_CB_ASSERT(m_stack.m_callbacks, m_tree->is_seq(id));
_RYML_CB_ASSERT(m_stack.m_callbacks, m_tree->is_seq(m_parent->node_id));
_RYML_CB_ASSERT(m_stack.m_callbacks, !m_tree->is_container(id));
_RYML_CB_ASSERT(m_stack.m_callbacks, !m_tree->has_key(id));
// save type and val before changing the tree
NodeType type = m_tree->m_type[id];
const csubstr val = m_tree->m_val[id];
const csubstr tag = m_tree->m_val_tag[id];
const csubstr anc = m_tree->m_val_anchor[id];
static_assert((_VALMASK >> 1u) == _KEYMASK, "required for this function to work");
static_assert((VAL_STYLE >> 1u) == KEY_STYLE, "required for this function to work");
type = ((type & (_VALMASK|VAL_STYLE)) >> 1u);
type = (type & ~(_VALMASK|VAL_STYLE));
type = (type | KEY);
_disable_(_VALMASK|VAL_STYLE);
m_tree->m_val[id].clear();
begin_map_val_flow();
id = m_curr->node_id;
m_tree->m_type[id] = type;
m_tree->m_key[id] = val;
m_tree->m_key_tag[id] = tag;
m_tree->m_key_anchor[id] = anc;
}
/** like its flow counterpart, but this function can only be

2
src/c4/yml/tree.cpp
View File

@@ -573,7 +573,7 @@ void Tree::_set_hierarchy(id_type ichild, id_type iparent, id_type iprev_sibling
if(iprev_sibling != NONE)
{
psib = &m_relation[iprev_sibling];
_RYML_CB_ASSERT(m_callbacks, next_sibling(iprev_sibling) == NONE);
_RYML_CB_ASSERT(m_callbacks, next_sibling(iprev_sibling) == inext_sibling);
child->m_prev_sibling = iprev_sibling;
psib->m_next_sibling = ichild;
_RYML_CB_ASSERT(m_callbacks, psib->m_prev_sibling != psib->m_next_sibling || psib->m_prev_sibling == NONE);

1
test/test_lib/test_case_node.cpp
View File

@@ -126,7 +126,6 @@ void TestCaseNode::compare_child(yml::ConstNodeRef const& n, id_type pos) const
if(type & SEQ)
{
EXPECT_FALSE(n[pos].has_key());
EXPECT_EQ(n[pos].key(), children[(size_t)pos].key);
ConstNodeRef actualch = n.child(pos);
SCOPED_TRACE(actualch.id());
EXPECT_EQ(actualch.id(), n[pos].id());