Skip to content

[WIP] Fix ArrayView bool conversion #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mosra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Fix ArrayView bool conversion #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Corrade/Containers/Array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class Array {
/** @brief Whether the array is non-empty */
/* Disabled on MSVC <= 2017 to avoid ambiguous operator+() when doing
pointer arithmetic. */
explicit operator bool() const { return _data; }
explicit operator bool() const { return _size; }
#endif

/**
Expand Down
4 changes: 2 additions & 2 deletions src/Corrade/Containers/ArrayView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ template<class T> class ArrayView {
/** @brief Whether the array is non-empty */
/* Disabled on MSVC <= 2017 to avoid ambiguous operator+() when doing
pointer arithmetic. */
explicit operator bool() const { return _data; }
explicit operator bool() const { return _size; }
#endif

/** @brief Conversion to array type */
Expand Down Expand Up @@ -497,7 +497,7 @@ template<std::size_t size_, class T> class StaticArrayView {
/** @brief Whether the array is non-empty */
/* Disabled on MSVC <= 2017 to avoid ambiguous operator+() when doing
pointer arithmetic. */
explicit operator bool() const { return _data; }
constexpr explicit operator bool() const { return size_; }
#endif

/** @brief Conversion to array type */
Expand Down
7 changes: 7 additions & 0 deletions src/Corrade/Containers/StaticArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,13 @@ template<std::size_t size_, class T> class StaticArray {
/** @brief Moving is not allowed */
StaticArray<size_, T>& operator=(StaticArray<size_, T>&&) = delete;

#ifndef CORRADE_MSVC2017_COMPATIBILITY
/** @brief Whether the array is non-empty */
/* Disabled on MSVC <= 2017 to avoid ambiguous operator+() when doing
pointer arithmetic. */
constexpr explicit operator bool() const { return size_; }
#endif

/**
* @brief Convert to @ref ArrayView
*
Expand Down
19 changes: 15 additions & 4 deletions src/Corrade/Containers/Test/ArrayViewTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ struct ArrayViewTest: TestSuite::Tester {
void constructVoid();

void convertBool();
void convertBoolNullptr();
void convertPointer();
void convertConst();
void convertVoid();
Expand Down Expand Up @@ -75,6 +76,7 @@ ArrayViewTest::ArrayViewTest() {
&ArrayViewTest::constructVoid,

&ArrayViewTest::convertBool,
&ArrayViewTest::convertBoolNullptr,
&ArrayViewTest::convertPointer,
&ArrayViewTest::convertConst,
&ArrayViewTest::convertVoid,
Expand Down Expand Up @@ -202,6 +204,15 @@ void ArrayViewTest::convertBool() {
CORRADE_VERIFY(!(std::is_convertible<VoidArrayView, int>::value));
}

void ArrayViewTest::convertBoolNullptr() {
/* Zero-sized slice of an array should convert to false, while three-item
array starting at 0 should convert to true. The documentation says
it returns true if nonempty. */
int a[7];
CORRADE_VERIFY(!(ArrayView{a, 0}));
CORRADE_VERIFY((ArrayView{nullptr, 5}));
}

void ArrayViewTest::convertPointer() {
int a[7];
ArrayView b = a;
Expand Down Expand Up @@ -321,22 +332,22 @@ void ArrayViewTest::sliceNullptr() {
ArrayView a{nullptr, 5};

ArrayView b = a.prefix(nullptr);
CORRADE_VERIFY(!b);
CORRADE_VERIFY(!b.begin());
CORRADE_COMPARE(b.size(), 0);

ArrayView c = a.suffix(nullptr);
CORRADE_VERIFY(!c);
CORRADE_VERIFY(!c.begin());
CORRADE_COMPARE(c.size(), 5);

int data[5];
ArrayView d{data};

ArrayView e = d.prefix(nullptr);
CORRADE_VERIFY(!e);
CORRADE_VERIFY(!e.begin());
CORRADE_COMPARE(e.size(), 0);

ArrayView f = d.suffix(nullptr);
CORRADE_VERIFY(!f);
CORRADE_VERIFY(!f.begin());
CORRADE_COMPARE(f.size(), 0);
}

Expand Down
15 changes: 14 additions & 1 deletion src/Corrade/Containers/Test/StaticArrayViewTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ struct StaticArrayViewTest: TestSuite::Tester {
void constructConst();

void convertBool();
void convertBoolNullptr();
void convertPointer();
void convertConst();
void convertVoid();
Expand Down Expand Up @@ -70,6 +71,7 @@ StaticArrayViewTest::StaticArrayViewTest() {
&StaticArrayViewTest::constructConst,

&StaticArrayViewTest::convertBool,
&StaticArrayViewTest::convertBoolNullptr,
&StaticArrayViewTest::convertPointer,
&StaticArrayViewTest::convertConst,
&StaticArrayViewTest::convertVoid,
Expand Down Expand Up @@ -158,10 +160,21 @@ void StaticArrayViewTest::constructConst() {
void StaticArrayViewTest::convertBool() {
int a[7];
CORRADE_VERIFY(StaticArrayView<5>{a});
CORRADE_VERIFY(!StaticArrayView<5>{});
/** @todo ISO C++ forbids zero-side array, can't really test */
//CORRADE_VERIFY(StaticArrayView<0>{});
CORRADE_VERIFY(!(std::is_convertible<StaticArrayView<5>, int>::value));
}

void StaticArrayViewTest::convertBoolNullptr() {
/* Zero-sized slice of an array should convert to false, while three-item
array starting at 0 should convert to true. The documentation says
it returns true if nonempty. */
/** @todo ISO C++ forbids zero-side array, can't really test */
//int a[7];
//CORRADE_VERIFY(!StaticArrayView<5>{a}.slice<0>(1));
CORRADE_VERIFY(StaticArrayView<5>{nullptr});
}

void StaticArrayViewTest::convertPointer() {
int a[7];
StaticArrayView<7> b = a;
Expand Down