generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

First half of support for N3657; heterogenous lookups for set/multiset

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@188241 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2013-08-13 01:11:06 +00:00
parent 0f678bd69e
commit 4a0a98166c
12 changed files with 902 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
test/containers/associative/multiset/equal_range.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -179,4 +180,84 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::multiset<V, std::less<>> M;
typedef std::pair<M::iterator, M::iterator> R;
V ar[] =
{
5,
5,
5,
7,
7,
7,
9,
9,
9
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.equal_range(4);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 0));
r = m.equal_range(5);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(6);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(7);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(8);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(9);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 9));
r = m.equal_range(10);
assert(r.first == next(m.begin(), 9));
assert(r.second == next(m.begin(), 9));
}
{
typedef PrivateConstructor V;
typedef std::multiset<V, std::less<>> M;
typedef std::pair<M::iterator, M::iterator> R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
R r = m.equal_range(4);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 0));
r = m.equal_range(5);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(6);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(7);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(8);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(9);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 9));
r = m.equal_range(10);
assert(r.first == next(m.begin(), 9));
assert(r.second == next(m.begin(), 9));
}
#endif
}

74
test/containers/associative/multiset/find.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -163,4 +164,77 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
6,
7,
8,
9,
10,
11,
12
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.find(5);
assert(r == m.begin());
r = m.find(6);
assert(r == next(m.begin()));
r = m.find(7);
assert(r == next(m.begin(), 2));
r = m.find(8);
assert(r == next(m.begin(), 3));
r = m.find(9);
assert(r == next(m.begin(), 4));
r = m.find(10);
assert(r == next(m.begin(), 5));
r = m.find(11);
assert(r == next(m.begin(), 6));
r = m.find(12);
assert(r == next(m.begin(), 7));
r = m.find(4);
assert(r == next(m.begin(), 8));
}
{
typedef PrivateConstructor V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 6 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 8 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 10 ));
m.insert ( V::make ( 11 ));
m.insert ( V::make ( 12 ));
R r = m.find(5);
assert(r == m.begin());
r = m.find(6);
assert(r == next(m.begin()));
r = m.find(7);
assert(r == next(m.begin(), 2));
r = m.find(8);
assert(r == next(m.begin(), 3));
r = m.find(9);
assert(r == next(m.begin(), 4));
r = m.find(10);
assert(r == next(m.begin(), 5));
r = m.find(11);
assert(r == next(m.begin(), 6));
r = m.find(12);
assert(r == next(m.begin(), 7));
r = m.find(4);
assert(r == next(m.begin(), 8));
}
#endif
}

69
test/containers/associative/multiset/lower_bound.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -151,4 +152,72 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
5,
5,
7,
7,
7,
9,
9,
9
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.lower_bound(4);
assert(r == next(m.begin(), 0));
r = m.lower_bound(5);
assert(r == next(m.begin(), 0));
r = m.lower_bound(6);
assert(r == next(m.begin(), 3));
r = m.lower_bound(7);
assert(r == next(m.begin(), 3));
r = m.lower_bound(8);
assert(r == next(m.begin(), 6));
r = m.lower_bound(9);
assert(r == next(m.begin(), 6));
r = m.lower_bound(11);
assert(r == next(m.begin(), 9));
}
{
typedef PrivateConstructor V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
R r = m.lower_bound(4);
assert(r == next(m.begin(), 0));
r = m.lower_bound(5);
assert(r == next(m.begin(), 0));
r = m.lower_bound(6);
assert(r == next(m.begin(), 3));
r = m.lower_bound(7);
assert(r == next(m.begin(), 3));
r = m.lower_bound(8);
assert(r == next(m.begin(), 6));
r = m.lower_bound(9);
assert(r == next(m.begin(), 6));
r = m.lower_bound(11);
assert(r == next(m.begin(), 9));
}
#endif
}

68
test/containers/associative/multiset/upper_bound.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -151,4 +152,71 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
5,
5,
7,
7,
7,
9,
9,
9
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.upper_bound(4);
assert(r == next(m.begin(), 0));
r = m.upper_bound(5);
assert(r == next(m.begin(), 3));
r = m.upper_bound(6);
assert(r == next(m.begin(), 3));
r = m.upper_bound(7);
assert(r == next(m.begin(), 6));
r = m.upper_bound(8);
assert(r == next(m.begin(), 6));
r = m.upper_bound(9);
assert(r == next(m.begin(), 9));
r = m.upper_bound(11);
assert(r == next(m.begin(), 9));
}
{
typedef PrivateConstructor V;
typedef std::multiset<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 9 ));
R r = m.upper_bound(4);
assert(r == next(m.begin(), 0));
r = m.upper_bound(5);
assert(r == next(m.begin(), 3));
r = m.upper_bound(6);
assert(r == next(m.begin(), 3));
r = m.upper_bound(7);
assert(r == next(m.begin(), 6));
r = m.upper_bound(8);
assert(r == next(m.begin(), 6));
r = m.upper_bound(9);
assert(r == next(m.begin(), 9));
r = m.upper_bound(11);
assert(r == next(m.begin(), 9));
}
#endif
}

140
test/containers/associative/set/equal_range.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -227,4 +228,143 @@ int main()
assert(r.second == next(m.begin(), 8));
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::set<V, std::less<>> M;
{
typedef std::pair<M::iterator, M::iterator> R;
V ar[] =
{
5,
7,
9,
11,
13,
15,
17,
19
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.equal_range(5);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 1));
r = m.equal_range(7);
assert(r.first == next(m.begin(), 1));
assert(r.second == next(m.begin(), 2));
r = m.equal_range(9);
assert(r.first == next(m.begin(), 2));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(11);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 4));
r = m.equal_range(13);
assert(r.first == next(m.begin(), 4));
assert(r.second == next(m.begin(), 5));
r = m.equal_range(15);
assert(r.first == next(m.begin(), 5));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(17);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 7));
r = m.equal_range(19);
assert(r.first == next(m.begin(), 7));
assert(r.second == next(m.begin(), 8));
r = m.equal_range(4);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 0));
r = m.equal_range(6);
assert(r.first == next(m.begin(), 1));
assert(r.second == next(m.begin(), 1));
r = m.equal_range(8);
assert(r.first == next(m.begin(), 2));
assert(r.second == next(m.begin(), 2));
r = m.equal_range(10);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(12);
assert(r.first == next(m.begin(), 4));
assert(r.second == next(m.begin(), 4));
r = m.equal_range(14);
assert(r.first == next(m.begin(), 5));
assert(r.second == next(m.begin(), 5));
r = m.equal_range(16);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(18);
assert(r.first == next(m.begin(), 7));
assert(r.second == next(m.begin(), 7));
r = m.equal_range(20);
assert(r.first == next(m.begin(), 8));
assert(r.second == next(m.begin(), 8));
}
}
{
typedef PrivateConstructor V;
typedef std::set<V, std::less<>> M;
typedef std::pair<M::iterator, M::iterator> R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 11 ));
m.insert ( V::make ( 13 ));
m.insert ( V::make ( 15 ));
m.insert ( V::make ( 17 ));
m.insert ( V::make ( 19 ));
R r = m.equal_range(5);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 1));
r = m.equal_range(7);
assert(r.first == next(m.begin(), 1));
assert(r.second == next(m.begin(), 2));
r = m.equal_range(9);
assert(r.first == next(m.begin(), 2));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(11);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 4));
r = m.equal_range(13);
assert(r.first == next(m.begin(), 4));
assert(r.second == next(m.begin(), 5));
r = m.equal_range(15);
assert(r.first == next(m.begin(), 5));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(17);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 7));
r = m.equal_range(19);
assert(r.first == next(m.begin(), 7));
assert(r.second == next(m.begin(), 8));
r = m.equal_range(4);
assert(r.first == next(m.begin(), 0));
assert(r.second == next(m.begin(), 0));
r = m.equal_range(6);
assert(r.first == next(m.begin(), 1));
assert(r.second == next(m.begin(), 1));
r = m.equal_range(8);
assert(r.first == next(m.begin(), 2));
assert(r.second == next(m.begin(), 2));
r = m.equal_range(10);
assert(r.first == next(m.begin(), 3));
assert(r.second == next(m.begin(), 3));
r = m.equal_range(12);
assert(r.first == next(m.begin(), 4));
assert(r.second == next(m.begin(), 4));
r = m.equal_range(14);
assert(r.first == next(m.begin(), 5));
assert(r.second == next(m.begin(), 5));
r = m.equal_range(16);
assert(r.first == next(m.begin(), 6));
assert(r.second == next(m.begin(), 6));
r = m.equal_range(18);
assert(r.first == next(m.begin(), 7));
assert(r.second == next(m.begin(), 7));
r = m.equal_range(20);
assert(r.first == next(m.begin(), 8));
assert(r.second == next(m.begin(), 8));
}
#endif
}

74
test/containers/associative/set/find.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -163,4 +164,77 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
6,
7,
8,
9,
10,
11,
12
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.find(5);
assert(r == m.begin());
r = m.find(6);
assert(r == next(m.begin()));
r = m.find(7);
assert(r == next(m.begin(), 2));
r = m.find(8);
assert(r == next(m.begin(), 3));
r = m.find(9);
assert(r == next(m.begin(), 4));
r = m.find(10);
assert(r == next(m.begin(), 5));
r = m.find(11);
assert(r == next(m.begin(), 6));
r = m.find(12);
assert(r == next(m.begin(), 7));
r = m.find(4);
assert(r == next(m.begin(), 8));
}
{
typedef PrivateConstructor V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 6 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 8 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 10 ));
m.insert ( V::make ( 11 ));
m.insert ( V::make ( 12 ));
R r = m.find(5);
assert(r == m.begin());
r = m.find(6);
assert(r == next(m.begin()));
r = m.find(7);
assert(r == next(m.begin(), 2));
r = m.find(8);
assert(r == next(m.begin(), 3));
r = m.find(9);
assert(r == next(m.begin(), 4));
r = m.find(10);
assert(r == next(m.begin(), 5));
r = m.find(11);
assert(r == next(m.begin(), 6));
r = m.find(12);
assert(r == next(m.begin(), 7));
r = m.find(4);
assert(r == next(m.begin(), 8));
}
#endif
}

107
test/containers/associative/set/lower_bound.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -227,4 +228,110 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
7,
9,
11,
13,
15,
17,
19
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.lower_bound(5);
assert(r == m.begin());
r = m.lower_bound(7);
assert(r == next(m.begin()));
r = m.lower_bound(9);
assert(r == next(m.begin(), 2));
r = m.lower_bound(11);
assert(r == next(m.begin(), 3));
r = m.lower_bound(13);
assert(r == next(m.begin(), 4));
r = m.lower_bound(15);
assert(r == next(m.begin(), 5));
r = m.lower_bound(17);
assert(r == next(m.begin(), 6));
r = m.lower_bound(19);
assert(r == next(m.begin(), 7));
r = m.lower_bound(4);
assert(r == next(m.begin(), 0));
r = m.lower_bound(6);
assert(r == next(m.begin(), 1));
r = m.lower_bound(8);
assert(r == next(m.begin(), 2));
r = m.lower_bound(10);
assert(r == next(m.begin(), 3));
r = m.lower_bound(12);
assert(r == next(m.begin(), 4));
r = m.lower_bound(14);
assert(r == next(m.begin(), 5));
r = m.lower_bound(16);
assert(r == next(m.begin(), 6));
r = m.lower_bound(18);
assert(r == next(m.begin(), 7));
r = m.lower_bound(20);
assert(r == next(m.begin(), 8));
}
{
typedef PrivateConstructor V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 11 ));
m.insert ( V::make ( 13 ));
m.insert ( V::make ( 15 ));
m.insert ( V::make ( 17 ));
m.insert ( V::make ( 19 ));
R r = m.lower_bound(5);
assert(r == m.begin());
r = m.lower_bound(7);
assert(r == next(m.begin()));
r = m.lower_bound(9);
assert(r == next(m.begin(), 2));
r = m.lower_bound(11);
assert(r == next(m.begin(), 3));
r = m.lower_bound(13);
assert(r == next(m.begin(), 4));
r = m.lower_bound(15);
assert(r == next(m.begin(), 5));
r = m.lower_bound(17);
assert(r == next(m.begin(), 6));
r = m.lower_bound(19);
assert(r == next(m.begin(), 7));
r = m.lower_bound(4);
assert(r == next(m.begin(), 0));
r = m.lower_bound(6);
assert(r == next(m.begin(), 1));
r = m.lower_bound(8);
assert(r == next(m.begin(), 2));
r = m.lower_bound(10);
assert(r == next(m.begin(), 3));
r = m.lower_bound(12);
assert(r == next(m.begin(), 4));
r = m.lower_bound(14);
assert(r == next(m.begin(), 5));
r = m.lower_bound(16);
assert(r == next(m.begin(), 6));
r = m.lower_bound(18);
assert(r == next(m.begin(), 7));
r = m.lower_bound(20);
assert(r == next(m.begin(), 8));
}
#endif
}

106
test/containers/associative/set/upper_bound.pass.cpp
View File

@@ -18,6 +18,7 @@
#include <cassert>
#include "../../min_allocator.h"
#include "private_constructor.hpp"
int main()
{
@@ -227,4 +228,109 @@ int main()
}
}
#endif
#if _LIBCPP_STD_VER > 11
{
typedef int V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
V ar[] =
{
5,
7,
9,
11,
13,
15,
17,
19
};
M m(ar, ar+sizeof(ar)/sizeof(ar[0]));
R r = m.upper_bound(5);
assert(r == next(m.begin(), 1));
r = m.upper_bound(7);
assert(r == next(m.begin(), 2));
r = m.upper_bound(9);
assert(r == next(m.begin(), 3));
r = m.upper_bound(11);
assert(r == next(m.begin(), 4));
r = m.upper_bound(13);
assert(r == next(m.begin(), 5));
r = m.upper_bound(15);
assert(r == next(m.begin(), 6));
r = m.upper_bound(17);
assert(r == next(m.begin(), 7));
r = m.upper_bound(19);
assert(r == next(m.begin(), 8));
r = m.upper_bound(4);
assert(r == next(m.begin(), 0));
r = m.upper_bound(6);
assert(r == next(m.begin(), 1));
r = m.upper_bound(8);
assert(r == next(m.begin(), 2));
r = m.upper_bound(10);
assert(r == next(m.begin(), 3));
r = m.upper_bound(12);
assert(r == next(m.begin(), 4));
r = m.upper_bound(14);
assert(r == next(m.begin(), 5));
r = m.upper_bound(16);
assert(r == next(m.begin(), 6));
r = m.upper_bound(18);
assert(r == next(m.begin(), 7));
r = m.upper_bound(20);
assert(r == next(m.begin(), 8));
}
{
typedef PrivateConstructor V;
typedef std::set<V, std::less<>> M;
typedef M::iterator R;
M m;
m.insert ( V::make ( 5 ));
m.insert ( V::make ( 7 ));
m.insert ( V::make ( 9 ));
m.insert ( V::make ( 11 ));
m.insert ( V::make ( 13 ));
m.insert ( V::make ( 15 ));
m.insert ( V::make ( 17 ));
m.insert ( V::make ( 19 ));
R r = m.upper_bound(5);
assert(r == next(m.begin(), 1));
r = m.upper_bound(7);
assert(r == next(m.begin(), 2));
r = m.upper_bound(9);
assert(r == next(m.begin(), 3));
r = m.upper_bound(11);
assert(r == next(m.begin(), 4));
r = m.upper_bound(13);
assert(r == next(m.begin(), 5));
r = m.upper_bound(15);
assert(r == next(m.begin(), 6));
r = m.upper_bound(17);
assert(r == next(m.begin(), 7));
r = m.upper_bound(19);
assert(r == next(m.begin(), 8));
r = m.upper_bound(4);
assert(r == next(m.begin(), 0));
r = m.upper_bound(6);
assert(r == next(m.begin(), 1));
r = m.upper_bound(8);
assert(r == next(m.begin(), 2));
r = m.upper_bound(10);
assert(r == next(m.begin(), 3));
r = m.upper_bound(12);
assert(r == next(m.begin(), 4));
r = m.upper_bound(14);
assert(r == next(m.begin(), 5));
r = m.upper_bound(16);
assert(r == next(m.begin(), 6));
r = m.upper_bound(18);
assert(r == next(m.begin(), 7));
r = m.upper_bound(20);
assert(r == next(m.begin(), 8));
}
#endif
}