ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Span: Improve readability of precondition checks

pull/7828/head
Vincent Coubard 2018-08-22 09:40:13 +01:00
parent 938d802ea0
commit 26b546bab3
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
platform/Span.h
View File

@ -206,7 +206,7 @@ struct Span {
template<ptrdiff_t Count> template<ptrdiff_t Count>
Span<element_type, Count> first() const { Span<element_type, Count> first() const {
MBED_STATIC_ASSERT( MBED_STATIC_ASSERT(
(Count >= 0) && (Count <= Extent), (0 <= Count) && (Count <= Extent),
"Invalid subspan extent" "Invalid subspan extent"
); );
return Span<element_type, Count>(_data, Count); return Span<element_type, Count>(_data, Count);
@ -224,7 +224,7 @@ struct Span {
template<ptrdiff_t Count> template<ptrdiff_t Count>
Span<element_type, Count> last() const { Span<element_type, Count> last() const {
MBED_STATIC_ASSERT( MBED_STATIC_ASSERT(
(Count >= 0) && (Count <= Extent), (0 <= Count) && (Count <= Extent),
"Invalid subspan extent" "Invalid subspan extent"
); );
return Span<element_type, Count>(_data + (Extent - Count), Count); return Span<element_type, Count>(_data + (Extent - Count), Count);
@ -246,12 +246,12 @@ struct Span {
Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count> Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count>
subspan() const { subspan() const {
MBED_STATIC_ASSERT( MBED_STATIC_ASSERT(
Offset == 0 || (Offset > 0 && Offset < Extent), 0 <= Offset && Offset <= Extent,
"Invalid subspan offset" "Invalid subspan offset"
); );
MBED_STATIC_ASSERT( MBED_STATIC_ASSERT(
(Count == SPAN_DYNAMIC_EXTENT) || (Count == SPAN_DYNAMIC_EXTENT) ||
(Count >= 0 && Offset + Count <= Extent), (0 <= Count && (Count + Offset) <= Extent),
"Invalid subspan count" "Invalid subspan count"
); );
return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count>( return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count>(
@ -305,7 +305,7 @@ struct Span {
MBED_ASSERT(0 <= offset && offset <= Extent); MBED_ASSERT(0 <= offset && offset <= Extent);
MBED_ASSERT( MBED_ASSERT(
(count == SPAN_DYNAMIC_EXTENT) || (count == SPAN_DYNAMIC_EXTENT) ||
(count >= 0 && (offset + count <= Extent)) (0 <= count && (count + offset) <= Extent)
); );
return Span<element_type, SPAN_DYNAMIC_EXTENT>( return Span<element_type, SPAN_DYNAMIC_EXTENT>(
_data + offset, _data + offset,
@ -490,7 +490,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
*/ */
template<ptrdiff_t Count> template<ptrdiff_t Count>
Span<element_type, Count> last() const { Span<element_type, Count> last() const {
MBED_ASSERT((Count >= 0) && (Count <= _size)); MBED_ASSERT((0 <= Count) && (Count <= _size));
return Span<element_type, Count>(_data + (_size - Count), Count); return Span<element_type, Count>(_data + (_size - Count), Count);
} }
@ -512,7 +512,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
MBED_ASSERT(0 <= Offset && Offset <= _size); MBED_ASSERT(0 <= Offset && Offset <= _size);
MBED_ASSERT( MBED_ASSERT(
(Count == SPAN_DYNAMIC_EXTENT) || (Count == SPAN_DYNAMIC_EXTENT) ||
(Count >= 0 && Offset + Count <= _size) (0 <= Count && (Count + Offset) <= _size)
); );
return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? SPAN_DYNAMIC_EXTENT : Count>( return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? SPAN_DYNAMIC_EXTENT : Count>(
_data + Offset, _data + Offset,
@ -565,7 +565,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
MBED_ASSERT(0 <= offset && offset <= _size); MBED_ASSERT(0 <= offset && offset <= _size);
MBED_ASSERT( MBED_ASSERT(
(count == SPAN_DYNAMIC_EXTENT) || (count == SPAN_DYNAMIC_EXTENT) ||
(count >= 0 && (offset + count <= _size)) (0 <= count && (count + offset) <= _size)
); );
return Span<element_type, SPAN_DYNAMIC_EXTENT>( return Span<element_type, SPAN_DYNAMIC_EXTENT>(
_data + offset, _data + offset,