On Mon, Jul 21, 2025 at 3:38 PM Luc Grosheintz <luc.groshei...@gmail.com>
wrote:
> A recent commit improved the macro VERIFY to eliminate the need for
> certain parens. This commit updates the test code in
>
> 23_containers/mdspan
>
> libstdc++-v3/ChangeLog:
>
> * testsuite/23_containers/mdspan/extents/ctor_ints.cc: Remove
> superfluous parens.
> * testsuite/23_containers/mdspan/extents/ctor_shape.cc: Ditto.
> * testsuite/23_containers/mdspan/mdspan.cc: Ditto.
>
> Signed-off-by: Luc Grosheintz <luc.groshei...@gmail.com>
> ---
>
LGTM. I will push that to trunk, as these are test-only changes.
> .../23_containers/mdspan/extents/ctor_ints.cc | 20 ++++++++--------
> .../mdspan/extents/ctor_shape.cc | 10 ++++----
> .../testsuite/23_containers/mdspan/mdspan.cc | 24 +++++++++----------
> 3 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git
> a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
> b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
> index 3a70efd85d0..d5f07c106aa 100644
> --- a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
> +++ b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
> @@ -35,20 +35,20 @@ test_all()
> auto expected = std::extents<int, 1, 2, 3>(1, 2, 3);
>
> // From all extents.
> - VERIFY((std::extents<int, 1, 2, 3>(1, 2, 3)) == expected);
> - VERIFY((std::extents<int, dyn, 2, 3>(1, 2, 3)) == expected);
> - VERIFY((std::extents<int, dyn, 2, dyn>(1, 2, 3)) == expected);
> + VERIFY(std::extents<int, 1, 2, 3>(1, 2, 3) == expected);
> + VERIFY(std::extents<int, dyn, 2, 3>(1, 2, 3) == expected);
> + VERIFY(std::extents<int, dyn, 2, dyn>(1, 2, 3) == expected);
>
> - VERIFY((std::extents<int, 1, 2, 3>{1, 2, 3}) == expected);
> - VERIFY((std::extents<int, dyn, 2, 3>{1, 2, 3}) == expected);
> - VERIFY((std::extents<int, dyn, 2, dyn>{1, 2, 3}) == expected);
> + VERIFY(std::extents<int, 1, 2, 3>{1, 2, 3} == expected);
> + VERIFY(std::extents<int, dyn, 2, 3>{1, 2, 3} == expected);
> + VERIFY(std::extents<int, dyn, 2, dyn>{1, 2, 3} == expected);
>
> // From only dynamic extents.
> - VERIFY((std::extents<int, dyn, 2, 3>(1)) == expected);
> - VERIFY((std::extents<int, dyn, 2, dyn>(1, 3)) == expected);
> + VERIFY(std::extents<int, dyn, 2, 3>(1) == expected);
> + VERIFY(std::extents<int, dyn, 2, dyn>(1, 3) == expected);
>
> - VERIFY((std::extents<int, dyn, 2, 3>{1}) == expected);
> - VERIFY((std::extents<int, dyn, 2, dyn>{1, 3}) == expected);
> + VERIFY(std::extents<int, dyn, 2, 3>{1} == expected);
> + VERIFY(std::extents<int, dyn, 2, dyn>{1, 3} == expected);
>
> return true;
> }
> diff --git
> a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
> b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
> index 01624f27482..1682cc5a0ab 100644
> --- a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
> +++ b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
> @@ -66,9 +66,9 @@ namespace all_extents
> test_ctor(Shape shape)
> {
> auto expected = std::extents<int, 1, 2, 3>();
> - VERIFY((std::extents<int, 1, dyn, 3>(shape)) == expected);
> - VERIFY((std::extents<int, dyn, dyn, dyn>(shape)) == expected);
> - VERIFY((std::extents<int, 1, 2, 3>(shape)) == expected);
> + VERIFY(std::extents<int, 1, dyn, 3>(shape) == expected);
> + VERIFY(std::extents<int, dyn, dyn, dyn>(shape) == expected);
> + VERIFY(std::extents<int, 1, 2, 3>(shape) == expected);
> }
>
> constexpr void
> @@ -90,8 +90,8 @@ namespace all_extents
> auto span = std::span<int, 0>(shape);
>
> auto expected = std::extents<int>();
> - VERIFY((std::extents<int>(shape)) == expected);
> - VERIFY((std::extents<int>(span)) == expected);
> + VERIFY(std::extents<int>(shape) == expected);
> + VERIFY(std::extents<int>(span) == expected);
> }
>
> constexpr bool
> diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
> b/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
> index be4a1b1c17e..cab9b46179b 100644
> --- a/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
> +++ b/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
> @@ -206,9 +206,9 @@ test_from_pointer_and_shape()
> assert_deduced_typedefs<double, std::dextents<size_t, 2>>(md);
> VERIFY(md.rank() == 2);
> VERIFY(md.rank_dynamic() == 2);
> - VERIFY((md[0, 0]) == data[0]);
> - VERIFY((md[0, 1]) == data[1]);
> - VERIFY((md[1, 0]) == data[3]);
> + VERIFY(md[0, 0] == data[0]);
> + VERIFY(md[0, 1] == data[1]);
> + VERIFY(md[1, 0] == data[3]);
> };
>
> verify(std::mdspan(data.data(), shape[0], shape[1]));
> @@ -428,10 +428,10 @@ test_from_opaque_accessor()
> using MDSpan = decltype(md);
> static_assert(std::same_as<MDSpan::accessor_type, decltype(a)>);
>
> - VERIFY((md[0, 0, 0]) == 0.0);
> + VERIFY(md[0, 0, 0] == 0.0);
> VERIFY(md.accessor().access_count == 1);
>
> - VERIFY((md[2, 4, 6]) == 0.0);
> + VERIFY(md[2, 4, 6] == 0.0);
> VERIFY(md.accessor().access_count == 2);
> }
>
> @@ -480,8 +480,8 @@ test_from_base_class_accessor()
> using MDSpan = decltype(md);
> static_assert(std::same_as<MDSpan::accessor_type, decltype(a)>);
> static_assert(std::same_as<decltype(md[0, 0, 0]), Base&>);
> - VERIFY((md[0, 0, 0].value) == 1.0);
> - VERIFY((md[2, 4, 6].value) == 1.0);
> + VERIFY(md[0, 0, 0].value == 1.0);
> + VERIFY(md[2, 4, 6].value == 1.0);
> }
>
> constexpr bool
> @@ -490,8 +490,8 @@ test_from_mapping_like()
> double data = 1.1;
> auto m = LayoutLike::mapping<std::extents<int, 1, 2, 3>>{};
> auto md = std::mdspan(&data, m);
> - VERIFY((md[0, 0, 0]) == data);
> - VERIFY((md[0, 1, 2]) == data);
> + VERIFY(md[0, 0, 0] == data);
> + VERIFY(md[0, 1, 2] == data);
> return true;
> }
>
> @@ -535,13 +535,13 @@ template<typename Int, bool ValidForPacks, bool
> ValidForArrays>
> {
> storage[mapping(i, j, k)] = 1.0;
> if constexpr (ValidForPacks)
> - VERIFY((md[Int(i), Int(j), Int(k)]) == 1.0);
> + VERIFY(md[Int(i), Int(j), Int(k)] == 1.0);
>
> if constexpr (ValidForArrays)
> {
> std::array<Int, 3> ijk{Int(i), Int(j), Int(k)};
> - VERIFY((md[ijk]) == 1.0);
> - VERIFY((md[std::span(ijk)]) == 1.0);
> + VERIFY(md[ijk] == 1.0);
> + VERIFY(md[std::span(ijk)] == 1.0);
> }
> storage[mapping(i, j, k)] = 0.0;
> }
> --
> 2.50.0
>
>
