Fixed Cap'n Proto

Author: liuzicheng1987

include/rfl/capnproto/Reader.hpp

@@ -166,7 +166,8 @@ class RFL_API Reader {
       for (auto entry : entries) {
         auto s = entry.template as<capnp::DynamicStruct>();
         const auto key = s.get("key").as<capnp::Text>();
-        _map_reader.read(std::string_view(key.cStr(), key.size()), InputVarType{s.get("value")});
+        _map_reader.read(std::string_view(key.cStr(), key.size()),
+                         InputVarType{s.get("value")});
       }
       return std::nullopt;
     } catch (std::exception& e) {

include/rfl/capnproto/Writer.hpp

@@ -10,15 +10,11 @@
 #include <string_view>
 #include <type_traits>
 
-// #include "../Box.hpp"
 #include "../Bytestring.hpp"
-// #include "../Ref.hpp"
-// #include "../Result.hpp"
 #include "../Vectorstring.hpp"
 #include "../always_false.hpp"
-#include "../internal/is_literal.hpp"
-// #include "../internal/ptr_cast.hpp"
 #include "../common.hpp"
+#include "../internal/is_literal.hpp"
 
 namespace rfl::capnproto {
 
@@ -193,7 +189,7 @@ class RFL_API Writer {
     auto entries =
         OutputArrayType{_parent->val_.get("entries").as<capnp::DynamicList>()};
     auto new_entry = add_object_to_array(2, &entries);
-    new_entry.val_.set("key", { _name.data(), _name.size() });
+    add_value_to_object("key", _name, &new_entry);
     return add_value_to_object("value", _var, &new_entry);
   }
 
@@ -202,20 +198,22 @@ class RFL_API Writer {
                                     const T& _var,
                                     OutputObjectType* _parent) const {
     if constexpr (std::is_same<std::remove_cvref_t<T>, std::string>()) {
-      _parent->val_.set({ _name.data(), _name.size() }, { _var.c_str(), _var.size() });
+      _parent->val_.set(to_kj_string_ptr(_name), _var.c_str());
 
     } else if constexpr (std::is_same<std::remove_cvref_t<T>,
                                       rfl::Bytestring>()) {
       const auto array_ptr = kj::ArrayPtr<const kj::byte>(
           internal::ptr_cast<const unsigned char*>(_var.data()), _var.size());
-      _parent->val_.set({ _name.data(), _name.size() }, capnp::Data::Reader(array_ptr));
+      _parent->val_.set(to_kj_string_ptr(_name),
+                        capnp::Data::Reader(array_ptr));
 
     } else if constexpr (std::is_floating_point<std::remove_cvref_t<T>>() ||
                          std::is_same<std::remove_cvref_t<T>, bool>()) {
-      _parent->val_.set({ _name.data(), _name.size() }, _var);
+      _parent->val_.set(to_kj_string_ptr(_name), _var);
 
     } else if constexpr (std::is_integral<std::remove_cvref_t<T>>()) {
-      _parent->val_.set({ _name.data(), _name.size() }, static_cast<std::int64_t>(_var));
+      _parent->val_.set(to_kj_string_ptr(_name),
+                        static_cast<std::int64_t>(_var));
 
     } else if constexpr (internal::is_literal_v<T>) {
       return add_value_to_object(_name, _var.value(), _parent);
@@ -262,6 +260,11 @@ class RFL_API Writer {
 
   void end_object(OutputObjectType* /*_obj*/) const {}
 
+ private:
+  kj::StringPtr to_kj_string_ptr(const std::string_view& _str) const {
+    return kj::StringPtr(_str.begin(), _str.end());
+  }
+
  private:
   capnp::DynamicStruct::Builder* root_;
 };

src/rfl/capnproto/Writer.cpp

@@ -47,8 +47,9 @@ Writer::OutputArrayType Writer::add_array_to_map(const std::string_view& _name,
 Writer::OutputArrayType Writer::add_array_to_object(
     const std::string_view& _name, const size_t _size,
     OutputObjectType* _parent) const {
-  return OutputArrayType{_parent->val_.init({ _name.data(), _name.size() }, SafeSizeToUInt(_size))
-                             .as<capnp::DynamicList>()};
+  return OutputArrayType{
+      _parent->val_.init(to_kj_string_ptr(_name), SafeSizeToUInt(_size))
+          .as<capnp::DynamicList>()};
 }
 
 Writer::OutputArrayType Writer::add_array_to_union(
@@ -111,7 +112,7 @@ Writer::OutputObjectType Writer::add_object_to_object(
     const std::string_view& _name, const size_t /*_size*/,
     OutputObjectType* _parent) const {
   return OutputObjectType{
-      _parent->val_.get({ _name.data(), _name.size() }).as<capnp::DynamicStruct>()};
+      _parent->val_.get(to_kj_string_ptr(_name)).as<capnp::DynamicStruct>()};
 }
 
 Writer::OutputObjectType Writer::add_object_to_union(
@@ -142,7 +143,7 @@ Writer::OutputUnionType Writer::add_union_to_map(const std::string_view& _name,
 Writer::OutputUnionType Writer::add_union_to_object(
     const std::string_view& _name, OutputObjectType* _parent) const {
   return OutputUnionType{
-      _parent->val_.get({ _name.data(), _name.size() }).as<capnp::DynamicStruct>()};
+      _parent->val_.get(to_kj_string_ptr(_name)).as<capnp::DynamicStruct>()};
 }
 
 Writer::OutputUnionType Writer::add_union_to_union(
@@ -171,7 +172,7 @@ Writer::OutputVarType Writer::add_null_to_map(const std::string_view& _name,
 
 Writer::OutputVarType Writer::add_null_to_object(
     const std::string_view& _name, OutputObjectType* _parent) const {
-  _parent->val_.set({ _name.data(), _name.size() }, capnp::VOID);
+  _parent->val_.set(to_kj_string_ptr(_name), capnp::VOID);
   return OutputVarType{};
 }