Don't reparse parent elements when cloning. (#1484)

Reparse was added in #589 to deal with the possibility that the meaning of an Element's value depends on the attributes in the element and those attributes might be different when reparenting. However, this does not apply when cloning since there will be no change in the attributes in the cloned element. --------- Signed-off-by: Arjo Chakravarty <[email protected]> Signed-off-by: Arjo Chakravarty <[email protected]> Signed-off-by: Addisu Z. Taddese <[email protected]> Co-authored-by: Steve Peters <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
gazebosim · Dec 20, 2024 · c8fdaa0 · c8fdaa0
1 parent 69c82c0
commit c8fdaa0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/include/sdf/Param.hh b/include/sdf/Param.hh
@@ -326,6 +326,14 @@ namespace sdf
     public: bool SetParentElement(ElementPtr _parentElement,
                                   sdf::Errors &_errors);
 
+    /// \brief Set the parent Element of this Param without reparsing.
+    /// This is meant for internal consumption when cloning elements.
+    /// \param[in] _parentElement Pointer to new parent Element. A nullptr can
+    /// be provided to remove the current parent Element.
+    /// \return True if the parent Element was set.
+    public: bool SetParentElementNoReparse(
+        ElementPtr _parentElement);
+
     /// \brief Reset the parameter to the default value.
     public: void Reset();
 

diff --git a/src/Element.cc b/src/Element.cc
@@ -256,7 +256,7 @@ ElementPtr Element::Clone(sdf::Errors &_errors) const
        aiter != this->dataPtr->attributes.end(); ++aiter)
   {
     auto clonedAttribute = (*aiter)->Clone();
-    SDF_ASSERT(clonedAttribute->SetParentElement(clone),
+    SDF_ASSERT(clonedAttribute->SetParentElementNoReparse(clone),
         "Cannot set parent Element of cloned attribute Param to cloned "
         "Element.");
     clone->dataPtr->attributes.push_back(clonedAttribute);
@@ -279,7 +279,7 @@ ElementPtr Element::Clone(sdf::Errors &_errors) const
   if (this->dataPtr->value)
   {
     clone->dataPtr->value = this->dataPtr->value->Clone();
-    SDF_ASSERT(clone->dataPtr->value->SetParentElement(clone),
+    SDF_ASSERT(clone->dataPtr->value->SetParentElementNoReparse(clone),
         "Cannot set parent Element of cloned value Param to cloned Element.");
   }
 

diff --git a/src/Param.cc b/src/Param.cc
@@ -1326,6 +1326,13 @@ bool Param::SetParentElement(ElementPtr _parentElement, sdf::Errors &_errors)
   return true;
 }
 
+//////////////////////////////////////////////////
+bool Param::SetParentElementNoReparse(ElementPtr _parentElement)
+{
+  this->dataPtr->parentElement = _parentElement;
+  return true;
+}
+
 //////////////////////////////////////////////////
 void Param::Reset()
 {