para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #165 from neilmacintosh/dev/neilmac/indextype

Browse Source 
Changing index type for array_view
This commit is contained in:
Neil MacIntosh 2015-11-04 12:29:31 -08:00
commit 54f832115b
4 changed files with 1653 additions and 1822 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

626
include/array_view.h
View File

File diff suppressed because it is too large Load Diff

49
include/string_view.h
View File

@ -34,16 +34,16 @@ namespace gsl
// type system for these types that will not either incur significant runtime costs or // type system for these types that will not either incur significant runtime costs or
// (sometimes needlessly) break existing programs when introduced. // (sometimes needlessly) break existing programs when introduced.
// //
template<size_t Max = dynamic_range> template<std::ptrdiff_t Max = dynamic_range>
using czstring = const char*; using czstring = const char*;
template<size_t Max = dynamic_range> template<std::ptrdiff_t Max = dynamic_range>
using cwzstring = const wchar_t*; using cwzstring = const wchar_t*;
template<size_t Max = dynamic_range> template<std::ptrdiff_t Max = dynamic_range>
using zstring = char*; using zstring = char*;
template<size_t Max = dynamic_range> template<std::ptrdiff_t Max = dynamic_range>
using wzstring = wchar_t*; using wzstring = wchar_t*;
// //
@ -54,19 +54,19 @@ using wzstring = wchar_t*;
// //
// TODO (neilmac) once array_view regains configurable size_type, update these typedef's // TODO (neilmac) once array_view regains configurable size_type, update these typedef's
// //
template <class CharT, size_t Extent = dynamic_range> template <class CharT, std::ptrdiff_t Extent = dynamic_range>
using basic_string_view = array_view<CharT, Extent>; using basic_string_view = array_view<CharT, Extent>;
template<size_t Extent = dynamic_range> template<std::ptrdiff_t Extent = dynamic_range>
using string_view = basic_string_view<char, Extent>; using string_view = basic_string_view<char, Extent>;
template<size_t Extent = dynamic_range> template<std::ptrdiff_t Extent = dynamic_range>
using cstring_view = basic_string_view<const char, Extent>; using cstring_view = basic_string_view<const char, Extent>;
template<size_t Extent = dynamic_range> template<std::ptrdiff_t Extent = dynamic_range>
using wstring_view = basic_string_view<wchar_t, Extent>; using wstring_view = basic_string_view<wchar_t, Extent>;
template<size_t Extent = dynamic_range> template<std::ptrdiff_t Extent = dynamic_range>
using cwstring_view = basic_string_view<const wchar_t, Extent>; using cwstring_view = basic_string_view<const wchar_t, Extent>;
@ -78,13 +78,13 @@ using cwstring_view = basic_string_view<const wchar_t, Extent>;
// //
// Will fail-fast if sentinel cannot be found before max elements are examined. // Will fail-fast if sentinel cannot be found before max elements are examined.
// //
template<class T, class SizeType, const T Sentinel> template<class T, const T Sentinel>
array_view<T, dynamic_range> ensure_sentinel(const T* seq, SizeType max = std::numeric_limits<SizeType>::max()) array_view<T, dynamic_range> ensure_sentinel(const T* seq, std::ptrdiff_t max = PTRDIFF_MAX)
{ {
auto cur = seq; auto cur = seq;
while (SizeType(cur - seq) < max && *cur != Sentinel) ++cur; while ((cur - seq) < max && *cur != Sentinel) ++cur;
fail_fast_assert(*cur == Sentinel); fail_fast_assert(*cur == Sentinel);
return{ seq, SizeType(cur - seq) }; return{ seq, cur - seq };
} }
@ -94,38 +94,39 @@ array_view<T, dynamic_range> ensure_sentinel(const T* seq, SizeType max = std::n
// the limit of size_type. // the limit of size_type.
// //
template<class T> template<class T>
inline basic_string_view<T, dynamic_range> ensure_z(T* const & sz, size_t max = std::numeric_limits<size_t>::max()) inline basic_string_view<T, dynamic_range> ensure_z(T* const & sz, std::ptrdiff_t max = PTRDIFF_MAX)
{ {
return ensure_sentinel<T, size_t, 0>(sz, max); return ensure_sentinel<T, 0>(sz, max);
} }
// TODO (neilmac) there is probably a better template-magic way to get the const and non-const overloads to share an implementation // TODO (neilmac) there is probably a better template-magic way to get the const and non-const overloads to share an implementation
inline basic_string_view<char, dynamic_range> ensure_z(char* const & sz, size_t max) inline basic_string_view<char, dynamic_range> ensure_z(char* const& sz, std::ptrdiff_t max)
{ {
auto len = strnlen(sz, max); auto len = strnlen(sz, max);
fail_fast_assert(sz[len] == 0); return{ sz, len }; fail_fast_assert(sz[len] == 0);
return{ sz, static_cast<std::ptrdiff_t>(len) };
} }
inline basic_string_view<const char, dynamic_range> ensure_z(const char* const& sz, size_t max) inline basic_string_view<const char, dynamic_range> ensure_z(const char* const& sz, std::ptrdiff_t max)
{ {
auto len = strnlen(sz, max); auto len = strnlen(sz, max);
fail_fast_assert(sz[len] == 0); return{ sz, len }; fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) };
} }
inline basic_string_view<wchar_t, dynamic_range> ensure_z(wchar_t* const & sz, size_t max) inline basic_string_view<wchar_t, dynamic_range> ensure_z(wchar_t* const& sz, std::ptrdiff_t max)
{ {
auto len = wcsnlen(sz, max); auto len = wcsnlen(sz, max);
fail_fast_assert(sz[len] == 0); return{ sz, len }; fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) };
} }
inline basic_string_view<const wchar_t, dynamic_range> ensure_z(const wchar_t* const & sz, size_t max) inline basic_string_view<const wchar_t, dynamic_range> ensure_z(const wchar_t* const& sz, std::ptrdiff_t max)
{ {
auto len = wcsnlen(sz, max); auto len = wcsnlen(sz, max);
fail_fast_assert(sz[len] == 0); return{ sz, len }; fail_fast_assert(sz[len] == 0); return{ sz, static_cast<std::ptrdiff_t>(len) };
} }
template<class T, size_t N> template<class T, size_t N>
basic_string_view<T, dynamic_range> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0], N); } basic_string_view<T, dynamic_range> ensure_z(T(&sz)[N]) { return ensure_z(&sz[0], static_cast<std::ptrdiff_t>(N)); }
template<class Cont> template<class Cont>
basic_string_view<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_range> ensure_z(Cont& cont) basic_string_view<typename std::remove_pointer<typename Cont::pointer>::type, dynamic_range> ensure_z(Cont& cont)

282
tests/array_view_tests.cpp
View File

@ -46,7 +46,7 @@ SUITE(array_view_tests)
delete[] ptr.data(); delete[] ptr.data();
static_bounds<size_t, 4, dynamic_range, 2> bounds{ 3 }; static_bounds<4, dynamic_range, 2> bounds{ 3 };
#ifdef CONFIRM_COMPILATION_ERRORS #ifdef CONFIRM_COMPILATION_ERRORS
array_view<int, 4, dynamic_range, 2> av(nullptr, bounds); array_view<int, 4, dynamic_range, 2> av(nullptr, bounds);
@ -147,9 +147,9 @@ SUITE(array_view_tests)
TEST(md_access) TEST(md_access)
{ {
unsigned int width = 5, height = 20; auto width = 5, height = 20;
unsigned int imgSize = width * height; auto imgSize = width * height;
auto image_ptr = new int[imgSize][3]; auto image_ptr = new int[imgSize][3];
// size check will be done // size check will be done
@ -158,9 +158,9 @@ SUITE(array_view_tests)
iota(image_view.begin(), image_view.end(), 1); iota(image_view.begin(), image_view.end(), 1);
int expected = 0; int expected = 0;
for (unsigned int i = 0; i < height; i++) for (auto i = 0; i < height; i++)
{ {
for (unsigned int j = 0; j < width; j++) for (auto j = 0; j < width; j++)
{ {
CHECK(expected + 1 == image_view[i][j][0]); CHECK(expected + 1 == image_view[i][j][0]);
CHECK(expected + 2 == image_view[i][j][1]); CHECK(expected + 2 == image_view[i][j][1]);
@ -223,10 +223,12 @@ SUITE(array_view_tests)
} }
} }
template <class Bounds> void fn(const Bounds& b) { static_assert(Bounds::static_size == 60, "static bounds is wrong size"); }
TEST (array_view_reshape_test) TEST (array_view_reshape_test)
{ {
int a[3][4][5]; int a[3][4][5];
auto av = as_array_view(a); auto av = as_array_view(a);
fn(av.bounds());
auto av2 = av.as_array_view(dim<60>()); auto av2 = av.as_array_view(dim<60>());
auto av3 = av2.as_array_view(dim<3>(), dim<4>(), dim<5>()); auto av3 = av2.as_array_view(dim<3>(), dim<4>(), dim<5>());
auto av4 = av3.as_array_view(dim<4>(), dim<>(3), dim<5>()); auto av4 = av3.as_array_view(dim<4>(), dim<>(3), dim<5>());
@ -240,7 +242,7 @@ SUITE(array_view_tests)
auto av8 = av7.as_array_view<int>(); auto av8 = av7.as_array_view<int>();
CHECK(av8.size() == av6.size()); CHECK(av8.size() == av6.size());
for (size_t i = 0; i < av8.size(); i++) for (auto i = 0; i < av8.size(); i++)
{ {
CHECK(av8[i] == 1); CHECK(av8[i] == 1);
} }
@ -309,7 +311,7 @@ SUITE(array_view_tests)
// From non-cv-qualified source // From non-cv-qualified source
{ {
const array_view<int> src{ arr }; const array_view<int> src = arr;
strided_array_view<int, 1> sav{ src, {2, 1} }; strided_array_view<int, 1> sav{ src, {2, 1} };
CHECK(sav.bounds().index_bounds() == index<1>{ 2 }); CHECK(sav.bounds().index_bounds() == index<1>{ 2 });
@ -810,13 +812,13 @@ SUITE(array_view_tests)
array_view<int, dynamic_range> av(arr, 8); array_view<int, dynamic_range> av(arr, 8);
size_t a[1] = { 0 }; ptrdiff_t a[1] = { 0 };
index<1> i = a; index<1> i = a;
CHECK(av[i] == 4); CHECK(av[i] == 4);
auto av2 = av.as_array_view(dim<4>(), dim<>(2)); auto av2 = av.as_array_view(dim<4>(), dim<>(2));
size_t a2[2] = { 0, 1 }; ptrdiff_t a2[2] = { 0, 1 };
index<2> i2 = a2; index<2> i2 = a2;
CHECK(av2[i2] == 0); CHECK(av2[i2] == 0);
@ -846,20 +848,12 @@ SUITE(array_view_tests)
index<3> i4 = i3; index<3> i4 = i3;
CHECK(i4[0] == 0); CHECK(i4[0] == 0);
// from other index of bigger size type
index<3, short> i5 = i4;
CHECK(i5[0] == 0);
// from other index of smaller size type
index<3, long long> i6 = i4;
CHECK(i6[0] == 0);
// default // default
index<3, long long> i7; index<3> i7;
CHECK(i7[0] == 0); CHECK(i7[0] == 0);
// default // default
index<3, long long> i9 = {}; index<3> i9 = {};
CHECK(i9[0] == 0); CHECK(i9[0] == 0);
} }
@ -885,20 +879,12 @@ SUITE(array_view_tests)
index<1> i5 = i3; index<1> i5 = i3;
CHECK(i5[0] == 0); CHECK(i5[0] == 0);
// from other index of bigger size type
index<1, short> i6 = i5;
CHECK(i6[0] == 0);
// from other index of smaller size type
index<1, long long> i7 = i6;
CHECK(i7[0] == 0);
// default // default
index<1, long long> i8; index<1> i8;
CHECK(i8[0] == 0); CHECK(i8[0] == 0);
// default // default
index<1, long long> i9 = {}; index<1> i9 = {};
CHECK(i9[0] == 0); CHECK(i9[0] == 0);
} }
@ -915,8 +901,8 @@ SUITE(array_view_tests)
TEST(index_operations) TEST(index_operations)
{ {
size_t a[3] = { 0, 1, 2 }; ptrdiff_t a[3] = { 0, 1, 2 };
size_t b[3] = { 3, 4, 5 }; ptrdiff_t b[3] = { 3, 4, 5 };
index<3> i = a; index<3> i = a;
index<3> j = b; index<3> j = b;
@ -977,12 +963,12 @@ SUITE(array_view_tests)
auto section = av.section({ 0,1 }, { length,1 }); auto section = av.section({ 0,1 }, { length,1 });
CHECK(section.size() == length); CHECK(section.size() == length);
for (unsigned int i = 0; i < section.size(); ++i) for (auto i = 0; i < section.size(); ++i)
{ {
CHECK(section[i][0] == av[i][1]); CHECK(section[i][0] == av[i][1]);
} }
for (unsigned int i = 0; i < section.size(); ++i) for (auto i = 0; i < section.size(); ++i)
{ {
auto idx = index<2>{ i,0 }; // avoid braces inside the CHECK macro auto idx = index<2>{ i,0 }; // avoid braces inside the CHECK macro
CHECK(section[idx] == av[i][1]); CHECK(section[idx] == av[i][1]);
@ -990,9 +976,9 @@ SUITE(array_view_tests)
CHECK(section.bounds().index_bounds()[0] == length); CHECK(section.bounds().index_bounds()[0] == length);
CHECK(section.bounds().index_bounds()[1] == 1); CHECK(section.bounds().index_bounds()[1] == 1);
for (unsigned int i = 0; i < section.bounds().index_bounds()[0]; ++i) for (auto i = 0; i < section.bounds().index_bounds()[0]; ++i)
{ {
for (unsigned int j = 0; j < section.bounds().index_bounds()[1]; ++j) for (auto j = 0; j < section.bounds().index_bounds()[1]; ++j)
{ {
auto idx = index<2>{ i,j }; // avoid braces inside the CHECK macro auto idx = index<2>{ i,j }; // avoid braces inside the CHECK macro
CHECK(section[idx] == av[i][1]); CHECK(section[idx] == av[i][1]);
@ -1000,13 +986,13 @@ SUITE(array_view_tests)
} }
size_t check_sum = 0; size_t check_sum = 0;
for (size_t i = 0; i < length; ++i) for (auto i = 0; i < length; ++i)
{ {
check_sum += av[i][1]; check_sum += av[i][1];
} }
{ {
size_t idx = 0; auto idx = 0;
size_t sum = 0; size_t sum = 0;
for (auto num : section) for (auto num : section)
{ {
@ -1052,18 +1038,18 @@ SUITE(array_view_tests)
} }
// both bounds are dynamic // both bounds are dynamic
{ {
array_view<int, dynamic_range, dynamic_range> av(arr, 4); array_view<int, dynamic_range, dynamic_range> av = arr;
iterate_second_column(av); iterate_second_column(av);
} }
} }
TEST(dynamic_array_view_section_iteration) TEST(dynamic_array_view_section_iteration)
{ {
unsigned int height = 4, width = 2; auto height = 4, width = 2;
unsigned int size = height * width; auto size = height * width;
auto arr = new int[size]; auto arr = new int[size];
for (int unsigned i = 0; i < size; ++i) for (auto i = 0; i < size; ++i)
{ {
arr[i] = i; arr[i] = i;
} }
@ -1103,7 +1089,7 @@ SUITE(array_view_tests)
CHECK(strided.size() == length); CHECK(strided.size() == length);
CHECK(strided.bounds().index_bounds()[0] == length); CHECK(strided.bounds().index_bounds()[0] == length);
for (unsigned int i = 0; i < strided.size(); ++i) for (auto i = 0; i < strided.size(); ++i)
{ {
CHECK(strided[i] == av[2 * i + 1]); CHECK(strided[i] == av[2 * i + 1]);
} }
@ -1153,20 +1139,20 @@ SUITE(array_view_tests)
int expected[6] = { 2,3,10,11,18,19 }; int expected[6] = { 2,3,10,11,18,19 };
auto section = av.section({ 0,1,0 }, { 3,1,2 }); auto section = av.section({ 0,1,0 }, { 3,1,2 });
for (unsigned int i = 0; i < section.extent<0>(); ++i) for (auto i = 0; i < section.extent<0>(); ++i)
{ {
for (unsigned int j = 0; j < section.extent<1>(); ++j) for (auto j = 0; j < section.extent<1>(); ++j)
for (unsigned int k = 0; k < section.extent<2>(); ++k) for (auto k = 0; k < section.extent<2>(); ++k)
{ {
auto idx = index<3>{ i,j,k }; // avoid braces in the CHECK macro auto idx = index<3>{ i,j,k }; // avoid braces in the CHECK macro
CHECK(section[idx] == expected[2 * i + 2 * j + k]); CHECK(section[idx] == expected[2 * i + 2 * j + k]);
} }
} }
for (unsigned int i = 0; i < section.extent<0>(); ++i) for (auto i = 0; i < section.extent<0>(); ++i)
{ {
for (unsigned int j = 0; j < section.extent<1>(); ++j) for (auto j = 0; j < section.extent<1>(); ++j)
for (unsigned int k = 0; k < section.extent<2>(); ++k) for (auto k = 0; k < section.extent<2>(); ++k)
CHECK(section[i][j][k] == expected[2 * i + 2 * j + k]); CHECK(section[i][j][k] == expected[2 * i + 2 * j + k]);
} }
@ -1181,10 +1167,10 @@ SUITE(array_view_tests)
TEST(strided_array_view_section_iteration_3d) TEST(strided_array_view_section_iteration_3d)
{ {
int arr[3][4][2]; int arr[3][4][2];
for (int i = 0; i < 3; ++i) for (auto i = 0; i < 3; ++i)
{ {
for (int j = 0; j < 4; ++j) for (auto j = 0; j < 4; ++j)
for (unsigned int k = 0; k < 2; ++k) for (auto k = 0; k < 2; ++k)
arr[i][j][k] = 8 * i + 2 * j + k; arr[i][j][k] = 8 * i + 2 * j + k;
} }
@ -1196,11 +1182,11 @@ SUITE(array_view_tests)
TEST(dynamic_strided_array_view_section_iteration_3d) TEST(dynamic_strided_array_view_section_iteration_3d)
{ {
unsigned int height = 12, width = 2; auto height = 12, width = 2;
unsigned int size = height * width; auto size = height * width;
auto arr = new int[size]; auto arr = new int[size];
for (int unsigned i = 0; i < size; ++i) for (auto i = 0; i < size; ++i)
{ {
arr[i] = i; arr[i] = i;
} }
@ -1235,7 +1221,7 @@ SUITE(array_view_tests)
X arr[4] = { { 0,1,2 },{ 3,4,5 },{ 6,7,8 },{ 9,10,11 } }; X arr[4] = { { 0,1,2 },{ 3,4,5 },{ 6,7,8 },{ 9,10,11 } };
auto s = sizeof(int) / sizeof(byte); int s = sizeof(int) / sizeof(byte);
auto d2 = 3 * s; auto d2 = 3 * s;
auto d1 = sizeof(int) * 12 / d2; auto d1 = sizeof(int) * 12 / d2;
@ -1277,152 +1263,6 @@ SUITE(array_view_tests)
} }
template<size_t Rank, typename T1, typename T2>
index<Rank, T2> Convert(index<Rank, T1> index)
{
return{ index };
}
TEST(DomainConverters)
{
// to smaller
{
index<2, int> int_index{ 0,1 };
index<2, short> short_index{ int_index };
CHECK(short_index[0] == 0);
CHECK(short_index[1] == 1);
}
// to smaller (failure)
{
index<2, int> big_int_index{ std::numeric_limits<int>::max(), 1 };
CHECK_THROW((Convert<2,int, short int>(big_int_index)), fail_fast);
}
// to same, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned int> uint_index{ int_index };
CHECK(uint_index[0] == 0);
CHECK(uint_index[1] == 1);
}
// to same, sign mismatch, reversed
{
index<2, unsigned int> uint_index{ 0,1 };
index<2, int> int_index{ uint_index };
CHECK(int_index[0] == 0);
CHECK(int_index[1] == 1);
}
// to smaller, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned short> ushort_index{ int_index };
CHECK(ushort_index[0] == 0);
CHECK(ushort_index[1] == 1);
}
// to bigger
{
index<2, int> int_index{ 0,1 };
index<2, long long> longlong_index{ int_index };
CHECK(longlong_index[0] == 0);
CHECK(longlong_index[1] == 1);
}
// to bigger with max index
{
index<2, int> big_int_index{ std::numeric_limits<int>::max(), 1 };
index<2, long long> longlong_index{ big_int_index };
CHECK(longlong_index[0] == std::numeric_limits<int>::max());
CHECK(longlong_index[1] == 1);
}
// to bigger, sign mismatch
{
index<2, int> int_index{ 0,1 };
index<2, unsigned long long> ulonglong_index{ int_index };
CHECK(ulonglong_index[0] == 0);
CHECK(ulonglong_index[1] == 1);
}
}
TEST(DomainConvertersRank1)
{
// to smaller
{
index<1, int> int_index{ 0 };
index<1, short> short_index{ int_index };
CHECK(short_index[0] == 0);
}
// to smaller (failure)
{
index<1, int> big_int_index{ std::numeric_limits<int>::max() };
CHECK_THROW((Convert<1, int, short int>(big_int_index)), fail_fast);
}
// to same, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned int> uint_index{ int_index };
CHECK(uint_index[0] == 0);
}
// to same, sign mismatch, reversed
{
index<1, unsigned int> uint_index{ 0 };
index<1, int> int_index{ uint_index };
CHECK(int_index[0] == 0);
}
// to smaller, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned short> ushort_index{ int_index };
CHECK(ushort_index[0] == 0);
}
// to bigger
{
index<1, int> int_index{ 0 };
index<1, long long> longlong_index{ int_index };
CHECK(longlong_index[0] == 0);
}
// to bigger with max index
{
index<1, int> big_int_index{ std::numeric_limits<int>::max() };
index<1, long long> longlong_index{ big_int_index };
CHECK(longlong_index[0] == std::numeric_limits<int>::max());
}
// to bigger, sign mismatch
{
index<1, int> int_index{ 0 };
index<1, unsigned long long> ulonglong_index{ int_index };
CHECK(ulonglong_index[0] == 0);
}
}
TEST(constructors) TEST(constructors)
{ {
array_view<int, dynamic_range> av(nullptr); array_view<int, dynamic_range> av(nullptr);
@ -1468,7 +1308,7 @@ SUITE(array_view_tests)
int arr[] = {3, 4, 5}; int arr[] = {3, 4, 5};
av1 = arr; av1 = arr;
array_view<array_view_options<const int, unsigned char>, dynamic_range> av2; array_view<const int, dynamic_range> av2;
av2 = av1; av2 = av1;
} }
@ -1478,21 +1318,21 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.first<2>().bounds() == static_bounds<size_t, 2>())); CHECK((av.first<2>().bounds() == static_bounds<2>()));
CHECK(av.first<2>().length() == 2); CHECK(av.first<2>().length() == 2);
CHECK(av.first(2).length() == 2); CHECK(av.first(2).length() == 2);
} }
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.first<0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.first<0>().bounds() == static_bounds<0>()));
CHECK(av.first<0>().length() == 0); CHECK(av.first<0>().length() == 0);
CHECK(av.first(0).length() == 0); CHECK(av.first(0).length() == 0);
} }
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.first<5>().bounds() == static_bounds<size_t, 5>())); CHECK((av.first<5>().bounds() == static_bounds<5>()));
CHECK(av.first<5>().length() == 5); CHECK(av.first<5>().length() == 5);
CHECK(av.first(5).length() == 5); CHECK(av.first(5).length() == 5);
} }
@ -1500,7 +1340,7 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
#ifdef CONFIRM_COMPILATION_ERRORS #ifdef CONFIRM_COMPILATION_ERRORS
CHECK(av.first<6>().bounds() == static_bounds<size_t, 6>()); CHECK(av.first<6>().bounds() == static_bounds<6>());
CHECK(av.first<6>().length() == 6); CHECK(av.first<6>().length() == 6);
#endif #endif
CHECK_THROW(av.first(6).length(), fail_fast); CHECK_THROW(av.first(6).length(), fail_fast);
@ -1508,7 +1348,7 @@ SUITE(array_view_tests)
{ {
array_view<int, dynamic_range> av; array_view<int, dynamic_range> av;
CHECK((av.first<0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.first<0>().bounds() == static_bounds<0>()));
CHECK(av.first<0>().length() == 0); CHECK(av.first<0>().length() == 0);
CHECK(av.first(0).length() == 0); CHECK(av.first(0).length() == 0);
} }
@ -1520,21 +1360,21 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.last<2>().bounds() == static_bounds<size_t, 2>())); CHECK((av.last<2>().bounds() == static_bounds<2>()));
CHECK(av.last<2>().length() == 2); CHECK(av.last<2>().length() == 2);
CHECK(av.last(2).length() == 2); CHECK(av.last(2).length() == 2);
} }
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.last<0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.last<0>().bounds() == static_bounds<0>()));
CHECK(av.last<0>().length() == 0); CHECK(av.last<0>().length() == 0);
CHECK(av.last(0).length() == 0); CHECK(av.last(0).length() == 0);
} }
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.last<5>().bounds() == static_bounds<size_t, 5>())); CHECK((av.last<5>().bounds() == static_bounds<5>()));
CHECK(av.last<5>().length() == 5); CHECK(av.last<5>().length() == 5);
CHECK(av.last(5).length() == 5); CHECK(av.last(5).length() == 5);
} }
@ -1543,7 +1383,7 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
#ifdef CONFIRM_COMPILATION_ERRORS #ifdef CONFIRM_COMPILATION_ERRORS
CHECK((av.last<6>().bounds() == static_bounds<size_t, 6>())); CHECK((av.last<6>().bounds() == static_bounds<6>()));
CHECK(av.last<6>().length() == 6); CHECK(av.last<6>().length() == 6);
#endif #endif
CHECK_THROW(av.last(6).length(), fail_fast); CHECK_THROW(av.last(6).length(), fail_fast);
@ -1551,7 +1391,7 @@ SUITE(array_view_tests)
{ {
array_view<int, dynamic_range> av; array_view<int, dynamic_range> av;
CHECK((av.last<0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.last<0>().bounds() == static_bounds<0>()));
CHECK(av.last<0>().length() == 0); CHECK(av.last<0>().length() == 0);
CHECK(av.last(0).length() == 0); CHECK(av.last(0).length() == 0);
} }
@ -1560,12 +1400,12 @@ SUITE(array_view_tests)
TEST(custmized_array_view_size) TEST(custmized_array_view_size)
{ {
double (*arr)[3][4] = new double[100][3][4]; double (*arr)[3][4] = new double[100][3][4];
array_view<array_view_options<double, char>, dynamic_range, 3, 4> av1(arr, (char)10); array_view<double, dynamic_range, 3, 4> av1(arr, 10);
struct EffectiveStructure struct EffectiveStructure
{ {
double* v1; double* v1;
char v2; ptrdiff_t v2;
}; };
CHECK(sizeof(av1) == sizeof(EffectiveStructure)); CHECK(sizeof(av1) == sizeof(EffectiveStructure));
@ -1581,7 +1421,7 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.sub<2,2>().bounds() == static_bounds<size_t, 2>())); CHECK((av.sub<2,2>().bounds() == static_bounds<2>()));
CHECK((av.sub<2,2>().length() == 2)); CHECK((av.sub<2,2>().length() == 2));
CHECK(av.sub(2,2).length() == 2); CHECK(av.sub(2,2).length() == 2);
CHECK(av.sub(2,3).length() == 3); CHECK(av.sub(2,3).length() == 3);
@ -1590,14 +1430,14 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.sub<0,0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<0,0>().length() == 0)); CHECK((av.sub<0,0>().length() == 0));
CHECK(av.sub(0,0).length() == 0); CHECK(av.sub(0,0).length() == 0);
} }
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.sub<0,5>().bounds() == static_bounds<size_t, 5>())); CHECK((av.sub<0,5>().bounds() == static_bounds<5>()));
CHECK((av.sub<0,5>().length() == 5)); CHECK((av.sub<0,5>().length() == 5));
CHECK(av.sub(0,5).length() == 5); CHECK(av.sub(0,5).length() == 5);
CHECK_THROW(av.sub(0,6).length(), fail_fast); CHECK_THROW(av.sub(0,6).length(), fail_fast);
@ -1606,7 +1446,7 @@ SUITE(array_view_tests)
{ {
array_view<int, 5> av = arr; array_view<int, 5> av = arr;
CHECK((av.sub<5,0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.sub<5,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<5, 0>().length() == 0)); CHECK((av.sub<5, 0>().length() == 0));
CHECK(av.sub(5,0).length() == 0); CHECK(av.sub(5,0).length() == 0);
CHECK_THROW(av.sub(6,0).length(), fail_fast); CHECK_THROW(av.sub(6,0).length(), fail_fast);
@ -1614,7 +1454,7 @@ SUITE(array_view_tests)
{ {
array_view<int, dynamic_range> av; array_view<int, dynamic_range> av;
CHECK((av.sub<0,0>().bounds() == static_bounds<size_t, 0>())); CHECK((av.sub<0,0>().bounds() == static_bounds<0>()));
CHECK((av.sub<0,0>().length() == 0)); CHECK((av.sub<0,0>().length() == 0));
CHECK(av.sub(0,0).length() == 0); CHECK(av.sub(0,0).length() == 0);
CHECK_THROW((av.sub<1,0>().length()), fail_fast); CHECK_THROW((av.sub<1,0>().length()), fail_fast);
@ -1662,7 +1502,7 @@ SUITE(array_view_tests)
void AssertContentsMatch(T a1, U a2) void AssertContentsMatch(T a1, U a2)
{ {
CHECK(a1.length() == a2.length()); CHECK(a1.length() == a2.length());
for (size_t i = 0; i < a1.length(); ++i) for (auto i = 0; i < a1.length(); ++i)
CHECK(a1[i] == a2[i]); CHECK(a1[i] == a2[i]);
} }
@ -1853,7 +1693,7 @@ SUITE(array_view_tests)
CHECK(av1 == av2); CHECK(av1 == av2);
array_view<array_view_options<int, char>, 20> av3 = av1.as_array_view(dim<>(20)); array_view<int, 20> av3 = av1.as_array_view(dim<>(20));
CHECK(av3 == av2 && av3 == av1); CHECK(av3 == av2 && av3 == av1);
} }

32
tests/bounds_tests.cpp
View File

@ -23,16 +23,16 @@ using namespace gsl;;
namespace namespace
{ {
void use(unsigned int&) {} void use(std::ptrdiff_t&) {}
} }
SUITE(bounds_test) SUITE(bounds_test)
{ {
TEST(basic_bounds) TEST(basic_bounds)
{ {
for (auto point : static_bounds <unsigned int, dynamic_range, 3, 4 > { 2 }) for (auto point : static_bounds<dynamic_range, 3, 4 > { 2 })
{ {
for (unsigned int j = 0; j < decltype(point)::rank; j++) for (decltype(point)::size_type j = 0; j < decltype(point)::rank; j++)
{ {
use(j); use(j);
use(point[j]); use(point[j]);
@ -42,15 +42,15 @@ SUITE(bounds_test)
TEST(bounds_basic) TEST(bounds_basic)
{ {
static_bounds<size_t, 3, 4, 5> b; static_bounds<3, 4, 5> b;
auto a = b.slice(); auto a = b.slice();
static_bounds<size_t, 4, dynamic_range, 2> x{ 4 }; static_bounds<4, dynamic_range, 2> x{ 4 };
x.slice().slice(); x.slice().slice();
} }
TEST (arrayview_iterator) TEST (arrayview_iterator)
{ {
static_bounds<size_t, 4, dynamic_range, 2> bounds{ 3 }; static_bounds<4, dynamic_range, 2> bounds{ 3 };
auto itr = bounds.begin(); auto itr = bounds.begin();
@ -68,24 +68,24 @@ SUITE(bounds_test)
TEST (bounds_convertible) TEST (bounds_convertible)
{ {
static_bounds<size_t, 7, 4, 2> b1; static_bounds<7, 4, 2> b1;
static_bounds<size_t, 7, dynamic_range, 2> b2 = b1; static_bounds<7, dynamic_range, 2> b2 = b1;
#ifdef CONFIRM_COMPILATION_ERRORS #ifdef CONFIRM_COMPILATION_ERRORS
static_bounds<size_t, 7, dynamic_range, 1> b4 = b2; static_bounds<7, dynamic_range, 1> b4 = b2;
#endif #endif
static_bounds<size_t, dynamic_range, dynamic_range, dynamic_range> b3 = b1; static_bounds<dynamic_range, dynamic_range, dynamic_range> b3 = b1;
static_bounds<int, 7, 4, 2> b4 = b3; static_bounds<7, 4, 2> b4 = b3;
static_bounds<size_t, dynamic_range> b11; static_bounds<dynamic_range> b11;
static_bounds<size_t, dynamic_range> b5; static_bounds<dynamic_range> b5;
static_bounds<size_t, 34> b6; static_bounds<34> b6;
b5 = static_bounds<size_t, 20>(); b5 = static_bounds<20>();
CHECK_THROW(b6 = b5, fail_fast); CHECK_THROW(b6 = b5, fail_fast);
b5 = static_bounds<size_t, 34>(); b5 = static_bounds<34>();
b6 = b5; b6 = b5;
CHECK(b5 == b6); CHECK(b5 == b6);