coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/#829-Possible-bug-on-assign-of-etl-array' into development

Browse Source
This commit is contained in:
John Wellbelove 2024-01-28 20:35:22 +00:00
commit 3caffa148f
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/etl/array.h
View File

@ -94,15 +94,15 @@ namespace etl
static ETL_CONSTANT size_t SIZE = SIZE_;
typedef T value_type;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef T& reference;
typedef const T& const_reference;
typedef T* pointer;
typedef const T* const_pointer;
typedef T* iterator;
typedef const T* const_iterator;
typedef T value_type;
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef T& reference;
typedef const T& const_reference;
typedef T* pointer;
typedef const T* const_pointer;
typedef T* iterator;
typedef const T* const_iterator;
typedef ETL_OR_STD::reverse_iterator<iterator> reverse_iterator;
typedef ETL_OR_STD::reverse_iterator<const_iterator> const_reverse_iterator;
@ -386,11 +386,12 @@ namespace etl
/// If the range is smaller than the array then the unused array elements are left unmodified.
///\param first The iterator to the first item in the range.
///\param last The iterator to one past the final item in the range.
///\return An iterator to the first unassigned array element, or end().
//*************************************************************************
template <typename TIterator>
void assign(TIterator first, const TIterator last)
iterator assign(TIterator first, const TIterator last)
{
etl::copy_s(first, last, begin(), end());
return etl::copy_s(first, last, begin(), end());
}
//*************************************************************************
@ -398,15 +399,18 @@ namespace etl
/// If the range is smaller than the array then the unused array elements are initialised with the supplied value.
///\param first The iterator to the first item in the range.
///\param last The iterator to one past the final item in the range.
///\return An iterator to the first array element set to 'value', or end().
//*************************************************************************
template <typename TIterator>
void assign(TIterator first, const TIterator last, parameter_t value)
iterator assign(TIterator first, const TIterator last, parameter_t value)
{
// Copy from the range.
iterator p = etl::copy(first, last, begin());
iterator p = etl::copy_s(first, last, begin(), end());
// Initialise any that are left.
etl::fill(p, end(), value);
return p;
}
//*************************************************************************

17
test/test_array.cpp
View File

@ -375,20 +375,27 @@ namespace
Data data = { 0 };
Data::iterator result;
// Initial data.
data.assign(std::begin(initial), std::end(initial));
result = data.assign(std::begin(initial), std::end(initial));
CHECK(result == data.end());
bool isEqual = std::equal(data.begin(), data.end(), std::begin(initial));
CHECK(isEqual);
// Assign smaller.
data.assign(std::begin(initial), std::end(initial));
data.assign(&source[0], &source[5]);
result = data.assign(std::begin(initial), std::end(initial));
CHECK(result == data.end());
result = data.assign(&source[0], &source[5]);
CHECK(result == &data[5]);
isEqual = std::equal(data.begin(), data.end(), std::begin(check1));
CHECK(isEqual);
// Assign smaller + default.
data.assign(std::begin(initial), std::end(initial));
data.assign(&source[0], &source[5], 99);
result = data.assign(std::begin(initial), std::end(initial));
CHECK(result == data.end());
result = data.assign(&source[0], &source[5], 99);
CHECK(result == &data[5]);
isEqual = std::equal(data.begin(), data.end(), std::begin(check2));
CHECK(isEqual);
}