...

2 files changed, 118 insertions, 19 deletions

diff --git a/src/xml/XmlNode.cpp b/src/xml/XmlNode.cpp
index cfeb5cf9..f4b43ea6 100644
--- a/src/xml/XmlNode.cpp
+++ b/src/xml/XmlNode.cpp
@@ -1,14 +1,23 @@
 #include "cru/xml/XmlNode.hpp"
 
 namespace cru::xml {
-bool operator==(const XmlNode& lhs, const XmlNode& rhs) {
-  return lhs.GetType() == rhs.GetType() && lhs.GetText() == rhs.GetText() &&
-         lhs.GetTag() == rhs.GetTag() &&
-         lhs.GetAttributes() == rhs.GetAttributes() &&
-         lhs.GetChildren() == rhs.GetChildren();
+void XmlElementNode::AddAttribute(String key, String value) {
+  attributes_[std::move(key)] = std::move(value);
 }
 
-bool operator!=(const XmlNode& lhs, const XmlNode& rhs) {
-  return !(lhs == rhs);
+void XmlElementNode::AddChild(XmlNode* child) {
+  assert(child->GetParent() == nullptr);
+  children_.push_back(child);
+  child->parent_ = this;
+}
+
+XmlNode* XmlElementNode::Clone() const {
+  XmlElementNode* node = new XmlElementNode(tag_, attributes_);
+
+  for (auto child : children_) {
+    node->AddChild(child->Clone());
+  }
+
+  return node;
 }
 }  // namespace cru::xml
diff --git a/src/xml/XmlParser.cpp b/src/xml/XmlParser.cpp
index 23407d11..f24a7f68 100644
--- a/src/xml/XmlParser.cpp
+++ b/src/xml/XmlParser.cpp
@@ -1,27 +1,117 @@
 #include "cru/xml/XmlParser.hpp"
+#include "cru/xml/XmlNode.hpp"
 
 namespace cru::xml {
-XmlNode XmlParser::Parse() {
-  if (!root_node_) {
-    root_node_ = DoParse();
+XmlElementNode* XmlParser::Parse() {
+  if (!cache_) {
+    cache_ = DoParse();
   }
-  return *root_node_;
+  return static_cast<XmlElementNode*>(cache_->Clone());
 }
 
-XmlNode XmlParser::DoParse() {
-  XmlNode root(XmlNode::Type::Element);
-  XmlNode* current = &root;
-  int current_position = 0;
+char16_t XmlParser::Read1() {
+  if (current_position_ >= xml_.size()) {
+    throw XmlParsingException(u"Unexpected end of xml");
+  }
+  return xml_[current_position_++];
+}
+
+void XmlParser::ReadSpacesAndDiscard() {
+  while (current_position_ < xml_.size() &&
+         (xml_[current_position_] == ' ' || xml_[current_position_] == '\t' ||
+          xml_[current_position_] == '\n' || xml_[current_position_] == '\r')) {
+    ++current_position_;
+  }
+}
+
+String XmlParser::ReadSpaces() {
+  String spaces;
+  while (current_position_ < xml_.size() &&
+         (xml_[current_position_] == ' ' || xml_[current_position_] == '\t' ||
+          xml_[current_position_] == '\n' || xml_[current_position_] == '\r')) {
+    spaces += xml_[current_position_];
+    ++current_position_;
+  }
+  return spaces;
+}
+
+String XmlParser::ReadIdenitifier() {
+  String identifier;
+  while (current_position_ < xml_.size() &&
+         (xml_[current_position_] >= 'a' && xml_[current_position_] <= 'z' ||
+          xml_[current_position_] >= 'A' && xml_[current_position_] <= 'Z' ||
+          xml_[current_position_] >= '0' && xml_[current_position_] <= '9' ||
+          xml_[current_position_] == '_')) {
+    identifier += xml_[current_position_];
+    ++current_position_;
+  }
+  return identifier;
+}
+
+String XmlParser::ReadAttributeString() {
+  if (Read1() != '"') {
+    throw XmlParsingException(u"Expected \".");
+  }
+
+  String string;
+
+  while (true) {
+    char16_t c = Read1();
+
+    if (c == '"') {
+      break;
+    }
+
+    string += c;
+  }
+
+  return string;
+}
 
-  // TODO: Implement this.
-  while (current_position < xml_.size()) {
-    switch (xml_[current_position]) {
+XmlElementNode* XmlParser::DoParse() {
+  while (current_position_ < xml_.size()) {
+    switch (xml_[current_position_]) {
       case '<': {
+        ++current_position_;
+
+        if (Read1() == '/') {
+        } else {
+          ReadSpacesAndDiscard();
+
+          String tag = ReadIdenitifier();
+
+          XmlElementNode* node = new XmlElementNode(tag);
+
+          while (true) {
+            ReadSpacesAndDiscard();
+            if (Read1() == '>') {
+              break;
+            } else {
+              String attribute_name = ReadIdenitifier();
+
+              ReadSpacesAndDiscard();
+
+              if (Read1() != '=') {
+                throw XmlParsingException(u"Expected '='");
+              }
+
+              ReadSpacesAndDiscard();
+
+              String attribute_value = ReadAttributeString();
+
+              node->AddAttribute(attribute_name, attribute_value);
+            }
+          }
+
+          current_->AddChild(node);
+          current_ = node;
+        }
+
         break;
       }
     }
   }
 
-  return root;
+  return pseudo_root_node_;
 }
 }  // namespace cru::xml