feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

1)Fixed gcc release mode warnings.

Browse Source 
2)Replaced throw with BOOST_RETHROW when BOOST_TRY is used.
3)Fixed issues with singly linked lists


[SVN r42974]
This commit is contained in:
Ion Gaztañaga
2008-01-25 23:07:51 +00:00
parent 9f88d4a617
commit 703fd75c7a
12 changed files with 955 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
test/slist_test.cpp
View File

@@ -24,25 +24,28 @@
using namespace boost::intrusive;
template<class ValueTraits, bool Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
struct test_slist
{
typedef typename ValueTraits::value_type value_type;
static void test_all (std::vector<value_type>& values);
static void test_front_back (std::vector<value_type>& values);
static void test_all(std::vector<value_type>& values);
static void test_front(std::vector<value_type>& values);
static void test_back(std::vector<value_type>& values, detail::bool_<true>);
static void test_back(std::vector<value_type>& values, detail::bool_<false>);
static void test_sort(std::vector<value_type>& values);
static void test_merge (std::vector<value_type>& values);
static void test_merge(std::vector<value_type>& values);
static void test_remove_unique(std::vector<value_type>& values);
static void test_insert(std::vector<value_type>& values);
static void test_shift(std::vector<value_type>& values);
static void test_swap(std::vector<value_type>& values);
static void test_slow_insert (std::vector<value_type>& values);
static void test_clone (std::vector<value_type>& values);
static void test_slow_insert(std::vector<value_type>& values);
static void test_clone(std::vector<value_type>& values);
static void test_container_from_end(std::vector<value_type> &, detail::bool_<true>){}
static void test_container_from_end(std::vector<value_type> &values, detail::bool_<false>);
};
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_all (std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -52,6 +55,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
{
list_type list(values.begin(), values.end());
@@ -60,9 +64,11 @@ void test_slist<ValueTraits, Linear>
list.insert(list.end(), values.begin(), values.end());
test::test_sequence_container(list, values);
}
test_front_back (values);
test_front(values);
test_back(values, detail::bool_<CacheLast>());
test_sort(values);
test_merge (values);
test_remove_unique(values);
test_insert(values);
test_shift(values);
test_slow_insert (values);
@@ -72,9 +78,9 @@ void test_slist<ValueTraits, Linear>
}
//test: push_front, pop_front, front, size, empty:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
::test_front_back (std::vector<typename ValueTraits::value_type>& values)
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_front(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
typedef slist
@@ -83,6 +89,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist;
BOOST_TEST (testlist.empty());
@@ -101,11 +108,45 @@ void test_slist<ValueTraits, Linear>
testlist.pop_front();
BOOST_TEST (testlist.empty());
}
}
//test: push_front, pop_front, front, size, empty:
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_back(std::vector<typename ValueTraits::value_type>& values, detail::bool_<true>)
{
typedef typename ValueTraits::value_type value_type;
typedef slist
< value_type
, value_traits<ValueTraits>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist;
BOOST_TEST (testlist.empty());
testlist.push_back (values[0]);
BOOST_TEST (testlist.size() == 1);
BOOST_TEST (&testlist.front() == &values[0]);
BOOST_TEST (&testlist.back() == &values[0]);
testlist.push_back(values[1]);
BOOST_TEST(*testlist.previous(testlist.end()) == values[1]);
BOOST_TEST (&testlist.front() == &values[0]);
BOOST_TEST (&testlist.back() == &values[1]);
}
//test: push_front, pop_front, front, size, empty:
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_back(std::vector<typename ValueTraits::value_type>&, detail::bool_<false>)
{}
//test: merge due to error in merge implementation:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_merge (std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -115,6 +156,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist1, testlist2;
testlist1.push_front (values[0]);
@@ -127,9 +169,42 @@ void test_slist<ValueTraits, Linear>
TEST_INTRUSIVE_SEQUENCE( init_values, testlist1.begin() );
}
//test: merge due to error in merge implementation:
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_remove_unique (std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
typedef slist
< value_type
, value_traits<ValueTraits>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
{
list_type list(values.begin(), values.end());
list.remove_if(is_even());
int init_values [] = { 1, 3, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, list.begin() );
}
{
std::vector<typename ValueTraits::value_type> values2(values);
list_type list(values.begin(), values.end());
list.insert_after(list.before_begin(), values2.begin(), values2.end());
list.sort();
int init_values [] = { 1, 1, 2, 2, 3, 3, 4, 4, 5, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, list.begin() );
list.unique();
int init_values2 [] = { 1, 2, 3, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values2, list.begin() );
}
}
//test: constructor, iterator, sort, reverse:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_sort(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -139,6 +214,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist (values.begin(), values.end());
@@ -155,8 +231,8 @@ void test_slist<ValueTraits, Linear>
}
//test: assign, insert_after, const_iterator, erase_after, s_iterator_to, previous:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_insert(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -166,6 +242,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist;
testlist.assign (&values[0] + 2, &values[0] + 5);
@@ -195,8 +272,8 @@ void test_slist<ValueTraits, Linear>
}
//test: insert, const_iterator, erase, siterator_to:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_slow_insert (std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -206,6 +283,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist;
testlist.push_front (values[4]);
@@ -239,8 +317,8 @@ void test_slist<ValueTraits, Linear>
BOOST_TEST (testlist.front().value_ == 3);
}
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_shift(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -250,6 +328,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist;
@@ -285,8 +364,8 @@ void test_slist<ValueTraits, Linear>
}
//test: insert_after (seq-version), swap, splice_after:
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_swap(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -296,6 +375,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
{
list_type testlist1 (&values[0], &values[0] + 2);
@@ -363,8 +443,8 @@ void test_slist<ValueTraits, Linear>
}
}
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_clone(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type value_type;
@@ -374,6 +454,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist1 (&values[0], &values[0] + values.size());
@@ -385,8 +466,8 @@ void test_slist<ValueTraits, Linear>
BOOST_TEST (testlist2.empty());
}
template<class ValueTraits, bool Linear>
void test_slist<ValueTraits, Linear>
template<class ValueTraits, bool Linear, bool CacheLast>
void test_slist<ValueTraits, Linear, CacheLast>
::test_container_from_end(std::vector<typename ValueTraits::value_type>& values
,detail::bool_<false>)
{
@@ -397,6 +478,7 @@ void test_slist<ValueTraits, Linear>
, size_type<std::size_t>
, constant_time_size<value_type::constant_time_size>
, linear<Linear>
, cache_last<CacheLast>
> list_type;
list_type testlist1 (&values[0], &values[0] + values.size());
BOOST_TEST (testlist1 == list_type::container_from_end_iterator(testlist1.end()));
@@ -419,6 +501,7 @@ class test_main_template
, typename value_type::slist_base_hook_t
>::type
, false
, false
>::test_all(data);
test_slist < typename detail::get_member_value_traits
< value_type
@@ -428,6 +511,7 @@ class test_main_template
>
>::type
, false
, false
>::test_all(data);
//Now linear slists
@@ -436,6 +520,46 @@ class test_main_template
, typename value_type::slist_base_hook_t
>::type
, true
, false
>::test_all(data);
test_slist < typename detail::get_member_value_traits
< value_type
, member_hook< value_type
, typename value_type::slist_member_hook_t
, &value_type::slist_node_
>
>::type
, true
, false
>::test_all(data);
//Now the same but caching the last node
test_slist < typename detail::get_base_value_traits
< value_type
, typename value_type::slist_base_hook_t
>::type
, false
, true
>::test_all(data);
test_slist < typename detail::get_member_value_traits
< value_type
, member_hook< value_type
, typename value_type::slist_member_hook_t
, &value_type::slist_node_
>
>::type
, false
, true
>::test_all(data);
//Now linear slists
test_slist < typename detail::get_base_value_traits
< value_type
, typename value_type::slist_base_hook_t
>::type
, true
, true
>::test_all(data);
test_slist < typename detail::get_member_value_traits
@@ -446,8 +570,8 @@ class test_main_template
>
>::type
, true
, true
>::test_all(data);
return 0;
}
};
@@ -468,6 +592,7 @@ class test_main_template<VoidPointer, false>
, typename value_type::slist_base_hook_t
>::type
, false
, false
>::test_all(data);
test_slist < typename detail::get_member_value_traits
@@ -478,6 +603,7 @@ class test_main_template<VoidPointer, false>
>
>::type
, false
, false
>::test_all(data);
test_slist < typename detail::get_base_value_traits
@@ -485,6 +611,7 @@ class test_main_template<VoidPointer, false>
, typename value_type::slist_auto_base_hook_t
>::type
, false
, false
>::test_all(data);
test_slist < typename detail::get_member_value_traits
@@ -495,6 +622,7 @@ class test_main_template<VoidPointer, false>
>
>::type
, false
, false
>::test_all(data);
test_slist < typename detail::get_base_value_traits
@@ -502,6 +630,27 @@ class test_main_template<VoidPointer, false>
, typename value_type::slist_base_hook_t
>::type
, true
, false
>::test_all(data);
test_slist < typename detail::get_member_value_traits
< value_type
, member_hook< value_type
, typename value_type::slist_member_hook_t
, &value_type::slist_node_
>
>::type
, true
, false
>::test_all(data);
//Now cache last
test_slist < typename detail::get_base_value_traits
< value_type
, typename value_type::slist_base_hook_t
>::type
, false
, true
>::test_all(data);
test_slist < typename detail::get_member_value_traits
@@ -511,6 +660,26 @@ class test_main_template<VoidPointer, false>
, &value_type::slist_node_
>
>::type
, false
, true
>::test_all(data);
test_slist < typename detail::get_base_value_traits
< value_type
, typename value_type::slist_base_hook_t
>::type
, true
, true
>::test_all(data);
test_slist < typename detail::get_member_value_traits
< value_type
, member_hook< value_type
, typename value_type::slist_member_hook_t
, &value_type::slist_node_
>
>::type
, true
, true
>::test_all(data);
return 0;