denuvo-ref/VTIL-Core
1
0
Fork 0
mirror of https://github.com/vtil-project/VTIL-Core synced 2026-08-17 08:23:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed backwards(...) breaking ::zip().

Browse source
This commit is contained in:
Can Bölük 2020-08-31 22:42:04 +02:00
parent cba235a188
commit b97582180c
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

33
VTIL-Common/util/zip.hpp
View file

@ -36,10 +36,8 @@ namespace vtil
template<Iterable... Tx>
struct joint_container
{
// Iterator types.
//
using iterator_array = std::tuple<decltype( std::begin( std::declval<Tx>() ) )...>;
using reference_array = std::tuple<decltype( *std::begin( std::declval<Tx>() ) )...>;
using iterator_array = std::tuple<decltype( std::begin( std::declval<const Tx&>() ) )...>;
using reference_array = std::tuple<decltype( *std::begin( std::declval<const Tx&>() ) )...>;
// Declare the iterator type.
//
@ -57,9 +55,6 @@ namespace vtil
//
iterator_array iterators;
template<typename... T>
constexpr base_iterator( T&&... its ) : iterators( std::make_tuple( std::forward<T>( its )... ) ) {}
// Support bidirectional iteration.
//
constexpr base_iterator& operator++() { std::apply( [ ] ( auto&... it ) { ( ( ++it ), ... ); }, iterators ); return *this; }
@ -79,18 +74,28 @@ namespace vtil
using iterator = base_iterator;
using const_iterator = base_iterator;
// Tuple containing data sources.
// Tuple containing data sources, length of iteration range, pre-computed begin and end.
//
std::tuple<Tx...> sources;
const std::tuple<Tx...> sources;
const size_t length;
const iterator begin_p;
const iterator end_p;
// Generic container helpers.
template<typename... Tv>
constexpr joint_container( Tv&&... sc )
: sources( std::forward<Tv>( sc )... ),
length( std::size( std::get<0>( sources ) ) ),
begin_p( std::apply( [ & ] ( auto&... src ) { return iterator{ { std::begin( src )... } }; }, sources ) ),
end_p( std::apply( [ & ] ( auto&... src ) { return iterator{ { std::next( std::begin( src ), length )... } }; }, sources ) ) {}
// Generic container interface.
//
constexpr size_t size() const { return std::size( std::get<0>( sources ) ); }
constexpr iterator begin() const { return std::apply( [ ] ( auto&... src ) { return iterator( std::begin( src )... ); }, sources ); }
constexpr iterator end() const { return std::apply( [ ] ( auto&... src ) { return iterator( std::end( src )... ); }, sources ); }
constexpr size_t size() const { return length; }
constexpr iterator begin() const { return begin_p; }
constexpr iterator end() const { return end_p; }
constexpr decltype( auto ) operator[]( size_t n ) const { return *std::next( begin(), n ); }
};
template <Iterable... Tx>
static constexpr auto zip( Tx&&... args ) { return joint_container<Tx...>{ .sources = { std::forward<Tx>( args )... } }; }
static constexpr joint_container<Tx...> zip( Tx&&... args ) { return { std::forward<Tx>( args )... }; }
};