Răsfoiți Sursa

Rename XmlParseData struct

Patrick-Christopher Mattulat 3 ani în urmă
părinte
comite
4555d4933a

+ 1 - 1
include/ls_std/io/xml/XmlParseData.hpp → include/ls_std/io/xml/XmlParseParameter.hpp

@@ -16,7 +16,7 @@
 
 namespace ls_std
 {
-  struct XmlParseData
+  struct XmlParseParameter
   {
     uint8_t level{};
     std::shared_ptr<ls_std::XmlNode> node{};

+ 3 - 3
include/ls_std/io/xml/XmlParser.hpp

@@ -14,7 +14,7 @@
 #include <ls_std/base/Types.hpp>
 #include "XmlDocument.hpp"
 #include "XmlParseMode.hpp"
-#include "XmlParseData.hpp"
+#include "XmlParseParameter.hpp"
 #include <list>
 
 namespace ls_std
@@ -41,7 +41,7 @@ namespace ls_std
       std::shared_ptr<ls_std::XmlDocument> document{};
       uint8_t maxLevel{};
       ls_std::XmlParseMode mode{};
-      std::list<ls_std::XmlParseData> parseData{};
+      std::list<ls_std::XmlParseParameter> parseParameters{};
 
       void _analyze(const ls_std::byte_field &_data, std::string::size_type _index);
       void _assignDocument(const std::shared_ptr<ls_std::XmlDocument> &_document);
@@ -55,7 +55,7 @@ namespace ls_std
       void _isOpeningTag(const ls_std::byte_field &_data, std::string::size_type _index);
       void _isValue(const ls_std::byte_field &_data, std::string::size_type _index);
       void _mergeNodes();
-      void _mergeChildrenToParentNode(const std::shared_ptr<ls_std::XmlNode> &_parent, std::list<ls_std::XmlParseData>::iterator &_iterator, uint8_t _parentLevel);
+      void _mergeChildrenToParentNode(const std::shared_ptr<ls_std::XmlNode> &_parent, std::list<ls_std::XmlParseParameter>::iterator &_iterator, uint8_t _parentLevel);
       void _mergeNodesOnCurrentLevel();
       void _parse(const ls_std::byte_field &_data);
       static std::pair<std::string, std::string> _parseAttribute(const ls_std::byte_field &_data);

+ 1 - 1
include/ls_std/io/xml/XmlReader.hpp

@@ -15,7 +15,7 @@
 #include <ls_std/io/IReader.hpp>
 #include <ls_std/io/File.hpp>
 #include "XmlParseMode.hpp"
-#include "XmlParseData.hpp"
+#include "XmlParseParameter.hpp"
 #include <list>
 
 namespace ls_std

+ 1 - 1
include/ls_std/ls_std.hpp

@@ -38,7 +38,7 @@
 #include "io/logging/Logger.hpp"
 #include "io/xml/XmlReader.hpp"
 #include "io/xml/XmlParseMode.hpp"
-#include "io/xml/XmlParseData.hpp"
+#include "io/xml/XmlParseParameter.hpp"
 #include "io/xml/XmlNode.hpp"
 #include "io/xml/XmlDocument.hpp"
 #include "io/xml/XmlDeclaration.hpp"

+ 11 - 11
source/ls_std/io/xml/XmlParser.cpp

@@ -207,16 +207,16 @@ void ls_std::XmlParser::_mergeNodes()
     this->maxLevel -= 1;
   }
 
-  this->document->setRootElement(this->parseData.front().node);
+  this->document->setRootElement(this->parseParameters.front().node);
 }
 
-void ls_std::XmlParser::_mergeChildrenToParentNode(const std::shared_ptr<ls_std::XmlNode> &_parent, std::list<ls_std::XmlParseData>::iterator &_iterator, uint8_t _parentLevel)
+void ls_std::XmlParser::_mergeChildrenToParentNode(const std::shared_ptr<ls_std::XmlNode> &_parent, std::list<ls_std::XmlParseParameter>::iterator &_iterator, uint8_t _parentLevel)
 {
   do
   {
     _iterator++;
 
-    if (_iterator == this->parseData.end())
+    if (_iterator == this->parseParameters.end())
     {
       break;
     }
@@ -232,10 +232,10 @@ void ls_std::XmlParser::_mergeChildrenToParentNode(const std::shared_ptr<ls_std:
 
 void ls_std::XmlParser::_mergeNodesOnCurrentLevel()
 {
-  auto iterator = this->parseData.begin();
+  auto iterator = this->parseParameters.begin();
   uint8_t parentLevel = this->maxLevel - 1;
 
-  while (iterator != this->parseData.end())
+  while (iterator != this->parseParameters.end())
   {
     if (iterator->level == parentLevel)
     {
@@ -352,15 +352,15 @@ size_t ls_std::XmlParser::_parseOpeningTag(const ls_std::byte_field &_data, std:
 {
   ls_std::String tagString{ls_std::XmlParser::_getNextTagString(_data, _index)};
   bool isValidTagString = !tagString.toString().empty();
-  ls_std::XmlParseData singleParseData{};
+  ls_std::XmlParseParameter singleParseParameter{};
 
   if (isValidTagString)
   {
     std::shared_ptr<ls_std::XmlNode> node = ls_std::XmlParser::_createNode(ls_std::XmlParser::_parseAttributes(tagString), ls_std::XmlParser::_parseTagName(tagString));
 
-    singleParseData.level = this->currentLevel;
-    singleParseData.node = node;
-    this->parseData.push_back(singleParseData);
+    singleParseParameter.level = this->currentLevel;
+    singleParseParameter.node = node;
+    this->parseParameters.push_back(singleParseParameter);
 
     if (!tagString.endsWith("/>"))
     {
@@ -387,7 +387,7 @@ ls_std::byte_field ls_std::XmlParser::_parseTagName(const ls_std::byte_field &_d
 size_t ls_std::XmlParser::_parseValue(const ls_std::byte_field &_data, std::string::size_type _index)
 {
   ls_std::byte_field value = _data.substr(_index, _data.substr(_index).find('<'));
-  this->parseData.back().node->setValue(value);
+  this->parseParameters.back().node->setValue(value);
 
   return _index + (value.size() - 1);
 }
@@ -397,7 +397,7 @@ void ls_std::XmlParser::_reset()
   this->currentLevel = 1;
   this->maxLevel = 1;
   this->mode = XML_PARSE_MODE_ANALYZE;
-  this->parseData.clear();
+  this->parseParameters.clear();
 }
 
 void ls_std::XmlParser::_setMaxLevel()