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

Added array constructors.

Browse Source
This commit is contained in:
Neil MacIntosh 2016-02-29 13:16:48 -08:00
parent 502cd6650a
commit f61a9bba48
2 changed files with 23 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/span.h
View File

@ -108,14 +108,21 @@ public:
{} {}
template <size_t N> template <size_t N>
constexpr span(element_type(&arr)[N]) : storage_(&arr[0], extent_type<N>()) constexpr span(element_type(&arr)[N])
: storage_(&arr[0], extent_type<N>())
{}
template <size_t N>
constexpr span(std::array<std::remove_const_t<element_type>, N>& arr)
: storage_(&arr[0], extent_type<N>())
{}
template <size_t N>
constexpr span(const std::array<std::remove_const_t<element_type>, N>& arr)
: storage_(&arr[0], extent_type<N>())
{} {}
#if 0 // TODO #if 0 // TODO
template <size_t N>
constexpr span(array<remove_const_t<element_type>, N>& arr);
template <size_t N>
constexpr span(const array<remove_const_t<element_type>, N>& arr);
template <class Container> template <class Container>
constexpr span(Container& cont); constexpr span(Container& cont);
template <class Container> template <class Container>

57
tests/span_tests.cpp
View File

@ -306,7 +306,7 @@ SUITE(span_tests)
} }
#endif #endif
{ {
span<int[3]> s{ arr2d[0] }; span<int[3]> s{ &(arr2d[0]), 1 };
CHECK(s.length() == 1 && s.data() == &arr2d[0]); CHECK(s.length() == 1 && s.data() == &arr2d[0]);
} }
@ -335,34 +335,18 @@ SUITE(span_tests)
} }
#endif #endif
{ {
//span<int[3][2]> s{arr3d[0]}; span<int[3][2]> s{&arr3d[0], 1};
//CHECK(s.length() == 1 && s.data() == &arr3d[0]); CHECK(s.length() == 1 && s.data() == &arr3d[0]);
} }
} }
#if 0
TEST(from_dynamic_array_constructor) TEST(from_dynamic_array_constructor)
{ {
double(*arr)[3][4] = new double[100][3][4]; double(*arr)[3][4] = new double[100][3][4];
{ {
span<double, dynamic_range, 3, 4> s(arr, 10); span<double> s(&arr[0][0][0], 10);
CHECK(s.length() == 120 && s.data() == &arr[0][0][0]); CHECK(s.length() == 10 && s.data() == &arr[0][0][0]);
CHECK_THROW(s[10][3][4], fail_fast);
}
{
span<double, dynamic_range, 4, 3> s(arr, 10);
CHECK(s.length() == 120 && s.data() == &arr[0][0][0]);
}
{
span<double> s(arr, 10);
CHECK(s.length() == 120 && s.data() == &arr[0][0][0]);
}
{
span<double, dynamic_range, 3, 4> s(arr, 0);
CHECK(s.length() == 0 && s.data() == &arr[0][0][0]);
} }
delete[] arr; delete[] arr;
@ -388,6 +372,7 @@ SUITE(span_tests)
CHECK(cs.size() == narrow_cast<ptrdiff_t>(arr.size()) && cs.data() == arr.data()); CHECK(cs.size() == narrow_cast<ptrdiff_t>(arr.size()) && cs.data() == arr.data());
} }
#ifdef CONFIRM_COMPILATION_ERRORS
{ {
span<int, 2> s{arr}; span<int, 2> s{arr};
CHECK(s.size() == 2 && s.data() == arr.data()); CHECK(s.size() == 2 && s.data() == arr.data());
@ -404,27 +389,17 @@ SUITE(span_tests)
CHECK(cs.size() == 0 && cs.data() == arr.data()); CHECK(cs.size() == 0 && cs.data() == arr.data());
} }
// TODO This is currently an unsupported scenario. We will come back to it as we revise
// the multidimensional interface and what transformations between dimensionality look like
//{
// span<int, 2, 2> s{arr};
// CHECK(s.size() == narrow_cast<ptrdiff_t>(arr.size()) && s.data() == arr.data());
//}
{ {
#ifdef CONFIRM_COMPILATION_ERRORS
span<int, 5> s{arr}; span<int, 5> s{arr};
#endif
} }
{ {
#ifdef CONFIRM_COMPILATION_ERRORS
auto get_an_array = []() { return std::array<int, 4>{1, 2, 3, 4}; }; auto get_an_array = []() { return std::array<int, 4>{1, 2, 3, 4}; };
auto take_a_span = [](span<int> s) { (void) s; }; auto take_a_span = [](span<int> s) { (void) s; };
// try to take a temporary std::array // try to take a temporary std::array
take_a_span(get_an_array()); take_a_span(get_an_array());
#endif
} }
#endif
} }
TEST(from_const_std_array_constructor) TEST(from_const_std_array_constructor)
@ -440,7 +415,7 @@ SUITE(span_tests)
span<const int, 4> s{arr}; span<const int, 4> s{arr};
CHECK(s.size() == narrow_cast<ptrdiff_t>(arr.size()) && s.data() == arr.data()); CHECK(s.size() == narrow_cast<ptrdiff_t>(arr.size()) && s.data() == arr.data());
} }
#ifdef CONFIRM_COMPILATION_ERRORS
{ {
span<const int, 2> s{arr}; span<const int, 2> s{arr};
CHECK(s.size() == 2 && s.data() == arr.data()); CHECK(s.size() == 2 && s.data() == arr.data());
@ -451,29 +426,19 @@ SUITE(span_tests)
CHECK(s.size() == 0 && s.data() == arr.data()); CHECK(s.size() == 0 && s.data() == arr.data());
} }
// TODO This is currently an unsupported scenario. We will come back to it as we revise
// the multidimensional interface and what transformations between dimensionality look like
//{
// span<int, 2, 2> s{arr};
// CHECK(s.size() == narrow_cast<ptrdiff_t>(arr.size()) && s.data() == arr.data());
//}
{ {
#ifdef CONFIRM_COMPILATION_ERRORS
span<const int, 5> s{arr}; span<const int, 5> s{arr};
#endif
} }
{ {
#ifdef CONFIRM_COMPILATION_ERRORS
auto get_an_array = []() -> const std::array<int, 4> { return {1, 2, 3, 4}; }; auto get_an_array = []() -> const std::array<int, 4> { return {1, 2, 3, 4}; };
auto take_a_span = [](span<const int> s) { (void) s; }; auto take_a_span = [](span<const int> s) { (void) s; };
// try to take a temporary std::array // try to take a temporary std::array
take_a_span(get_an_array()); take_a_span(get_an_array());
}
#endif #endif
} }
} #if 0
TEST(from_container_constructor) TEST(from_container_constructor)
{ {
std::vector<int> v = {1, 2, 3}; std::vector<int> v = {1, 2, 3};