Adapted XML and flexbuffers to the new writer

getml · Dec 31, 2023 · 09e8f86 · 09e8f86
1 parent ef47113
commit 09e8f86
Show file tree

Hide file tree

Showing 21 changed files with 293 additions and 548 deletions.
diff --git a/include/rfl/flexbuf/OutputArray.hpp b/include/rfl/flexbuf/OutputArray.hpp
diff --git a/include/rfl/flexbuf/OutputNull.hpp b/include/rfl/flexbuf/OutputNull.hpp
diff --git a/include/rfl/flexbuf/OutputObject.hpp b/include/rfl/flexbuf/OutputObject.hpp
diff --git a/include/rfl/flexbuf/OutputValue.hpp b/include/rfl/flexbuf/OutputValue.hpp
diff --git a/include/rfl/flexbuf/OutputVar.hpp b/include/rfl/flexbuf/OutputVar.hpp
diff --git a/include/rfl/flexbuf/Parser.hpp b/include/rfl/flexbuf/Parser.hpp
@@ -1,9 +1,9 @@
 #ifndef FLEXBUF_PARSER_HPP_
 #define FLEXBUF_PARSER_HPP_
 
+#include "../parsing/Parser.hpp"
 #include "Reader.hpp"
 #include "Writer.hpp"
-#include "../parsing/Parser.hpp"
 
 namespace rfl {
 namespace flexbuf {

diff --git a/include/rfl/flexbuf/Reader.hpp b/include/rfl/flexbuf/Reader.hpp
@@ -105,10 +105,6 @@ struct Reader {
 
   rfl::Result<InputArrayType> to_array(
       const InputVarType& _var) const noexcept {
-    // Necessary, because we write empty vectors as null.
-    if (_var.IsNull()) {
-      return flexbuffers::Vector::EmptyVector();
-    }
     if (!_var.IsVector()) {
       return rfl::Error("Could not cast to Vector.");
     }
@@ -133,10 +129,6 @@ struct Reader {
 
   rfl::Result<InputObjectType> to_object(
       const InputVarType& _var) const noexcept {
-    // Necessary, because we write empty maps as null.
-    if (_var.IsNull()) {
-      return flexbuffers::Map::EmptyMap();
-    }
     if (!_var.IsMap()) {
       return rfl::Error("Could not cast to Map!");
     }