Improved support for string_views for TOML and XML (#445)

* Improved support for string_views for TOML and XML

* Upgrade to pugixml 1.15 in order to be able to use string views

Author: liuzicheng1987

conanfile.py

@@ -82,7 +82,7 @@ def requirements(self):
         if self.options.with_toml:
             self.requires("tomlplusplus/3.4.0", transitive_headers=True)
         if self.options.with_xml:
-            self.requires("pugixml/1.14", transitive_headers=True)
+            self.requires("pugixml/1.15", transitive_headers=True)
         if self.options.with_yaml:
             self.requires("yaml-cpp/0.8.0", transitive_headers=True)
 

include/rfl/toml/read.hpp

@@ -3,6 +3,7 @@
 
 #include <istream>
 #include <string>
+#include <string_view>
 #include <toml++/toml.hpp>
 
 #include "../Processors.hpp"
@@ -25,18 +26,12 @@ auto read(InputVarType _var) {
   return Parser<T, ProcessorsType>::read(r, _var);
 }
 
-/// Reads a TOML string.
-template <class T, class... Ps>
-Result<internal::wrap_in_rfl_array_t<T>> read(const std::string& _toml_str) {
-  auto table = ::toml::parse(_toml_str);
-  return read<T, Ps...>(&table);
-}
-
 /// Reads a TOML string.
 template <class T, class... Ps>
 Result<internal::wrap_in_rfl_array_t<T>> read(
     const std::string_view _toml_str) {
-  return read<T, Ps...>(std::string(_toml_str));
+  auto table = ::toml::parse(_toml_str);
+  return read<T, Ps...>(&table);
 }
 
 /// Parses an object from a stringstream.

include/rfl/xml/read.hpp

@@ -12,8 +12,7 @@
 #include "Parser.hpp"
 #include "Reader.hpp"
 
-namespace rfl {
-namespace xml {
+namespace rfl ::xml {
 
 using InputVarType = typename Reader::InputVarType;
 
@@ -32,7 +31,7 @@ auto read(const InputVarType& _var) {
 template <class T, class... Ps>
 Result<T> read(const std::string_view _xml_str) {
   pugi::xml_document doc;
-  const auto result = doc.load_string(_xml_str.data());
+  const auto result = doc.load_buffer(_xml_str.data(), _xml_str.size());
   if (!result) {
     return error("XML string could not be parsed: " +
                  std::string(result.description()));
@@ -49,7 +48,6 @@ auto read(std::istream& _stream) {
   return read<T, Ps...>(xml_str);
 }
 
-}  // namespace xml
-}  // namespace rfl
+}  // namespace rfl::xml
 
 #endif

src/rfl/xml/Writer.cpp

@@ -78,8 +78,8 @@ Writer::OutputArrayType Writer::add_array_to_object(
 
 Writer::OutputVarType Writer::add_value_to_array_impl(
     const std::string& _str, OutputArrayType* _parent) const noexcept {
-  auto node_child = Ref<pugi::xml_node>::make(
-      _parent->node_->append_child(_parent->name_.data()));
+  auto node_child =
+      Ref<pugi::xml_node>::make(_parent->node_->append_child(_parent->name_));
   node_child->append_child(pugi::node_pcdata).set_value(_str.c_str());
   return OutputVarType(node_child);
 }
@@ -88,38 +88,38 @@ Writer::OutputVarType Writer::add_value_to_object_impl(
     const std::string_view& _name, const std::string& _str,
     OutputObjectType* _parent, const bool _is_attribute) const noexcept {
   if (_is_attribute) {
-    _parent->node_->append_attribute(_name.data()) = _str.c_str();
+    _parent->node_->append_attribute(_name) = _str.c_str();
     return OutputVarType(_parent->node_);
   } else if (_name == XML_CONTENT) {
     _parent->node_->append_child(pugi::node_pcdata).set_value(_str.c_str());
     return OutputVarType(_parent->node_);
   } else {
     auto node_child =
-        Ref<pugi::xml_node>::make(_parent->node_->append_child(_name.data()));
+        Ref<pugi::xml_node>::make(_parent->node_->append_child(_name));
     node_child->append_child(pugi::node_pcdata).set_value(_str.c_str());
     return OutputVarType(node_child);
   }
 }
 
 Writer::OutputObjectType Writer::add_object_to_array(
     const size_t _size, OutputArrayType* _parent) const noexcept {
-  auto node_child = Ref<pugi::xml_node>::make(
-      _parent->node_->append_child(_parent->name_.data()));
+  auto node_child =
+      Ref<pugi::xml_node>::make(_parent->node_->append_child(_parent->name_));
   return OutputObjectType(node_child);
 }
 
 Writer::OutputObjectType Writer::add_object_to_object(
     const std::string_view& _name, const size_t _size,
     OutputObjectType* _parent) const noexcept {
   auto node_child =
-      Ref<pugi::xml_node>::make(_parent->node_->append_child(_name.data()));
+      Ref<pugi::xml_node>::make(_parent->node_->append_child(_name));
   return OutputObjectType(node_child);
 }
 
 Writer::OutputVarType Writer::add_null_to_array(
     OutputArrayType* _parent) const noexcept {
-  auto node_child = Ref<pugi::xml_node>::make(
-      _parent->node_->append_child(_parent->name_.data()));
+  auto node_child =
+      Ref<pugi::xml_node>::make(_parent->node_->append_child(_parent->name_));
   return OutputVarType(node_child);
 }
 
@@ -132,7 +132,7 @@ Writer::OutputVarType Writer::add_null_to_object(
     return OutputVarType(_parent->node_);
   } else {
     auto node_child =
-        Ref<pugi::xml_node>::make(_parent->node_->append_child(_name.data()));
+        Ref<pugi::xml_node>::make(_parent->node_->append_child(_name));
     return OutputVarType(node_child);
   }
 }

vcpkg.json

@@ -142,7 +142,7 @@
       "dependencies": [
         {
           "name": "pugixml",
-          "version>=": "1.14"
+          "version>=": "1.15"
         }
       ]
     },