fix(xml): fix XMLNode ctor and remove bogus XMLNode::Init function

Author: fallenoak

common/xml/XMLNode.cpp

@@ -1,8 +1,19 @@
 #include "common/xml/XMLNode.hpp"
 #include <storm/String.hpp>
 
-XMLNode::XMLNode() {
-    // TODO
+XMLNode::XMLNode(XMLNode* parent, const char* name) {
+    this->m_parent = parent;
+    this->m_name.Copy(name);
+
+    if (this->m_parent && this->m_parent->m_body) {
+        this->m_next = nullptr;
+        this->m_userData = nullptr;
+        this->m_offset = this->m_parent->m_bodyLen;
+    } else {
+        this->m_offset = 0;
+        this->m_next = nullptr;
+        this->m_userData = nullptr;
+    }
 }
 
 XMLNode::~XMLNode() {
@@ -55,26 +66,6 @@ const XMLNode* XMLNode::GetSibling() const {
     return this->m_next;
 }
 
-void XMLNode::Init(XMLNode* parent, const char* name) {
-    RCString(this->m_name);
-    TSGrowableArray<XMLAttribute>(this->m_attributes);
-    this->m_parent = parent;
-    this->m_child = nullptr;
-    this->m_name.Copy(name);
-    this->m_body = nullptr;
-    this->m_bodyLen = 0;
-
-    if (this->m_parent && this->m_parent->m_body) {
-        this->m_next = nullptr;
-        this->m_userData = nullptr;
-        this->m_offset = this->m_parent->m_bodyLen;
-    } else {
-        this->m_offset = 0;
-        this->m_next = nullptr;
-        this->m_userData = nullptr;
-    }
-}
-
 void XMLNode::SetAttribute(const char* name, const char* value) {
     auto attributeCount = this->m_attributes.Count();
 

common/xml/XMLNode.hpp

@@ -11,24 +11,23 @@ class XMLNode {
     // Member variables
     void* m_userData;
     XMLNode* m_parent;
-    XMLNode* m_child;
+    XMLNode* m_child = nullptr;
     RCString m_name;
-    char* m_body;
-    uint32_t m_bodyLen;
+    char* m_body = nullptr;
+    uint32_t m_bodyLen = 0;
     TSGrowableArray<XMLAttribute> m_attributes;
     uint32_t m_offset;
     XMLNode* m_next;
 
     // Member functions
-    XMLNode();
+    XMLNode(XMLNode* parent, const char* name);
     ~XMLNode();
     const char* GetAttributeByName(const char* name) const;
     const char* GetBody() const;
     const XMLNode* GetChild() const;
     const XMLNode* GetChildByName(const char* name) const;
     const char* GetName() const;
     const XMLNode* GetSibling() const;
-    void Init(XMLNode* parent, const char* name);
     void SetAttribute(const char* name, const char* value);
 };
 

common/xml/XMLTree.cpp

@@ -15,8 +15,7 @@ void begin_element(void* userData, const XML_Char* name, const XML_Char** atts)
         // TODO allocate node off of node heap
         // XMLNode* node = XMLNode::s_XMLNodeHeap->GetData(0, __FILE__, __LINE__);
 
-        node = new XMLNode;
-        node->Init(tree->leaf, name);
+        node = new XMLNode(tree->leaf, name);
     }
 
     auto leaf = tree->leaf;

test/XML.cpp

@@ -6,6 +6,11 @@ TEST_CASE("XMLTree_Load", "[xml]") {
     SECTION("loads new tree") {
         auto xml = "<Root><Child1></Child1><Child2></Child2></Root>";
         auto tree = XMLTree_Load(xml, SStrLen(xml));
+
         REQUIRE(tree);
+        REQUIRE(tree->root);
+        REQUIRE(!SStrCmpI(tree->root->GetName(), "Root"));
+        REQUIRE(tree->root->GetChild());
+        REQUIRE(!SStrCmpI(tree->root->GetChild()->GetName(), "Child1"));
     }
 }