Merge pull request #10 from swift-nav/woodfell/deep_clone

API extension to do deep clone, remove alises
swift-nav · Jul 1, 2024 · 3de9fe4 · 3de9fe4
2 parents 7e1bc5f + 6340962
commit 3de9fe4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/include/yaml-cpp/node/node.h b/include/yaml-cpp/node/node.h
@@ -139,10 +139,10 @@ class YAML_CPP_API Node {
 
 YAML_CPP_API bool operator==(const Node& lhs, const Node& rhs);
 
-YAML_CPP_API Node Clone(const Node& node);
+YAML_CPP_API Node Clone(const Node& node, bool preserve_aliases = true);
 
 template <typename T>
 struct convert;
-}
+}  // namespace YAML
 
 #endif  // NODE_NODE_H_62B23520_7C8E_11DE_8A39_0800200C9A66
diff --git a/src/emit.cpp b/src/emit.cpp
@@ -7,7 +7,7 @@ namespace YAML {
 Emitter& operator<<(Emitter& out, const Node& node) {
   EmitFromEvents emitFromEvents(out);
   NodeEvents events(node);
-  events.Emit(emitFromEvents);
+  events.Emit(emitFromEvents, true);
   return out;
 }
 

diff --git a/src/node.cpp b/src/node.cpp
@@ -3,10 +3,10 @@
 #include "nodeevents.h"
 
 namespace YAML {
-Node Clone(const Node& node) {
+Node Clone(const Node& node, bool preserve_aliases) {
   NodeEvents events(node);
   NodeBuilder builder;
-  events.Emit(builder);
+  events.Emit(builder, preserve_aliases);
   return builder.Root();
 }
 }  // namespace YAML
diff --git a/src/nodeevents.cpp b/src/nodeevents.cpp
@@ -42,19 +42,19 @@ void NodeEvents::Setup(const detail::node& node) {
   }
 }
 
-void NodeEvents::Emit(EventHandler& handler) {
+void NodeEvents::Emit(EventHandler& handler, bool preserve_aliases) {
   AliasManager am;
 
   handler.OnDocumentStart(Mark());
   if (m_root)
-    Emit(*m_root, handler, am);
+    Emit(*m_root, handler, am, preserve_aliases);
   handler.OnDocumentEnd();
 }
 
 void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
-                      AliasManager& am) const {
+                      AliasManager& am, bool preserve_aliases) const {
   anchor_t anchor = NullAnchor;
-  if (IsAliased(node)) {
+  if (preserve_aliases && IsAliased(node)) {
     anchor = am.LookupAnchor(node);
     if (anchor) {
       handler.OnAlias(Mark(), anchor);
@@ -77,14 +77,14 @@ void NodeEvents::Emit(const detail::node& node, EventHandler& handler,
     case NodeType::Sequence:
       handler.OnSequenceStart(Mark(), node.tag(), anchor, node.style());
       for (auto element : node)
-        Emit(*element, handler, am);
+        Emit(*element, handler, am, preserve_aliases);
       handler.OnSequenceEnd();
       break;
     case NodeType::Map:
       handler.OnMapStart(Mark(), node.tag(), anchor, node.style());
       for (auto element : node) {
-        Emit(*element.first, handler, am);
-        Emit(*element.second, handler, am);
+        Emit(*element.first, handler, am, preserve_aliases);
+        Emit(*element.second, handler, am, preserve_aliases);
       }
       handler.OnMapEnd();
       break;

diff --git a/src/nodeevents.h b/src/nodeevents.h
@@ -31,7 +31,7 @@ class NodeEvents {
   NodeEvents& operator=(const NodeEvents&) = delete;
   NodeEvents& operator=(NodeEvents&&) = delete;
 
-  void Emit(EventHandler& handler);
+  void Emit(EventHandler& handler, bool preserve_aliases);
 
  private:
   class AliasManager {
@@ -53,7 +53,7 @@ class NodeEvents {
 
   void Setup(const detail::node& node);
   void Emit(const detail::node& node, EventHandler& handler,
-            AliasManager& am) const;
+            AliasManager& am, bool preserve_aliases) const;
   bool IsAliased(const detail::node& node) const;
 
  private: