fixes to Tree::merge_with()

biojppm · Jun 23, 2019 · 8c34ec0 · 8c34ec0
1 parent b824fcf
commit 8c34ec0
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/c4/yml/tree.cpp b/src/c4/yml/tree.cpp
@@ -886,7 +886,14 @@ void Tree::merge_with(Tree const *src, size_t src_node, size_t dst_node)
             {
                 remove_children(dst_node);
             }
-            to_seq(dst_node);
+            if(src->has_key(src_node))
+            {
+                to_seq(dst_node, src->key(src_node));
+            }
+            else
+            {
+                to_seq(dst_node);
+            }
         }
         for(size_t sch = src->first_child(src_node); sch != NONE; sch = src->next_sibling(sch))
         {
@@ -904,7 +911,14 @@ void Tree::merge_with(Tree const *src, size_t src_node, size_t dst_node)
             {
                 remove_children(dst_node);
             }
-            to_map(dst_node);
+            if(src->has_key(src_node))
+            {
+                to_map(dst_node, src->key(src_node));
+            }
+            else
+            {
+                to_map(dst_node);
+            }
         }
         for(size_t sch = src->first_child(src_node); sch != NONE; sch = src->next_sibling(sch))
         {