Improvements to Untie().

* Add an assertion to check that we are not trying to untie a tied property.
* Add an overload to specify the property as a pointer in addition to specifying a property name.

src/input_output/FGPropertyManager.cpp

@@ -28,6 +28,7 @@
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+#include <assert.h>
 #include "FGPropertyManager.h"
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -301,16 +302,26 @@ void FGPropertyNode::SetWritable (const string &name, bool state )
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-void FGPropertyManager::Untie (const string &name)
+void FGPropertyManager::Untie(const string &name)
 {
   SGPropertyNode* property = root->getNode(name.c_str());
   if (!property) {
     cerr << "Attempt to untie a non-existant property." << name << endl;
     return;
   }
 
-  vector <SGPropertyNode_ptr>::iterator it;
-  for (it = tied_properties.begin(); it != tied_properties.end(); ++it) {
+  Untie(property);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGPropertyManager::Untie(SGPropertyNode *property)
+{
+  const char *name = property->getName();
+
+  assert(property->isTied());
+
+  for (auto it = tied_properties.begin(); it != tied_properties.end(); ++it) {
     if (*it == property) {
       property->untie();
       tied_properties.erase(it);

src/input_output/FGPropertyManager.h

@@ -413,9 +413,21 @@ class FGPropertyManager
      *
      * Classes should use this function to release control of any
      * properties they are managing.
+     *
+     * @param name The property name to untie (full path).
      */
     void Untie (const std::string &name);
 
+    /**
+     * Untie a property from an external data source.
+     *
+     * Classes should use this function to release control of any
+     * properties they are managing.
+     *
+     * @param property A pointer to the property to untie.
+     */
+    void Untie (SGPropertyNode* property);
+
     /**
      * Unbind all properties bound by this manager to an external data source.
      *

src/math/FGFunction.cpp

@@ -890,10 +890,8 @@ void FGFunction::Load(Element* el, FGPropertyValue* var, FGFDMExec* fdmex,
 
 FGFunction::~FGFunction()
 {
-  if (pNode && pNode->isTied()) {
-    string pName = pNode->GetFullyQualifiedName();
-    PropertyManager->Untie(pName);
-  }
+  if (pNode && pNode->isTied())
+    PropertyManager->Untie(pNode);
 
   Debug(1);
 }

src/math/FGTable.cpp

@@ -393,8 +393,10 @@ FGTable::~FGTable()
   // Untie the bound property so that it makes no further reference to this
   // instance of FGTable after the destruction is completed.
   if (!Name.empty() && !internal) {
-    string tmp = mkPropertyName(nullptr, "");
-    PropertyManager->Untie(tmp);
+    string tmp = PropertyManager->mkPropertyName(Name, false);
+    FGPropertyNode* node = PropertyManager->GetNode(tmp);
+    if (node && node->isTied())
+      PropertyManager->Untie(node);
   }
 
   if (nTables > 0) {
@@ -651,33 +653,26 @@ void FGTable::Print(void)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-string FGTable::mkPropertyName(Element* el, const std::string& Prefix)
-{
-  if (!Prefix.empty()) {
-    if (is_number(Prefix)) {
-      if (Name.find("#") != string::npos) { // if "#" is found
-        Name = replace(Name, "#", Prefix);
-      } else {
-        cerr << el->ReadFrom()
-              << "Malformed table name with number: " << Prefix
-              << " and property name: " << Name
-              << " but no \"#\" sign for substitution." << endl;
-      }
-    } else {
-      Name = Prefix + "/" + Name;
-    }
-  }
-
-  return PropertyManager->mkPropertyName(Name, false);
-}
-
-//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 void FGTable::bind(Element* el, const string& Prefix)
 {
   typedef double (FGTable::*PMF)(void) const;
+
   if ( !Name.empty() && !internal) {
-    string tmp = mkPropertyName(el, Prefix);
+    if (!Prefix.empty()) {
+      if (is_number(Prefix)) {
+        if (Name.find("#") != string::npos) { // if "#" is found
+          Name = replace(Name, "#", Prefix);
+        } else {
+          cerr << el->ReadFrom()
+                << "Malformed table name with number: " << Prefix
+                << " and property name: " << Name
+                << " but no \"#\" sign for substitution." << endl;
+        }
+      } else {
+        Name = Prefix + "/" + Name;
+      }
+    }
+    string tmp = PropertyManager->mkPropertyName(Name, false);
 
     if (PropertyManager->HasNode(tmp)) {
       FGPropertyNode* _property = PropertyManager->GetNode(tmp);
@@ -687,7 +682,8 @@ void FGTable::bind(Element* el, const string& Prefix)
         throw("Failed to bind the property to an existing already tied node.");
       }
     }
-    PropertyManager->Tie( tmp, this, (PMF)&FGTable::GetValue);
+
+    PropertyManager->Tie(tmp, this, (PMF)&FGTable::GetValue);
   }
 }
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

src/math/FGTable.h

@@ -318,8 +318,6 @@ class FGTable : public FGParameter, public FGJSBBase
   double** Allocate(void);
   std::string Name;
   void bind(Element* el, const std::string& Prefix);
-
-  std::string mkPropertyName(Element* el, const std::string& Prefix);
   void Debug(int from);
 };
 }