Changeset 901 for code/branches/core2/src/orxonox/core/Namespace.cc

Timestamp:

Mar 19, 2008, 12:38:32 AM (16 years ago)

Author:

landauf

Message:

Namespaces are working now. I love this feature, can't stop playing with it

File:

• code/branches/core2/src/orxonox/core/Namespace.cc (modified) (4 diffs)

code/branches/core2/src/orxonox/core/Namespace.cc

@@ -41 +41 @@
 
         this->bAutogeneratedFileRootNamespace_ = false;
-        this->bDeleteNamespaceNodesAfterDestruction_ = false;
+        this->bRoot_ = false;
         this->operator_ = "or";
     }
@@ -47 +47 @@
     Namespace::~Namespace()
     {
-        if (this->bDeleteNamespaceNodesAfterDestruction_)
+        if (this->bRoot_)
             for (std::set<NamespaceNode*>::iterator it = this->representingNamespaces_.begin(); it != this->representingNamespaces_.end(); ++it)
                 delete (*it);
@@ -73 +73 @@
             name.replace(pos, 1, " ");
         SubString tokens(name, " ", "", false, '\\', '"', '\0', '\0', '\0');
-        for (unsigned int i = 0; i < tokens.size(); i++)
+        if (this->bRoot_)
         {
-            for (std::set<NamespaceNode*>::iterator it = this->getNamespace()->representingNamespaces_.begin(); it != this->getNamespace()->representingNamespaces_.end(); ++it)
+            this->representingNamespaces_.insert(new NamespaceNode(this->getName()));
+        }
+        else
+        {
+            for (unsigned int i = 0; i < tokens.size(); i++)
             {
-                std::set<NamespaceNode*> temp = (*it)->getNodeRelative(tokens[i]);
-                this->representingNamespaces_.insert(temp.begin(), temp.end());
+                for (std::set<NamespaceNode*>::iterator it = this->getNamespace()->representingNamespaces_.begin(); it != this->getNamespace()->representingNamespaces_.end(); ++it)
+                {
+                    std::set<NamespaceNode*> temp = (*it)->getNodeRelative(tokens[i]);
+                    this->representingNamespaces_.insert(temp.begin(), temp.end());
+                }
             }
         }
@@ -138 +145 @@
         return false;
     }
+
+    std::string Namespace::toString() const
+    {
+        std::string output;
+
+        int i = 0;
+        for (std::set<NamespaceNode*>::const_iterator it = this->representingNamespaces_.begin(); it != this->representingNamespaces_.end(); i++, ++it)
+        {
+            if (i > 0)
+                output += " / ";
+
+            output += (*it)->toString();
+        }
+
+        return output;
+    }
+
+    std::string Namespace::toString(const std::string& indentation) const
+    {
+        std::string output;
+
+        int i = 0;
+        for (std::set<NamespaceNode*>::const_iterator it = this->representingNamespaces_.begin(); it != this->representingNamespaces_.end(); i++, ++it)
+        {
+            if (i > 0)
+                output += "\n";
+
+            output += (*it)->toString(indentation);
+        }
+
+        return output;
+    }
 }