mirror of
https://github.com/fraillt/bitsery.git
synced 2026-06-08 08:13:56 +00:00
extensions for tuple, variant and chrono types
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -3,3 +3,4 @@
|
||||
build/
|
||||
cmake-build-*
|
||||
CTestConfig.cmake
|
||||
Testing/
|
||||
|
||||
13
CHANGELOG.md
13
CHANGELOG.md
@@ -1,3 +1,16 @@
|
||||
# [4.6.0](https://github.com/fraillt/bitsery/compare/v4.5.1...v4.6.0) (2019-03-12)
|
||||
|
||||
### Features
|
||||
* new extensions **StdTuple** and **StdVariant** for `std::tuple` and `std::variant`. These are the first extensions that requires C++17, or higher, standard enabled.
|
||||
Although `std::tuple` is C++11 type, but from usage perspective it has exactly the same requirements as `std::variant` and relies heavily on having class template argument deduction guides to make it convenient to use.
|
||||
You can easily use `std::tuple` without any extension at all, so the main motivation was to create convenient interface for **StdVariant** and use the same interface for **StdTuple** as well.
|
||||
* instead of providing custom lambda to overload each type in tuple or variant, there was added several helper callable objects.
|
||||
**OverloadValue** wrapper around `s.value<N>(o)`, **OverloadExtValue** wrapper around `s.ext<N>(o, Ext{})` and **OverloadExtObject** wrapper around `s.ext(o, Ext{})`.
|
||||
* new extensions **StdDuration** and **StdTimePoint** for `std::chrono::duration` and `std::chrono::time_point`.
|
||||
|
||||
### Improvements
|
||||
tests now uses `gtest_discover_tests` function, to automatically discover tests, which requires CMake 3.10.
|
||||
|
||||
# [4.5.1](https://github.com/fraillt/bitsery/compare/v4.5.0...v4.5.1) (2019-01-16)
|
||||
|
||||
### Improvements
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
project(bitsery
|
||||
LANGUAGES CXX
|
||||
VERSION 4.5.1)
|
||||
VERSION 4.6.0)
|
||||
|
||||
#======== build options ===================================
|
||||
option(BITSERY_BUILD_EXAMPLES "Build examples" OFF)
|
||||
|
||||
@@ -96,6 +96,8 @@ This documentation comprises these parts:
|
||||
|
||||
Works with C++11 compiler, no additional dependencies, include `<bitsery/bitsery.h>` and you're done.
|
||||
|
||||
> some **bitsery** extensions might require higher C++ standard (e.g. `StdVariant`)
|
||||
|
||||
## Platforms
|
||||
|
||||
This library was tested on
|
||||
|
||||
@@ -35,12 +35,16 @@ Serializer/Deserializer extensions via `ext` method (alphabetical order):
|
||||
* `PointerOwner` (4.1.0)
|
||||
* `PointerObserver` (4.1.0)
|
||||
* `ReferencedByPointer` (4.1.0)
|
||||
* `StdDuration` (4.6.0)
|
||||
* `StdMap` (3.0.0)
|
||||
* `StdOptional` (2.0.0)
|
||||
* `StdQueue` (4.0.0)
|
||||
* `StdSet` (4.0.0)
|
||||
* `StdSmartPrt` (4.3.0)
|
||||
* `StdStack` (4.0.0)
|
||||
* `StdTimePoint` (4.6.0)
|
||||
* `StdTuple` (4.6.0) (requires c++17)
|
||||
* `StdVariant` (4.6.0) (requires c++17)
|
||||
* `ValueRange` (3.0.0)
|
||||
* `VirtualBaseClass` (4.2.0)
|
||||
|
||||
|
||||
115
examples/composite_types.cpp
Normal file
115
examples/composite_types.cpp
Normal file
@@ -0,0 +1,115 @@
|
||||
#include <bitsery/bitsery.h>
|
||||
#include <bitsery/adapter/buffer.h>
|
||||
#include <bitsery/traits/vector.h>
|
||||
// include extensions to work with tuples and variants
|
||||
// these extesions only work with C++17
|
||||
|
||||
#if __cplusplus > 201402L
|
||||
#include <bitsery/ext/std_tuple.h>
|
||||
#include <bitsery/ext/std_variant.h>
|
||||
// let's include this extension to make it more interesting :)
|
||||
#include <bitsery/ext/compact_value.h>
|
||||
|
||||
struct MyStruct {
|
||||
std::vector<int32_t> v{};
|
||||
float f{};
|
||||
|
||||
bool operator==(const MyStruct& rhs) const {
|
||||
return v == rhs.v && f == rhs.f;
|
||||
}
|
||||
};
|
||||
|
||||
template<typename S>
|
||||
void serialize(S& s, MyStruct& o) {
|
||||
s.container4b(o.v, 1000);
|
||||
s.value4b(o.f);
|
||||
}
|
||||
|
||||
// this will be the type that we want to serialize/deserialize
|
||||
using MyTuple = std::tuple<float, MyStruct>;
|
||||
using MyVariant = std::variant<int64_t, MyTuple, MyStruct>;
|
||||
|
||||
// for convenience
|
||||
using namespace bitsery;
|
||||
|
||||
// define default serialize function for MyVariant, so that we could use quickSerialization/Deserialization functions
|
||||
template<typename S>
|
||||
void serialize(S& s, MyVariant& o) {
|
||||
// in order to serialize a variant, it needs to know how to do it for all types
|
||||
// we can do this simply by providing any callable object, that accepts serializer and type as arguments
|
||||
s.ext(o, ext::StdVariant{
|
||||
// specify how to serialize tuple by creating a lambda
|
||||
[](S& s, MyTuple& o) {
|
||||
// StdTuple is used exactly the same as StdVariant
|
||||
s.ext(o, ext::StdTuple{
|
||||
// this is convenient callable object to specify integral value size
|
||||
// it is different equivalent to lambda [](auto& s, float&o) { s.value4b(o);}
|
||||
ext::OverloadValue<float, 4>{},
|
||||
// it is not required to provide MyStruct overload, because it we have defined 'serialize' function for it
|
||||
});
|
||||
},
|
||||
// this might also be useful if you want to overload using extension
|
||||
ext::OverloadExtValue<int64_t, 8, ext::CompactValue>{},
|
||||
// you can even go further and instead of writing lambda for MyTuple you can as well compose the same functionality
|
||||
// with OverloadExtObject, like this:
|
||||
// (comment out MyTuple lambda, and uncomment this)
|
||||
// ext::OverloadExtObject<MyTuple, ext::StdTuple<ext::OverloadValue<float, 4>>>{},
|
||||
|
||||
// we can also override default 'serialize' function by creating an overloading for that type
|
||||
[](S& s, MyStruct& o) {
|
||||
s.value4b(o.f);
|
||||
s.container(o.v, 1000, [&s](int32_t& v) {
|
||||
s.ext4b(v, ext::CompactValue{});
|
||||
});
|
||||
},
|
||||
// NOTE.
|
||||
// it is possible to provide "auto" as type parameter
|
||||
// this will allow you to override all default 'serialize' functions
|
||||
// but in this case it will not be called, because we have explicitly provided overloads for all variant types
|
||||
// also note, that first parameter (serializer) is also "auto", this is required, so that it would be least specialized case
|
||||
// otherwise it will not compile if you any ext::Overload* helper defined, because it will have ambiguous definitions
|
||||
// (ext::OverLoad* defines (templated_type& s, concrete_type& o) and lambda would be (concrete_type& s, templated_type& o))
|
||||
[](auto& , auto& ) {
|
||||
assert(false);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//some helper types
|
||||
using Buffer = std::vector<uint8_t>;
|
||||
using OutputAdapter = OutputBufferAdapter<Buffer>;
|
||||
using InputAdapter = InputBufferAdapter<Buffer>;
|
||||
|
||||
int main() {
|
||||
|
||||
//set some random data
|
||||
MyVariant data{MyTuple{-7549, {{-451, 2, 968, 75, 4, 156, 49}, 874.4f}}};
|
||||
// MyVariant data{MyStruct{{-451, 2, 968, 75, 4, 156, 49}, 874.4f}};
|
||||
MyVariant res{};
|
||||
|
||||
//create buffer to store data
|
||||
Buffer buffer;
|
||||
//use quick serialization function,
|
||||
//it will use default configuration to setup all the nesessary steps
|
||||
//and serialize data to container
|
||||
auto writtenSize = quickSerialization<OutputAdapter>(buffer, data);
|
||||
|
||||
//same as serialization, but returns deserialization state as a pair
|
||||
//first = error code, second = is buffer was successfully read from begin to the end.
|
||||
auto state = quickDeserialization<InputAdapter>({buffer.begin(), writtenSize}, res);
|
||||
|
||||
assert(state.first == ReaderError::NoError && state.second);
|
||||
assert(data == res);
|
||||
}
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#pragma message("example works only on c++17")
|
||||
#else
|
||||
#warning "example works only on c++17"
|
||||
#endif
|
||||
int main() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -25,8 +25,8 @@
|
||||
#define BITSERY_BITSERY_H
|
||||
|
||||
#define BITSERY_MAJOR_VERSION 4
|
||||
#define BITSERY_MINOR_VERSION 5
|
||||
#define BITSERY_PATCH_VERSION 1
|
||||
#define BITSERY_MINOR_VERSION 6
|
||||
#define BITSERY_PATCH_VERSION 0
|
||||
|
||||
#define BITSERY_QUOTE_MACRO(name) #name
|
||||
#define BITSERY_BUILD_VERSION_STR(major,minor, patch) \
|
||||
|
||||
@@ -242,6 +242,10 @@ namespace bitsery {
|
||||
selectSerializeFnc(s, v, SelectSerializeFnc<TDecayed>{});
|
||||
}
|
||||
|
||||
static constexpr bool isDefined() {
|
||||
return HasSerializeFunction<S, T>::value || HasSerializeMethod<S, T>::value;
|
||||
}
|
||||
|
||||
private:
|
||||
static void selectSerializeFnc(S &s, T &v, std::integral_constant<int, 0>) {
|
||||
static_assert(!(HasSerializeFunction<S, T>::value && HasSerializeMethod<S, T>::value),
|
||||
|
||||
@@ -149,6 +149,7 @@ namespace bitsery {
|
||||
}
|
||||
|
||||
namespace traits {
|
||||
|
||||
template<typename T>
|
||||
struct ExtensionTraits<ext::CompactValue, T> {
|
||||
using TValue = T;
|
||||
@@ -168,6 +169,14 @@ namespace bitsery {
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
template<typename T, bool Check>
|
||||
struct ExtensionTraits<details::CompactValueImpl<Check>, T> {
|
||||
using TValue = T;
|
||||
static constexpr bool SupportValueOverload = !Check;
|
||||
static constexpr bool SupportObjectOverload = Check;
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
94
include/bitsery/ext/std_chrono.h
Normal file
94
include/bitsery/ext/std_chrono.h
Normal file
@@ -0,0 +1,94 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#ifndef BITSERY_EXT_STD_CHRONO_H
|
||||
#define BITSERY_EXT_STD_CHRONO_H
|
||||
|
||||
#include "../traits/core/traits.h"
|
||||
#include <chrono>
|
||||
|
||||
namespace bitsery {
|
||||
namespace ext {
|
||||
|
||||
class StdDuration {
|
||||
public:
|
||||
|
||||
template<typename Ser, typename Writer, typename T, typename Period, typename Fnc>
|
||||
void serialize(Ser&, Writer&, const std::chrono::duration<T, Period>& obj, Fnc&& fnc) const {
|
||||
auto res = obj.count();
|
||||
fnc(res);
|
||||
}
|
||||
|
||||
template<typename Des, typename Reader, typename T, typename Period, typename Fnc>
|
||||
void deserialize(Des&, Reader&, std::chrono::duration<T, Period>& obj, Fnc&& fnc) const {
|
||||
T res{};
|
||||
fnc(res);
|
||||
obj = std::chrono::duration<T, Period>{res};
|
||||
}
|
||||
};
|
||||
|
||||
class StdTimePoint {
|
||||
public:
|
||||
|
||||
template<typename Ser, typename Writer, typename Clock, typename T, typename Period, typename Fnc>
|
||||
void serialize(Ser&, Writer&, const std::chrono::time_point<Clock, std::chrono::duration<T, Period>>& obj,
|
||||
Fnc&& fnc) const {
|
||||
auto res = obj.time_since_epoch().count();
|
||||
fnc(res);
|
||||
}
|
||||
|
||||
template<typename Des, typename Reader, typename Clock, typename T, typename Period, typename Fnc>
|
||||
void deserialize(Des&, Reader&, std::chrono::time_point<Clock, std::chrono::duration<T, Period>>& obj,
|
||||
Fnc&& fnc) const {
|
||||
T res{};
|
||||
fnc(res);
|
||||
auto dur = std::chrono::duration<T, Period>{res};
|
||||
obj = std::chrono::time_point<Clock, std::chrono::duration<T, Period>>{dur};
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
namespace traits {
|
||||
template<typename Rep, typename Period>
|
||||
struct ExtensionTraits<ext::StdDuration, std::chrono::duration<Rep, Period>> {
|
||||
using TValue = Rep;
|
||||
static constexpr bool SupportValueOverload = true;
|
||||
static constexpr bool SupportObjectOverload = false;
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
template<typename Clock, typename Rep, typename Period>
|
||||
struct ExtensionTraits<ext::StdTimePoint,
|
||||
std::chrono::time_point<Clock, std::chrono::duration<Rep, Period>>> {
|
||||
using TValue = Rep;
|
||||
static constexpr bool SupportValueOverload = true;
|
||||
static constexpr bool SupportObjectOverload = false;
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif //BITSERY_EXT_STD_CHRONO_H
|
||||
@@ -24,24 +24,13 @@
|
||||
#ifndef BITSERY_EXT_STD_OPTIONAL_H
|
||||
#define BITSERY_EXT_STD_OPTIONAL_H
|
||||
|
||||
|
||||
//this module do not include optional, but expects it to be declared in std::optional
|
||||
//if you're using experimental optional from <experimental/optional>
|
||||
//add it in std namespace like this:
|
||||
//namespace std {
|
||||
// template <typename T>
|
||||
// using optional = experimental::optional<T>;
|
||||
//}
|
||||
#include <type_traits>
|
||||
#include "../traits/core/traits.h"
|
||||
#include "../details/serialization_common.h"
|
||||
#include <optional>
|
||||
|
||||
namespace bitsery {
|
||||
namespace ext {
|
||||
|
||||
template<typename T>
|
||||
using std_optional = ::std::optional<T>;
|
||||
|
||||
class StdOptional {
|
||||
public:
|
||||
|
||||
@@ -50,37 +39,27 @@ namespace bitsery {
|
||||
* @param alignBeforeData only makes sense when bit-packing enabled, by default aligns after writing/reading bool state of optional
|
||||
*/
|
||||
explicit StdOptional(bool alignBeforeData=true):_alignBeforeData{alignBeforeData} {}
|
||||
template<typename T>
|
||||
constexpr void assertType() const {
|
||||
using TOpt = typename std::remove_cv<T>::type;
|
||||
using TVal = typename TOpt::value_type;
|
||||
static_assert(std::is_same<TOpt, std_optional<TVal>>(), "");
|
||||
}
|
||||
|
||||
template<typename Ser, typename Writer, typename T, typename Fnc>
|
||||
void serialize(Ser &ser, Writer &, const T &obj, Fnc &&fnc) const {
|
||||
assertType<T>();
|
||||
void serialize(Ser &ser, Writer &, const std::optional<T> &obj, Fnc &&fnc) const {
|
||||
ser.boolValue(static_cast<bool>(obj));
|
||||
if (_alignBeforeData)
|
||||
ser.align();
|
||||
if (obj)
|
||||
fnc(const_cast<typename T::value_type & >(*obj));
|
||||
fnc(const_cast<T&>(*obj));
|
||||
}
|
||||
|
||||
template<typename Des, typename Reader, typename T, typename Fnc>
|
||||
void deserialize(Des &des, Reader &, T &obj, Fnc &&fnc) const {
|
||||
assertType<T>();
|
||||
void deserialize(Des &des, Reader &, std::optional<T> &obj, Fnc &&fnc) const {
|
||||
bool exists{};
|
||||
des.boolValue(exists);
|
||||
if (_alignBeforeData)
|
||||
des.align();
|
||||
if (exists) {
|
||||
auto tmp{::bitsery::Access::create<typename T::value_type>()};
|
||||
fnc(tmp);
|
||||
obj = tmp;
|
||||
obj = ::bitsery::Access::create<T>();
|
||||
fnc(*obj);
|
||||
} else {
|
||||
//experimental optional doesnt have .reset method
|
||||
obj = T{};
|
||||
obj = std::nullopt;
|
||||
}
|
||||
}
|
||||
private:
|
||||
@@ -90,8 +69,8 @@ namespace bitsery {
|
||||
|
||||
namespace traits {
|
||||
template<typename T>
|
||||
struct ExtensionTraits<ext::StdOptional, T> {
|
||||
using TValue = typename T::value_type;
|
||||
struct ExtensionTraits<ext::StdOptional, std::optional<T>> {
|
||||
using TValue = T;
|
||||
static constexpr bool SupportValueOverload = true;
|
||||
static constexpr bool SupportObjectOverload = true;
|
||||
static constexpr bool SupportLambdaOverload = true;
|
||||
|
||||
81
include/bitsery/ext/std_tuple.h
Normal file
81
include/bitsery/ext/std_tuple.h
Normal file
@@ -0,0 +1,81 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
|
||||
#ifndef BITSERY_EXT_STD_TUPLE_H
|
||||
#define BITSERY_EXT_STD_TUPLE_H
|
||||
|
||||
|
||||
#include "utils/composite_type_overloads.h"
|
||||
#include "../traits/core/traits.h"
|
||||
#include <tuple>
|
||||
|
||||
namespace bitsery {
|
||||
namespace ext {
|
||||
|
||||
template<typename ...Overloads>
|
||||
class StdTuple : public details::CompositeTypeOverloadsUtils<std::tuple, Overloads...> {
|
||||
public:
|
||||
|
||||
template<typename Ser, typename Writer, typename Fnc, typename ...Ts>
|
||||
void serialize(Ser& ser, Writer&, const std::tuple<Ts...>& obj, Fnc&&) const {
|
||||
serializeAll(ser, const_cast<std::tuple<Ts...>&>(obj));
|
||||
}
|
||||
|
||||
template<typename Des, typename Reader, typename Fnc, typename ...Ts>
|
||||
void deserialize(Des& des, Reader&, std::tuple<Ts...>& obj, Fnc&&) const {
|
||||
serializeAll(des, obj);
|
||||
}
|
||||
|
||||
private:
|
||||
template<typename S, typename ...Ts>
|
||||
void serializeAll(S& s, std::tuple<Ts...>& obj) const {
|
||||
this->execAll(obj, [this, &s](auto& data, auto index) {
|
||||
constexpr size_t Index = decltype(index)::value;
|
||||
this->serializeType(s, std::get<Index>(data));
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// deduction guide
|
||||
template<typename ...Overloads>
|
||||
StdTuple(Overloads...) -> StdTuple<Overloads...>;
|
||||
}
|
||||
|
||||
namespace traits {
|
||||
|
||||
template<typename Tuple, typename ... Overloads>
|
||||
struct ExtensionTraits<ext::StdTuple<Overloads...>, Tuple> {
|
||||
static_assert(bitsery::details::IsSpecializationOf<Tuple, std::tuple>::value,
|
||||
"StdTuple only works with std::tuple");
|
||||
using TValue = void;
|
||||
static constexpr bool SupportValueOverload = false;
|
||||
static constexpr bool SupportObjectOverload = true;
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif //BITSERY_EXT_STD_TUPLE_H
|
||||
91
include/bitsery/ext/std_variant.h
Normal file
91
include/bitsery/ext/std_variant.h
Normal file
@@ -0,0 +1,91 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
|
||||
#ifndef BITSERY_EXT_STD_VARIANT_H
|
||||
#define BITSERY_EXT_STD_VARIANT_H
|
||||
|
||||
|
||||
#include "utils/composite_type_overloads.h"
|
||||
#include "../traits/core/traits.h"
|
||||
#include <variant>
|
||||
|
||||
namespace bitsery {
|
||||
namespace ext {
|
||||
|
||||
template<typename ...Overloads>
|
||||
class StdVariant : public details::CompositeTypeOverloadsUtils<std::variant, Overloads...> {
|
||||
public:
|
||||
|
||||
template<typename Ser, typename Writer, typename Fnc, typename ...Ts>
|
||||
void serialize(Ser& ser, Writer& writer, const std::variant<Ts...>& obj, Fnc&&) const {
|
||||
auto index = obj.index();
|
||||
assert(index != std::variant_npos);
|
||||
details::writeSize(writer, index);
|
||||
this->execIndex(index, const_cast<std::variant<Ts...>&>(obj), [this, &ser](auto& data, auto index) {
|
||||
constexpr size_t Index = decltype(index)::value;
|
||||
this->serializeType(ser, std::get<Index>(data));
|
||||
});
|
||||
}
|
||||
|
||||
template<typename Des, typename Reader, typename Fnc, typename ...Ts>
|
||||
void deserialize(Des& des, Reader& reader, std::variant<Ts...>& obj, Fnc&&) const {
|
||||
size_t index{};
|
||||
details::readSize(reader, index, sizeof...(Ts));
|
||||
this->execIndex(index, obj, [this, &des](auto& data, auto index) {
|
||||
constexpr size_t Index = decltype(index)::value;
|
||||
using TElem = typename std::variant_alternative<Index, std::variant<Ts...>>::type;
|
||||
TElem item = ::bitsery::Access::create<TElem>();
|
||||
this->serializeType(des, item);
|
||||
data = std::variant<Ts...>(std::in_place_index_t<Index>{}, std::move(item));
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// deduction guide
|
||||
template<typename ...Overloads>
|
||||
StdVariant(Overloads...) -> StdVariant<Overloads...>;
|
||||
}
|
||||
|
||||
//defines empty fuction, that handles monostate
|
||||
template <typename S>
|
||||
void serialize(S& , std::monostate&) {}
|
||||
|
||||
namespace traits {
|
||||
|
||||
template<typename Variant, typename ... Overloads>
|
||||
struct ExtensionTraits<ext::StdVariant<Overloads...>, Variant> {
|
||||
static_assert(bitsery::details::IsSpecializationOf<Variant, std::variant>::value,
|
||||
"StdVariant only works with std::variant");
|
||||
using TValue = void;
|
||||
static constexpr bool SupportValueOverload = false;
|
||||
static constexpr bool SupportObjectOverload = true;
|
||||
static constexpr bool SupportLambdaOverload = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif //BITSERY_EXT_STD_VARIANT_H
|
||||
136
include/bitsery/ext/utils/composite_type_overloads.h
Normal file
136
include/bitsery/ext/utils/composite_type_overloads.h
Normal file
@@ -0,0 +1,136 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#ifndef BITSERY_EXT_COMPOSITE_TYPE_OVERLOADS_H
|
||||
#define BITSERY_EXT_COMPOSITE_TYPE_OVERLOADS_H
|
||||
|
||||
#include "../../details/serialization_common.h"
|
||||
#include <functional>
|
||||
|
||||
#if __cplusplus < 201703L
|
||||
#error these utils requires c++17
|
||||
// in theory, it could be implemented using C++11
|
||||
// but without class template argument deduction guides that would be very inconvenient to use
|
||||
// these are very helpul for sum types (e.g. std::variant),
|
||||
// but for product types (e.g. std::tuple) you can you can easily do it your self with lambda, without extension
|
||||
#endif
|
||||
|
||||
namespace bitsery {
|
||||
|
||||
namespace ext {
|
||||
// might be usable, when you want to have one overload set for different composite types,
|
||||
// e.g. variant, tuple and pair
|
||||
template<class... Ts>
|
||||
struct CompositeTypeOverloads : Ts ... {
|
||||
using Ts::operator()...;
|
||||
};
|
||||
|
||||
template<typename ...Overloads>
|
||||
CompositeTypeOverloads(Overloads...) -> CompositeTypeOverloads<Overloads...>;
|
||||
|
||||
// convenient way to invoke s.value<N>, shorter than specifying a lambda
|
||||
template<typename T, size_t N>
|
||||
struct OverloadValue {
|
||||
template <typename S>
|
||||
void operator()(S& s, T& v) const {
|
||||
s.template value<N>(v);
|
||||
}
|
||||
};
|
||||
|
||||
// convenient way to invoke other extension using value or object overloads
|
||||
// there is no reason to write OverloadExtLambda,
|
||||
// because you'll need to specify lambda type, which is very inconvenient and it will be much
|
||||
// easier to simple write a lambda with extension inside it,
|
||||
// in order to implement it in a convenient way, i need a way to deduce only last template parameter (lambda type)
|
||||
// but this is not possible with deduction guides at the moment
|
||||
|
||||
template<typename T, size_t N, typename Ext>
|
||||
struct OverloadExtValue : public Ext {
|
||||
template <typename S>
|
||||
void operator()(S& s, T& v) const {
|
||||
s.template ext<N>(v, static_cast<const Ext&>(*this));
|
||||
}
|
||||
};
|
||||
|
||||
template<typename T, typename Ext>
|
||||
struct OverloadExtObject : public Ext {
|
||||
template <typename S>
|
||||
void operator()(S& s, T& v) const {
|
||||
s.ext(v, static_cast<const Ext&>(*this));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
namespace details {
|
||||
|
||||
template<template<typename ...> typename CompositeType, typename ...Overloads>
|
||||
class CompositeTypeOverloadsUtils : public ext::CompositeTypeOverloads<Overloads...> {
|
||||
protected:
|
||||
// converts run-time index to compile-time index,
|
||||
// by calling lambda with std::integral_constant<size_t, INDEX>
|
||||
template<typename Fnc, typename ... Ts>
|
||||
void execIndex(size_t index, CompositeType<Ts...>& obj, Fnc&& fnc) const {
|
||||
execIndexImpl(index, obj, std::forward<Fnc>(fnc), std::index_sequence_for<Ts...>{});
|
||||
}
|
||||
|
||||
// call lambda for all indexes in composite type
|
||||
template<typename Fnc, typename ... Ts>
|
||||
void execAll(CompositeType<Ts...>& obj, Fnc&& fnc) const {
|
||||
execAllImpl(obj, std::forward<Fnc>(fnc), std::index_sequence_for<Ts...>{});
|
||||
}
|
||||
|
||||
// serialize a type, by using overload first
|
||||
template<typename S, typename T>
|
||||
void serializeType(S& s, T& v) const {
|
||||
// first check if overload exists, otherwise try to call serialize method
|
||||
if constexpr (hasOverload<S, T>()) {
|
||||
std::invoke(*this, s, v);
|
||||
} else {
|
||||
static_assert(details::SerializeFunction<S, T>::isDefined(),
|
||||
"Please define overload or 'serialize' function for your type.");
|
||||
s.object(v);
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
template<typename S, typename T>
|
||||
static constexpr bool hasOverload() {
|
||||
return std::is_invocable<ext::CompositeTypeOverloads<Overloads...>,
|
||||
std::add_lvalue_reference_t<S>, std::add_lvalue_reference_t<T>>::value;
|
||||
}
|
||||
|
||||
template<typename Variant, typename Fnc, size_t ...Is>
|
||||
void execIndexImpl(size_t index, Variant& obj, Fnc&& fnc, std::index_sequence<Is...>) const {
|
||||
((index == Is ? fnc(obj, std::integral_constant<size_t, Is>{}), 0 : 0), ...);
|
||||
}
|
||||
|
||||
template<typename Variant, typename Fnc, size_t ...Is>
|
||||
void execAllImpl(Variant& obj, Fnc&& fnc, std::index_sequence<Is...>) const {
|
||||
(fnc(obj, std::integral_constant<size_t, Is>{}), ...);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif //BITSERY_EXT_COMPOSITE_TYPE_OVERLOADS_H
|
||||
40
include/bitsery/flexible/chrono.h
Normal file
40
include/bitsery/flexible/chrono.h
Normal file
@@ -0,0 +1,40 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#ifndef BITSERY_FLEXIBLE_TYPE_STD_CHRONO_H
|
||||
#define BITSERY_FLEXIBLE_TYPE_STD_CHRONO_H
|
||||
|
||||
#include "../ext/std_chrono.h"
|
||||
|
||||
namespace bitsery {
|
||||
template<typename S, typename T, typename P>
|
||||
void serialize(S &s, std::chrono::duration<T, P> &obj) {
|
||||
s.template ext<sizeof(T)>(obj, ext::StdDuration{});
|
||||
}
|
||||
|
||||
template<typename S, typename C, typename T, typename P>
|
||||
void serialize(S &s, std::chrono::time_point<C, std::chrono::duration<T, P>> &obj) {
|
||||
s.template ext<sizeof(T)>(obj, ext::StdTimePoint{});
|
||||
}
|
||||
}
|
||||
|
||||
#endif //BITSERY_FLEXIBLE_TYPE_STD_CHRONO_H
|
||||
35
include/bitsery/flexible/tuple.h
Normal file
35
include/bitsery/flexible/tuple.h
Normal file
@@ -0,0 +1,35 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#ifndef BITSERY_FLEXIBLE_TYPE_STD_TUPLE_H
|
||||
#define BITSERY_FLEXIBLE_TYPE_STD_TUPLE_H
|
||||
|
||||
#include "../ext/std_tuple.h"
|
||||
|
||||
namespace bitsery {
|
||||
template<typename S, typename ...Ts>
|
||||
void serialize(S &s, std::tuple<Ts...> &obj) {
|
||||
s.ext(obj, ext::StdTuple{});
|
||||
}
|
||||
}
|
||||
|
||||
#endif //BITSERY_FLEXIBLE_TYPE_STD_TUPLE_H
|
||||
35
include/bitsery/flexible/variant.h
Normal file
35
include/bitsery/flexible/variant.h
Normal file
@@ -0,0 +1,35 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#ifndef BITSERY_FLEXIBLE_TYPE_STD_VARIANT_H
|
||||
#define BITSERY_FLEXIBLE_TYPE_STD_VARIANT_H
|
||||
|
||||
#include "../ext/std_variant.h"
|
||||
|
||||
namespace bitsery {
|
||||
template<typename S, typename ...Ts>
|
||||
void serialize(S &s, std::variant<Ts...> &obj) {
|
||||
s.ext(obj, ext::StdVariant{});
|
||||
}
|
||||
}
|
||||
|
||||
#endif //BITSERY_FLEXIBLE_TYPE_STD_VARIANT_H
|
||||
@@ -4,4 +4,3 @@ set(CTEST_DROP_METHOD "http")
|
||||
set(CTEST_DROP_SITE "my.cdash.org")
|
||||
set(CTEST_DROP_LOCATION "/submit.php?project=bitsery")
|
||||
set(CTEST_DROP_SITE_CDASH TRUE)
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ set(CTEST_BINARY_DIRECTORY "build")
|
||||
set(ENV{CXXFLAGS} "--coverage")
|
||||
#when using Ninja generator, ctest_coverage cannot find files...
|
||||
set(CTEST_CMAKE_GENERATOR "CodeBlocks - Unix Makefiles")
|
||||
#set(CTEST_USE_LAUNCHERS 1)
|
||||
|
||||
set(CTEST_COVERAGE_COMMAND "gcov")
|
||||
|
||||
|
||||
@@ -5,4 +5,4 @@ COV_INFO=$TESTS_BUILD_DIR/bitsery_coverage.info
|
||||
lcov --directory $TESTS_BUILD_DIR --capture --output-file $COV_INFO
|
||||
lcov --extract $COV_INFO '*include/bitsery*' --output-file $COV_INFO.clean
|
||||
genhtml --output-directory $TESTS_BUILD_DIR/coverage_web $COV_INFO.clean
|
||||
xdg-open $TESTS_BUILD_DIR/coverage_web/index.html
|
||||
x-www-browser $TESTS_BUILD_DIR/coverage_web/index.html
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
#SOFTWARE.
|
||||
|
||||
cmake_minimum_required(VERSION 3.5)
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
project(bitsery_tests CXX)
|
||||
|
||||
find_package(GTest 1.8 REQUIRED)
|
||||
@@ -31,11 +31,6 @@ endif()
|
||||
|
||||
file(GLOB TestSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
|
||||
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
|
||||
message(WARNING "extension tests for optional is disable for VS, because VS currenty doesn't have <optional>")
|
||||
list(REMOVE_ITEM TestSourceFiles ${CMAKE_CURRENT_SOURCE_DIR}/serialization_ext_std_optional.cpp)
|
||||
endif()
|
||||
|
||||
enable_testing()
|
||||
|
||||
foreach (TestFile ${TestSourceFiles})
|
||||
@@ -46,8 +41,9 @@ foreach (TestFile ${TestSourceFiles})
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
||||
target_compile_options(${TestName} PRIVATE -Wextra -Wno-missing-braces -Wpedantic -Weffc++ -Wno-c++14-extensions)
|
||||
endif()
|
||||
gtest_discover_tests(${TestName})
|
||||
|
||||
add_test(NAME ${TestName} COMMAND $<TARGET_FILE:${TestName}>)
|
||||
# add_test(NAME ${TestName} COMMAND $<TARGET_FILE:${TestName}>)
|
||||
endforeach()
|
||||
|
||||
#======================= setup development environment ====================
|
||||
|
||||
@@ -35,6 +35,17 @@
|
||||
#include <bitsery/flexible/set.h>
|
||||
#include <bitsery/flexible/unordered_set.h>
|
||||
#include <bitsery/flexible/memory.h>
|
||||
#include <bitsery/flexible/chrono.h>
|
||||
#if __cplusplus > 201402L
|
||||
#include <bitsery/flexible/tuple.h>
|
||||
#include <bitsery/flexible/variant.h>
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#pragma message("tuple and variant only works with c++17")
|
||||
#else
|
||||
#warning "tuple and variant only works with c++17"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include "serialization_test_utils.h"
|
||||
@@ -388,6 +399,33 @@ TEST(FlexibleSyntax, StdSmartPtr) {
|
||||
EXPECT_THAT(*resUnique1, Eq(*dataUnique1));
|
||||
}
|
||||
|
||||
TEST(FlexibleSyntax, StdDuration) {
|
||||
std::chrono::duration<int64_t, std::milli> t1{54654};
|
||||
EXPECT_TRUE(procArchive(t1) == t1);
|
||||
}
|
||||
|
||||
TEST(FlexibleSyntax, StdTimePoint) {
|
||||
using Duration = std::chrono::duration<double, std::milli>;
|
||||
using TP = std::chrono::time_point<std::chrono::system_clock, Duration>;
|
||||
|
||||
TP data{Duration{874656.4798}};
|
||||
EXPECT_TRUE(procArchive(data) == data);
|
||||
}
|
||||
|
||||
#if __cplusplus > 201402L
|
||||
|
||||
TEST(FlexibleSyntax, StdTuple) {
|
||||
std::tuple<int, std::string, std::vector<char>> t1{5,"hello hello", {'A','B','C'}};
|
||||
EXPECT_TRUE(procArchive(t1) == t1);
|
||||
}
|
||||
|
||||
TEST(FlexibleSyntax, StdVariant) {
|
||||
std::variant<float, std::string, std::chrono::milliseconds> t1{std::string("hello hello")};
|
||||
EXPECT_TRUE(procArchive(t1) == t1);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
TEST(FlexibleSyntax, NestedTypes) {
|
||||
std::unordered_map<std::string, std::vector<std::string>> t1;
|
||||
t1.emplace("my key", std::vector<std::string>{"very", "nice", "string"});
|
||||
|
||||
@@ -139,6 +139,24 @@ TEST(DeserializeNonDefaultConstructible, ResultStdForwardListShouldShrink) {
|
||||
EXPECT_THAT(res.begin(), Eq(res.end()));
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
// also check if correctly expands if source is bigger than destination
|
||||
SerializationContext ctx{};
|
||||
std::forward_list<NonDefaultConstructible> data{};
|
||||
data.push_front(NonDefaultConstructible{1});
|
||||
data.push_front(NonDefaultConstructible{14});
|
||||
std::forward_list<NonDefaultConstructible> res{};
|
||||
|
||||
ctx.createSerializer().container(data, 10);
|
||||
ctx.createDeserializer().container(res, 10);
|
||||
|
||||
auto resIt = res.begin();
|
||||
for (auto it = data.begin(); it != data.end(); ++it, ++resIt) {
|
||||
EXPECT_THAT(*resIt, Eq(*it));
|
||||
}
|
||||
EXPECT_THAT(resIt, Eq(res.end()));
|
||||
}
|
||||
}
|
||||
|
||||
TEST(DeserializeNonDefaultConstructible, StdSet) {
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include "serialization_test_utils.h"
|
||||
|
||||
#include <bitsery/traits/array.h>
|
||||
#include <iostream>
|
||||
#include <bitset>
|
||||
#include <chrono>
|
||||
|
||||
|
||||
81
tests/serialization_ext_std_chrono.cpp
Normal file
81
tests/serialization_ext_std_chrono.cpp
Normal file
@@ -0,0 +1,81 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#include <bitsery/ext/std_chrono.h>
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include "serialization_test_utils.h"
|
||||
|
||||
using StdDuration = bitsery::ext::StdDuration;
|
||||
using StdTimePoint = bitsery::ext::StdTimePoint;
|
||||
|
||||
using testing::Eq;
|
||||
|
||||
TEST(SerializeExtensionStdChrono, IntegralDuration) {
|
||||
SerializationContext ctx1;
|
||||
using Hours = std::chrono::duration<int32_t, std::ratio<60>>;
|
||||
|
||||
Hours data{43};
|
||||
Hours res{};
|
||||
|
||||
ctx1.createSerializer().ext4b(data, StdDuration{});
|
||||
ctx1.createDeserializer().ext4b(res, StdDuration{});
|
||||
EXPECT_THAT(res, Eq(data));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdChrono, IntegralTimePoint) {
|
||||
SerializationContext ctx1;
|
||||
using Duration = std::chrono::duration<int64_t, std::milli>;
|
||||
using TP = std::chrono::time_point<std::chrono::system_clock, Duration>;
|
||||
|
||||
TP data{Duration{243}};
|
||||
TP res{};
|
||||
|
||||
ctx1.createSerializer().ext8b(data, StdTimePoint{});
|
||||
ctx1.createDeserializer().ext8b(res, StdTimePoint{});
|
||||
EXPECT_THAT(res, Eq(data));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdChrono, FloatDuration) {
|
||||
SerializationContext ctx1;
|
||||
using Hours = std::chrono::duration<float, std::ratio<60>>;
|
||||
|
||||
Hours data{43.5f};
|
||||
Hours res{};
|
||||
|
||||
ctx1.createSerializer().ext4b(data, StdDuration{});
|
||||
ctx1.createDeserializer().ext4b(res, StdDuration{});
|
||||
EXPECT_THAT(res, Eq(data));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdChrono, FloatTimePoint) {
|
||||
SerializationContext ctx1;
|
||||
using Duration = std::chrono::duration<double, std::milli>;
|
||||
using TP = std::chrono::time_point<std::chrono::system_clock, Duration>;
|
||||
|
||||
TP data{Duration{243457.4}};
|
||||
TP res{};
|
||||
|
||||
ctx1.createSerializer().ext8b(data, StdTimePoint{});
|
||||
ctx1.createDeserializer().ext8b(res, StdTimePoint{});
|
||||
EXPECT_THAT(res, Eq(data));
|
||||
}
|
||||
@@ -26,11 +26,9 @@
|
||||
|
||||
#if __cplusplus > 201402L
|
||||
|
||||
#include <optional>
|
||||
#include <bitsery/ext/std_optional.h>
|
||||
#include <bitsery/ext/value_range.h>
|
||||
|
||||
|
||||
using StdOptional = bitsery::ext::StdOptional;
|
||||
|
||||
using BPSer = SerializationContext::TSerializer::BPEnabledType;
|
||||
@@ -122,6 +120,10 @@ TEST(SerializeExtensionStdOptional, NoAlignAfterStateWriteRead) {
|
||||
EXPECT_THAT(t1.value(), Eq(r1.value()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#pragma message("Tests for StdOptional requires C++17")
|
||||
#else
|
||||
#warning "Tests for StdOptional requires C++17"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
129
tests/serialization_ext_std_tuple.cpp
Normal file
129
tests/serialization_ext_std_tuple.cpp
Normal file
@@ -0,0 +1,129 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include "serialization_test_utils.h"
|
||||
|
||||
using testing::Eq;
|
||||
|
||||
#if __cplusplus > 201402L
|
||||
|
||||
#include <bitsery/ext/std_tuple.h>
|
||||
|
||||
template<typename T, size_t N>
|
||||
using OverloadValue = bitsery::ext::OverloadValue<T, N>;
|
||||
|
||||
TEST(SerializeExtensionStdTuple, UseDefaultSerializeFunction) {
|
||||
std::tuple<MyStruct1, MyStruct2> t1{MyStruct1{-789, 45}, MyStruct2{MyStruct2::MyEnum::V3, MyStruct1{}}};
|
||||
std::tuple<MyStruct1, MyStruct2> r1{};
|
||||
SerializationContext ctx;
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdTuple{});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdTuple{});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdTuple, ValueTypesCanBeSerializedWithLambdaAndOrCallableObject) {
|
||||
std::tuple<float, int32_t> t1{123.456f, -898754656};
|
||||
std::tuple<float, int32_t> r1{};
|
||||
SerializationContext ctx;
|
||||
auto exec = [](auto& s, auto& o) {
|
||||
using S = decltype(s);
|
||||
s.ext(o, bitsery::ext::StdTuple{
|
||||
[](auto& s1, float& o1) {
|
||||
s1.value4b(o1);
|
||||
},
|
||||
OverloadValue<int32_t, 4>{}
|
||||
});
|
||||
};
|
||||
exec(ctx.createSerializer(), t1);
|
||||
exec(ctx.createDeserializer(), r1);
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdTuple, CanOverloadDefaultSerializeFunction) {
|
||||
std::tuple<MyStruct1, MyStruct2> t1{MyStruct1{-789, 45}, MyStruct2{MyStruct2::MyEnum::V3, MyStruct1{}}};
|
||||
std::tuple<MyStruct1, MyStruct2> r1{};
|
||||
SerializationContext ctx;
|
||||
auto exec = [](auto& s, auto& o) {
|
||||
using S = decltype(s);
|
||||
s.ext(o, bitsery::ext::StdTuple{
|
||||
[](auto& s1, MyStruct1& o1) {
|
||||
s1.value4b(o1.i1);
|
||||
//do not serialize other element, it should be 0 (default)
|
||||
},
|
||||
});
|
||||
};
|
||||
exec(ctx.createSerializer(), t1);
|
||||
exec(ctx.createDeserializer(), r1);
|
||||
EXPECT_THAT(std::get<1>(t1), Eq(std::get<1>(r1)));
|
||||
EXPECT_THAT(std::get<0>(t1).i1, Eq(std::get<0>(r1).i1));
|
||||
EXPECT_THAT(std::get<0>(t1).i2, ::testing::Ne(std::get<0>(r1).i2));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdTuple, EmptyTuple) {
|
||||
std::tuple<> t1{};
|
||||
std::tuple<> r1{};
|
||||
SerializationContext ctx;
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdTuple{});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdTuple{});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
struct NonDefaultConstructable {
|
||||
explicit NonDefaultConstructable(float x) : _x{x} {}
|
||||
|
||||
float _x;
|
||||
|
||||
bool operator==(const NonDefaultConstructable& rhs) const {
|
||||
return _x == rhs._x;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class bitsery::Access;
|
||||
|
||||
NonDefaultConstructable() : _x{0.0f} {};
|
||||
};
|
||||
|
||||
TEST(SerializeExtensionStdTuple, NonDefaultConstructable) {
|
||||
std::tuple<NonDefaultConstructable> t1{34};
|
||||
std::tuple<NonDefaultConstructable> r1{8};
|
||||
SerializationContext ctx;
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdTuple{
|
||||
[](auto& s, NonDefaultConstructable& v) {
|
||||
s.value4b(v._x);
|
||||
},
|
||||
});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdTuple{
|
||||
[](auto& s, NonDefaultConstructable& v) {
|
||||
s.value4b(v._x);
|
||||
},
|
||||
});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#pragma message("Tests for StdTuple requires C++17")
|
||||
#else
|
||||
#warning "Tests for StdTuple requires C++17"
|
||||
#endif
|
||||
#endif
|
||||
178
tests/serialization_ext_std_variant.cpp
Normal file
178
tests/serialization_ext_std_variant.cpp
Normal file
@@ -0,0 +1,178 @@
|
||||
//MIT License
|
||||
//
|
||||
//Copyright (c) 2019 Mindaugas Vinkelis
|
||||
//
|
||||
//Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
//of this software and associated documentation files (the "Software"), to deal
|
||||
//in the Software without restriction, including without limitation the rights
|
||||
//to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
//copies of the Software, and to permit persons to whom the Software is
|
||||
//furnished to do so, subject to the following conditions:
|
||||
//
|
||||
//The above copyright notice and this permission notice shall be included in all
|
||||
//copies or substantial portions of the Software.
|
||||
//
|
||||
//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
//SOFTWARE.
|
||||
|
||||
#include <gmock/gmock.h>
|
||||
#include "serialization_test_utils.h"
|
||||
|
||||
|
||||
#if __cplusplus > 201402L
|
||||
|
||||
using testing::Eq;
|
||||
|
||||
#include <bitsery/ext/std_variant.h>
|
||||
|
||||
template<typename T, size_t N>
|
||||
using OverloadValue = bitsery::ext::OverloadValue<T, N>;
|
||||
|
||||
TEST(SerializeExtensionStdVariant, UseSerializeFunction) {
|
||||
|
||||
std::variant<MyStruct1, MyStruct2> t1{MyStruct1{978, 15}};
|
||||
std::variant<MyStruct1, MyStruct2> r1{MyStruct2{}};
|
||||
SerializationContext ctx;
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdVariant{});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdVariant{});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdVariant, WhenTwoIndicesWithSameTypeThenDeserializeCorrectIndex) {
|
||||
|
||||
std::variant<MyStruct1, MyStruct2, MyStruct1> t1{std::in_place_index_t<2>{}, MyStruct1{978, 15}};
|
||||
std::variant<MyStruct1, MyStruct2, MyStruct1> r1{MyStruct2{}};
|
||||
SerializationContext ctx;
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdVariant{});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdVariant{});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdVariant, ValueTypesCanBeSerializedWithLambda) {
|
||||
|
||||
std::variant<float, char, MyStruct1> t1{5.6f};
|
||||
std::variant<float, char, MyStruct1> r1{MyStruct1{}};
|
||||
SerializationContext ctx;
|
||||
auto fncFloat = [](auto& s, float& v) {
|
||||
s.value4b(v);
|
||||
};
|
||||
auto fncChar = [](auto& s, char& v) {
|
||||
s.value1b(v);
|
||||
};
|
||||
ctx.createSerializer().ext(t1, bitsery::ext::StdVariant{fncFloat, fncChar});
|
||||
ctx.createDeserializer().ext(r1, bitsery::ext::StdVariant{fncFloat, fncChar});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdVariant, ValueTypesCanBeSerializedWithLambdaAndOrCallableObject) {
|
||||
std::variant<float, char, MyStruct1> t1{'Z'};
|
||||
std::variant<float, char, MyStruct1> r1{MyStruct1{}};
|
||||
SerializationContext ctx;
|
||||
auto fncFloat = [](auto& s, float& v) {
|
||||
s.value4b(v);
|
||||
};
|
||||
|
||||
auto& ser = ctx.createSerializer();
|
||||
ser.ext(t1, bitsery::ext::StdVariant{fncFloat, OverloadValue<char, 1>{}});
|
||||
auto& des = ctx.createDeserializer();
|
||||
des.ext(r1, bitsery::ext::StdVariant{fncFloat, OverloadValue<char, 1>{}});
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
TEST(SerializeExtensionStdVariant, CanOverloadDefaultSerializationFunction) {
|
||||
std::variant<MyStruct2, MyStruct1, int32_t> t1{MyStruct1{5, 9}};
|
||||
std::variant<MyStruct2, MyStruct1, int32_t> r1{MyStruct1{}};
|
||||
SerializationContext ctx;
|
||||
auto exec = [](auto& s, std::variant<MyStruct2, MyStruct1, int32_t>& o) {
|
||||
using S = decltype(s);
|
||||
s.ext(o, bitsery::ext::StdVariant{
|
||||
[](S& s, MyStruct1& v) {
|
||||
s.value4b(v.i1);
|
||||
//do not serialize other element, it should be 0 (default)
|
||||
},
|
||||
OverloadValue<int32_t, 4>{}
|
||||
});
|
||||
};
|
||||
|
||||
exec(ctx.createSerializer(), t1);
|
||||
exec(ctx.createDeserializer(), r1);
|
||||
EXPECT_THAT(std::get<1>(r1).i2, Eq(0));
|
||||
}
|
||||
|
||||
|
||||
struct NonDefaultConstructable {
|
||||
explicit NonDefaultConstructable(float x) : _x{x} {}
|
||||
|
||||
float _x;
|
||||
|
||||
bool operator==(const NonDefaultConstructable& rhs) const {
|
||||
return _x == rhs._x;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class bitsery::Access;
|
||||
|
||||
NonDefaultConstructable() : _x{0.0f} {};
|
||||
};
|
||||
|
||||
TEST(SerializeExtensionStdVariant, CanUseNonDefaultConstructableTypes) {
|
||||
std::variant<NonDefaultConstructable, MyStruct1, int32_t> t1{NonDefaultConstructable{123.456f}};
|
||||
std::variant<NonDefaultConstructable, MyStruct1, int32_t> r1{MyStruct1{}};
|
||||
SerializationContext ctx;
|
||||
|
||||
auto exec = [](auto& s, std::variant<NonDefaultConstructable, MyStruct1, int32_t>& o) {
|
||||
using S = decltype(s);
|
||||
s.ext(o, bitsery::ext::StdVariant{
|
||||
[](S& s, NonDefaultConstructable& v) {
|
||||
s.value4b(v._x);
|
||||
},
|
||||
OverloadValue<int32_t, 4>{}
|
||||
});
|
||||
};
|
||||
|
||||
exec(ctx.createSerializer(), t1);
|
||||
exec(ctx.createDeserializer(), r1);
|
||||
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
}
|
||||
|
||||
|
||||
TEST(SerializeExtensionStdVariant, CorrectlyHandleMonoState) {
|
||||
std::variant<std::monostate, NonDefaultConstructable, MyStruct1> t1{};
|
||||
std::variant<std::monostate, NonDefaultConstructable, MyStruct1> r1{};
|
||||
SerializationContext ctx;
|
||||
|
||||
auto exec = [](auto& s, auto& o) {
|
||||
using S = decltype(s);
|
||||
s.ext(o, bitsery::ext::StdVariant{
|
||||
[](S& s, NonDefaultConstructable& v) {
|
||||
s.value4b(v._x);
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
exec(ctx.createSerializer(), t1);
|
||||
exec(ctx.createDeserializer(), r1);
|
||||
|
||||
EXPECT_THAT(t1, Eq(r1));
|
||||
std::variant<std::monostate> t2{};
|
||||
std::variant<std::monostate> r2{};
|
||||
SerializationContext ctx1;
|
||||
ctx1.createSerializer().ext(t2, bitsery::ext::StdVariant{});
|
||||
ctx1.createDeserializer().ext(r2, bitsery::ext::StdVariant{});
|
||||
EXPECT_THAT(t2, Eq(r2));
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
#if defined(_MSC_VER)
|
||||
#pragma message("Tests for StdVariant requires C++17")
|
||||
#else
|
||||
#warning "Tests for StdVariant requires C++17"
|
||||
#endif
|
||||
#endif
|
||||
Reference in New Issue
Block a user