Skip to content

Commit 26b546b

Browse files
committed
Span: Improve readability of precondition checks
1 parent 938d802 commit 26b546b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

platform/Span.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ struct Span {
206206
template<ptrdiff_t Count>
207207
Span<element_type, Count> first() const {
208208
MBED_STATIC_ASSERT(
209-
(Count >= 0) && (Count <= Extent),
209+
(0 <= Count) && (Count <= Extent),
210210
"Invalid subspan extent"
211211
);
212212
return Span<element_type, Count>(_data, Count);
@@ -224,7 +224,7 @@ struct Span {
224224
template<ptrdiff_t Count>
225225
Span<element_type, Count> last() const {
226226
MBED_STATIC_ASSERT(
227-
(Count >= 0) && (Count <= Extent),
227+
(0 <= Count) && (Count <= Extent),
228228
"Invalid subspan extent"
229229
);
230230
return Span<element_type, Count>(_data + (Extent - Count), Count);
@@ -246,12 +246,12 @@ struct Span {
246246
Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count>
247247
subspan() const {
248248
MBED_STATIC_ASSERT(
249-
Offset == 0 || (Offset > 0 && Offset < Extent),
249+
0 <= Offset && Offset <= Extent,
250250
"Invalid subspan offset"
251251
);
252252
MBED_STATIC_ASSERT(
253253
(Count == SPAN_DYNAMIC_EXTENT) ||
254-
(Count >= 0 && Offset + Count <= Extent),
254+
(0 <= Count && (Count + Offset) <= Extent),
255255
"Invalid subspan count"
256256
);
257257
return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? Extent - Offset : Count>(
@@ -305,7 +305,7 @@ struct Span {
305305
MBED_ASSERT(0 <= offset && offset <= Extent);
306306
MBED_ASSERT(
307307
(count == SPAN_DYNAMIC_EXTENT) ||
308-
(count >= 0 && (offset + count <= Extent))
308+
(0 <= count && (count + offset) <= Extent)
309309
);
310310
return Span<element_type, SPAN_DYNAMIC_EXTENT>(
311311
_data + offset,
@@ -490,7 +490,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
490490
*/
491491
template<ptrdiff_t Count>
492492
Span<element_type, Count> last() const {
493-
MBED_ASSERT((Count >= 0) && (Count <= _size));
493+
MBED_ASSERT((0 <= Count) && (Count <= _size));
494494
return Span<element_type, Count>(_data + (_size - Count), Count);
495495
}
496496

@@ -512,7 +512,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
512512
MBED_ASSERT(0 <= Offset && Offset <= _size);
513513
MBED_ASSERT(
514514
(Count == SPAN_DYNAMIC_EXTENT) ||
515-
(Count >= 0 && Offset + Count <= _size)
515+
(0 <= Count && (Count + Offset) <= _size)
516516
);
517517
return Span<element_type, Count == SPAN_DYNAMIC_EXTENT ? SPAN_DYNAMIC_EXTENT : Count>(
518518
_data + Offset,
@@ -565,7 +565,7 @@ struct Span<ElementType, SPAN_DYNAMIC_EXTENT> {
565565
MBED_ASSERT(0 <= offset && offset <= _size);
566566
MBED_ASSERT(
567567
(count == SPAN_DYNAMIC_EXTENT) ||
568-
(count >= 0 && (offset + count <= _size))
568+
(0 <= count && (count + offset) <= _size)
569569
);
570570
return Span<element_type, SPAN_DYNAMIC_EXTENT>(
571571
_data + offset,

0 commit comments

Comments
 (0)