coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 13:58:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hotfix/flat_map' into development

Browse Source
This commit is contained in:
John Wellbelove 2019-01-02 23:01:13 +00:00
commit 87ab5bf623
9 changed files with 82 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/etl/flat_map.h
View File

@ -38,6 +38,7 @@ SOFTWARE.
#if ETL_CPP11_SUPPORTED && !defined(ETL_STLPORT) && !defined(ETL_NO_STL)
#include <initializer_list>
#endif
#include "stl/utility.h"
#undef ETL_FILE
#define ETL_FILE "2"
@ -229,20 +230,7 @@ namespace etl
//*********************************************************************
mapped_type& operator [](key_parameter_t key)
{
iterator i_element = lower_bound(key);
// Doesn't already exist?
if (i_element == end())
{
value_type* pvalue = storage.allocate<value_type>();
::new (pvalue) value_type();
ETL_INCREMENT_DEBUG_COUNT
std::pair<iterator, bool> result = refmap_t::insert_at(i_element, *pvalue);
i_element->second = result.first->second;
}
return i_element->second;
return insert(std::make_pair(key, mapped_type())).first->second;
}
//*********************************************************************
@ -302,7 +290,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end()) || compare(i_element->first, value.first) || compare(value.first, i_element->first))
if ((i_element == end()) || compare(value.first, i_element->first))
{
ETL_ASSERT(!refmap_t::full(), ETL_ERROR(flat_map_full));
@ -369,7 +357,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != key)))
if ((i_element == end()) || compare(key, i_element->first))
{
ETL_INCREMENT_DEBUG_COUNT
result = refmap_t::insert_at(i_element, *pvalue);
@ -403,7 +391,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != key)))
if ((i_element == end()) || compare(key, i_element->first))
{
ETL_INCREMENT_DEBUG_COUNT
result = refmap_t::insert_at(i_element, *pvalue);
@ -435,7 +423,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != key)))
if ((i_element == end()) || compare(key, i_element->first))
{
ETL_INCREMENT_DEBUG_COUNT
result = refmap_t::insert_at(i_element, *pvalue);
@ -467,7 +455,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != key)))
if ((i_element == end()) || compare(key, i_element->first))
{
ETL_INCREMENT_DEBUG_COUNT
result = refmap_t::insert_at(i_element, *pvalue);
@ -499,7 +487,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end() || (i_element->first != key)))
if ((i_element == end()) || compare(key, i_element->first))
{
ETL_INCREMENT_DEBUG_COUNT
result = refmap_t::insert_at(i_element, *pvalue);

12
include/etl/flat_set.h
View File

@ -233,7 +233,7 @@ namespace etl
std::pair<iterator, bool> result(i_element, false);
// Doesn't already exist?
if ((i_element == end()) || compare(*i_element, value) || compare(value, *i_element))
if ((i_element == end()) || compare(value, *i_element))
{
ETL_ASSERT(!refset_t::full(), ETL_ERROR(flat_set_full));
@ -299,7 +299,7 @@ namespace etl
iterator i_element = lower_bound(*pvalue);
// Doesn't already exist?
if ((i_element == end() || (*i_element != *pvalue)))
if ((i_element == end()) || compare(*pvalue, *i_element))
{
ETL_INCREMENT_DEBUG_COUNT
result = refset_t::insert_at(i_element, *pvalue);
@ -332,7 +332,7 @@ namespace etl
iterator i_element = lower_bound(*pvalue);
// Doesn't already exist?
if ((i_element == end() || (*i_element != *pvalue)))
if ((i_element == end()) || compare(*pvalue, *i_element))
{
ETL_INCREMENT_DEBUG_COUNT
result = refset_t::insert_at(i_element, *pvalue);
@ -365,7 +365,7 @@ namespace etl
iterator i_element = lower_bound(*pvalue);
// Doesn't already exist?
if ((i_element == end() || (*i_element != *pvalue)))
if ((i_element == end()) || compare(*pvalue, *i_element))
{
ETL_INCREMENT_DEBUG_COUNT
result = refset_t::insert_at(i_element, *pvalue);
@ -398,7 +398,7 @@ namespace etl
iterator i_element = lower_bound(*pvalue);
// Doesn't already exist?
if ((i_element == end() || (*i_element != *pvalue)))
if ((i_element == end()) || compare(*pvalue, *i_element))
{
ETL_INCREMENT_DEBUG_COUNT
result = refset_t::insert_at(i_element, *pvalue);
@ -431,7 +431,7 @@ namespace etl
iterator i_element = lower_bound(*pvalue);
// Doesn't already exist?
if ((i_element == end() || (*i_element != *pvalue)))
if ((i_element == end()) || compare(*pvalue, *i_element))
{
ETL_INCREMENT_DEBUG_COUNT
result = refset_t::insert_at(i_element, *pvalue);

4
include/etl/reference_flat_map.h
View File

@ -238,7 +238,7 @@ namespace etl
{
}
const_iterator(const iterator& other)
const_iterator(const typename ireference_flat_map::iterator& other)
: ilookup(other.ilookup)
{
}
@ -248,7 +248,7 @@ namespace etl
{
}
const_iterator& operator =(const iterator& other)
const_iterator& operator =(const typename ireference_flat_map::iterator& other)
{
ilookup = other.ilookup;
return *this;

2
include/etl/reference_flat_multimap.h
View File

@ -213,7 +213,7 @@ namespace etl
{
}
const_iterator(const iterator& other)
const_iterator(const typename ireference_flat_multimap::iterator& other)
: ilookup(other.ilookup)
{
}

4
include/etl/reference_flat_multiset.h
View File

@ -232,7 +232,7 @@ namespace etl
{
}
const_iterator(const iterator& other)
const_iterator(const typename ireference_flat_multiset::iterator& other)
: ilookup(other.ilookup)
{
}
@ -460,7 +460,7 @@ namespace etl
{
std::pair<iterator, bool> result(end(), false);
ETL_ASSERT(!lookup.full(), ETL_ERROR(flat_multiset_full));
ETL_ASSERT(!lookup.full(), ETL_ERROR(flat_multiset_full));
iterator i_element = std::lower_bound(begin(), end(), value, compare);

2
include/etl/reference_flat_set.h
View File

@ -232,7 +232,7 @@ namespace etl
{
}
const_iterator(const iterator& other)
const_iterator(const typename ireference_flat_set::iterator& other)
: ilookup(other.ilookup)
{
}

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 6
#define ETL_VERSION_PATCH 0
#define ETL_VERSION_PATCH 1
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
14.6.1
Fixed bugs in etl::flat_map 'operator[]' and 'insert'.
===============================================================================
14.6.0
Added etl::scaled_rounding to allow selection of rounding algorithms when

69
test/test_flat_map.cpp
View File

@ -458,6 +458,36 @@ namespace
CHECK_EQUAL(compare_data[9], data[9]);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_index_assign)
{
Compare_DataDC compare_data(initial_data_dc.begin(), initial_data_dc.end());
DataDC data;
data[initial_data_dc[0].first] = initial_data_dc[0].second;
data[initial_data_dc[2].first] = initial_data_dc[2].second;
data[initial_data_dc[3].first] = initial_data_dc[3].second;
data[initial_data_dc[1].first] = initial_data_dc[1].second;
data[initial_data_dc[4].first] = initial_data_dc[4].second;
data[initial_data_dc[5].first] = initial_data_dc[5].second;
data[initial_data_dc[8].first] = initial_data_dc[8].second;
data[initial_data_dc[6].first] = initial_data_dc[6].second;
data[initial_data_dc[7].first] = initial_data_dc[7].second;
data[initial_data_dc[9].first] = initial_data_dc[9].second;
CHECK_EQUAL(compare_data[0], data[0]);
CHECK_EQUAL(compare_data[1], data[1]);
CHECK_EQUAL(compare_data[2], data[2]);
CHECK_EQUAL(compare_data[3], data[3]);
CHECK_EQUAL(compare_data[4], data[4]);
CHECK_EQUAL(compare_data[5], data[5]);
CHECK_EQUAL(compare_data[6], data[6]);
CHECK_EQUAL(compare_data[7], data[7]);
CHECK_EQUAL(compare_data[8], data[8]);
CHECK_EQUAL(compare_data[9], data[9]);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_index_value_changed)
{
@ -636,24 +666,39 @@ namespace
Compare_DataNDC compare_data;
DataNDC data;
data.insert(std::make_pair(0, N0));
compare_data.insert(std::make_pair(0, N0));
std::pair<DataNDC::iterator, bool> dr;
std::pair<Compare_DataNDC::iterator, bool> cr;
data.insert(std::make_pair(1, N1));
compare_data.insert(std::make_pair(1, N1));
dr = data.insert(std::make_pair(0, N0));
cr = compare_data.insert(std::make_pair(0, N0));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
data.insert(std::make_pair(2, N2));
compare_data.insert(std::make_pair(2, N2));
dr = data.insert(std::make_pair(1, N1));
cr = compare_data.insert(std::make_pair(1, N1));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
dr = data.insert(std::make_pair(2, N2));
cr = compare_data.insert(std::make_pair(2, N2));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
// Do it again.
data.insert(std::make_pair(0, N0));
compare_data.insert(std::make_pair(0, N0));
dr = data.insert(std::make_pair(0, N0));
cr = compare_data.insert(std::make_pair(0, N0));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
data.insert(std::make_pair(1, N1));
compare_data.insert(std::make_pair(1, N1));
dr = data.insert(std::make_pair(1, N1));
cr = compare_data.insert(std::make_pair(1, N1));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
data.insert(std::make_pair(2, N2));
compare_data.insert(std::make_pair(2, N2));
dr = data.insert(std::make_pair(2, N2));
cr = compare_data.insert(std::make_pair(2, N2));
CHECK(dr.first->first == cr.first->first);
CHECK(dr.second == cr.second);
CHECK_EQUAL(compare_data.size(), data.size());