diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp index ec79114..ff1fe61 100644 --- a/include/fc/io/raw.hpp +++ b/include/fc/io/raw.hpp @@ -530,6 +530,48 @@ namespace fc { raw::unpack(ds,v); return v; } FC_RETHROW_EXCEPTIONS( warn, "error unpacking ${type}", ("type",fc::get_typename::name() ) ) } + + template + struct pack_static_variant + { + Stream& stream; + pack_static_variant( Stream& s ):stream(s){} + + typedef void result_type; + template void operator()( const T& v ) + { + pack( stream, v ); + } + }; + + template + struct unpack_static_variant + { + Stream& stream; + unpack_static_variant( Stream& s ):stream(s){} + + typedef void result_type; + template void operator()( T& v ) + { + unpack( stream, v ); + } + }; + + + template + void pack( Stream& s, const static_variant& sv ) + { + pack( sv, unsigned_int(s.which()) ); + s.visit( pack_static_variant(sv) ); + } + + template void unpack( Stream& s, static_variant& sv ) + { + unsigned_int w; + unpack( s, w ); + sv.set_which(w.value); + sv.visit( unpack_static_variant(s) ); + } } } // namespace fc::raw diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp index 93a7157..d75f6c0 100644 --- a/include/fc/io/raw_fwd.hpp +++ b/include/fc/io/raw_fwd.hpp @@ -17,6 +17,8 @@ namespace fc { class variant; class variant_object; class path; + template class static_variant; + template class enum_type; namespace ip { class endpoint; } @@ -32,6 +34,9 @@ namespace fc { template inline void pack( Stream& s, const std::unordered_set& value ); template inline void unpack( Stream& s, std::unordered_set& value ); + template void pack( Stream& s, const static_variant& sv ); + template void unpack( Stream& s, static_variant& sv ); + template inline void pack( Stream& s, const flat_set& value ); template inline void unpack( Stream& s, flat_set& value ); diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp new file mode 100644 index 0000000..e70bd65 --- /dev/null +++ b/include/fc/static_variant.hpp @@ -0,0 +1,256 @@ +/** This source adapted from https://github.com/kmicklas/variadic-static_variant + * + * Copyright (C) 2013 Kenneth Micklas + * + * 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 +#include + +namespace fc { + +// Implementation details, the user should not import this: +namespace impl { + +template +struct storage_ops; + +template +struct position; + +template +struct type_info; + +template +struct storage_ops { + static void del(int n, void *data) {} + static void con(int n, void *data) {} + + template + static typename visitor::result_type apply(int n, void *data, visitor& v) {} + + template + static typename visitor::result_type apply(int n, void *data, const visitor& v) {} + + template + static typename visitor::result_type apply(int n, const void *data, visitor& v) {} + + template + static typename visitor::result_type apply(int n, const void *data, const visitor& v) {} +}; + +template +struct storage_ops { + static void del(int n, void *data) { + if(n == N) reinterpret_cast(data)->~T(); + else storage_ops::del(n, data); + } + static void con(int n, void *data) { + if(n == N) new(reinterpret_cast(data)) T(); + else storage_ops::del(n, data); + } + + template + static typename visitor::result_type apply(int n, void *data, visitor& v) { + if(n == N) return v(*reinterpret_cast(data)); + else return storage_ops::apply(n, data, v); + } + + template + static typename visitor::result_type apply(int n, void *data, const visitor& v) { + if(n == N) return v(*reinterpret_cast(data)); + else return storage_ops::apply(n, data, v); + } + + template + static typename visitor::result_type apply(int n, const void *data, visitor& v) { + if(n == N) return v(*reinterpret_cast(data)); + else return storage_ops::apply(n, data, v); + } + + template + static typename visitor::result_type apply(int n, const void *data, const visitor& v) { + if(n == N) return v(*reinterpret_cast(data)); + else return storage_ops::apply(n, data, v); + } +}; + +template +struct storage_ops { + static void del(int n, void *data) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } + static void con(int n, void *data) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } + + template + static typename visitor::result_type apply(int n, void *data, visitor& v) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } + template + static typename visitor::result_type apply(int n, void *data, const visitor& v) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } + template + static typename visitor::result_type apply(int n, const void *data, visitor& v) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } + template + static typename visitor::result_type apply(int n, const void *data, const visitor& v) { + throw std::runtime_error( + "Internal error: static_variant tag is invalid." + ); + } +}; + +template +struct position { + static const int pos = -1; +}; + +template +struct position { + static const int pos = 0; +}; + +template +struct position { + static const int pos = position::pos != -1 ? position::pos + 1 : -1; +}; + +template +struct type_info { + static const bool no_reference_types = false; + static const bool no_duplicates = position::pos == -1 && type_info::no_duplicates; + static const size_t size = type_info::size > sizeof(T&) ? type_info::size : sizeof(T&); +}; + +template +struct type_info { + static const bool no_reference_types = type_info::no_reference_types; + static const bool no_duplicates = position::pos == -1 && type_info::no_duplicates; + static const size_t size = type_info::size > sizeof(T) ? type_info::size : sizeof(T&); +}; + +template<> +struct type_info<> { + static const bool no_reference_types = true; + static const bool no_duplicates = true; + static const size_t size = 0; +}; + +} // namespace impl + +template +class static_variant { + static_assert(impl::type_info::no_reference_types, "Reference types are not permitted in static_variant."); + static_assert(impl::type_info::no_duplicates, "static_variant type arguments contain duplicate types."); + + int tag; + char storage[impl::type_info::size]; + + static_variant() = delete; + + template + void init(const X& x) { + tag = impl::position::pos; + new(storage) X(x); + } +public: + template + static_variant(const X& v) { + static_assert( + impl::position::pos != -1, + "Type not in static_variant." + ); + init(v); + } + ~static_variant() { + impl::storage_ops<0, Types...>::del(tag, storage); + } + template + void operator=(const X& v) { + static_assert( + impl::position::pos != -1, + "Type not in static_variant." + ); + this->~static_variant(); + init(v); + } + template + X& get() { + static_assert( + impl::position::pos != -1, + "Type not in static_variant." + ); + if(tag == impl::position::pos) { + return *reinterpret_cast(storage); + } else { + throw std::runtime_error( + std::string("static_variant does not contain value of type ") + typeid(X).name() + ); + } + } + template + const X& get() const { + static_assert( + impl::position::pos != -1, + "Type not in static_variant." + ); + if(tag == impl::position::pos) { + return *reinterpret_cast(storage); + } else { + throw std::runtime_error( + std::string("static_variant does not contain value of type ") + typeid(X).name() + ); + } + } + template + typename visitor::result_type visit(visitor& v) { + return impl::storage_ops<0, Types...>::apply(tag, storage, v); + } + + template + typename visitor::result_type visit(const visitor& v) { + return impl::storage_ops<0, Types...>::apply(tag, storage, v); + } + + template + typename visitor::result_type visit(visitor& v)const { + return impl::storage_ops<0, Types...>::apply(tag, storage, v); + } + + template + typename visitor::result_type visit(const visitor& v)const { + return impl::storage_ops<0, Types...>::apply(tag, storage, v); + } + + void set_which( int w ) { + this->~static_variant(); + impl::storage_ops<0, Types...>::con(tag, storage); + } + int which() const {return tag;} +}; + +template +struct visitor { + typedef Result result_type; +}; + +} // namespace fc diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp index 2e3143f..4867a82 100644 --- a/include/fc/variant.hpp +++ b/include/fc/variant.hpp @@ -9,6 +9,7 @@ #include #include #include +#include namespace fc { @@ -40,6 +41,9 @@ namespace fc template void to_variant( const safe& s, variant& v ); template void from_variant( const variant& v, safe& s ); + template void to_variant( const static_variant& s, variant& v ); + template void from_variant( const variant& v, static_variant& s ); + void to_variant( const uint8_t& var, variant& vo ); void from_variant( const variant& var, uint8_t& vo ); void to_variant( const int8_t& var, variant& vo ); @@ -497,6 +501,49 @@ namespace fc from_variant( var, *vo ); } } + + struct from_static_variant + { + variant& var; + from_static_variant( variant& dv ):var(dv){} + + typedef void result_type; + template void operator()( const T& v ) + { + to_variant( v, var ); + } + }; + + struct to_static_variant + { + const variant& var; + to_static_variant( const variant& dv ):var(dv){} + + typedef void result_type; + template void operator()( T& v ) + { + to_variant( var, v ); + } + }; + + + template void to_variant( const fc::static_variant& s, fc::variant& v ) + { + variant tmp; + variants vars(2); + vars[0] = s.which(); + s.visit( from_static_variant(vars[1]) ); + v = std::move(vars); + } + template void from_variant( const fc::variant& v, fc::static_variant& s ) + { + auto ar = v.get_array(); + if( ar.size() ) return; + s.set_which( ar[0].as_uint64() ); + if( ar.size() < 1 ) return; + s.visit( to_static_variant(ar[1]) ); + } + template void to_variant( const safe& s, variant& v ) { v = s.value; }