tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push

v1
Brett 2024-09-25 03:15:01 -04:00
parent c83f089e9c
commit a27651b21d
2 changed files with 68 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20)
include(cmake/color.cmake)
set(BLT_VERSION 0.21.0)
set(BLT_VERSION 0.21.1)
set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT)

75
include/blt/std/iterator.h
View File

@ -28,6 +28,7 @@
namespace blt
{
// forward declare useful types
template<typename Iter, typename = std::void_t<>>
class enumerator;
@ -39,6 +40,7 @@ namespace blt
template<typename Iter, typename = std::void_t<>>
class enumerate_wrapper;
// struct which is returned by the enumerator
template<typename T>
struct enumerate_item
{
@ -46,6 +48,38 @@ namespace blt
T value;
};
template<typename Iter1, typename Iter2>
class pair_iterator_base
{
public:
explicit pair_iterator_base(Iter1 iter1, Iter2 iter2): m_iter1(std::move(iter1)), m_iter2(std::move(iter2))
{}
friend bool operator==(const pair_iterator_base& a, const pair_iterator_base& b)
{
return a.m_iter1 == b.m_iter1;
}
friend bool operator!=(const pair_iterator_base& a, const pair_iterator_base& b)
{
return a.m_iter1 != b.m_iter1;
}
auto iter1() const
{
return m_iter1;
}
auto iter2() const
{
return m_iter2;
}
protected:
Iter1 m_iter1;
Iter2 m_iter2;
};
template<typename Iter>
class enumerate_iterator_base
{
@ -198,10 +232,25 @@ namespace blt
auto rev() const
{
return enumerator_rev<Iter>{this->end_.base(), this->begin_.base(), this->container_size, this->begin_.get_index(),
return enumerator_rev<Iter>{this->end_.base(),
this->begin_.base(),
this->end_.get_index(),
this->begin_.get_index(),
this->container_size};
}
auto skip(blt::size_t offset)
{
auto begin = this->begin();
for (blt::size_t i = 0; i < offset; i++)
++begin;
return enumerator<Iter>{begin.base(),
this->end_.base(),
begin.get_index(),
this->end_.get_index(),
this->container_size};
}
protected:
blt::size_t container_size;
};
@ -214,8 +263,23 @@ namespace blt
auto rev() const
{
return enumerator<Iter>{this->end_.base().base(), this->begin_.base().base(), this->end_.base().get_index(),
this->begin_.base().get_index(), this->container_size};
return enumerator<Iter>{this->end_.base().base(),
this->begin_.base().base(),
this->end_.base().get_index(),
this->begin_.base().get_index(),
this->container_size};
}
auto skip(blt::size_t offset)
{
auto begin = this->begin();
for (blt::size_t i = 0; i < offset; i++)
--begin;
return enumerator<Iter>{begin.base(),
this->end_.base(),
begin.get_index(),
this->end_.get_index(),
this->container_size};
}
};
}
@ -234,11 +298,6 @@ namespace blt
{
public:
using iterator::enumerator_reversible<Iter, iterator::enumerate_wrapper<Iter>>::enumerator_reversible;
auto skip(blt::size_t offset)
{
}
};
template<typename Iter>