[libcxx-commits] [libcxx] [libc++][ranges] LWG4035: `single_view` should provide `empty` (PR #87366)

Hristo Hristov via libcxx-commits libcxx-commits at lists.llvm.org
Tue Apr 2 09:37:01 PDT 2024


https://github.com/H-G-Hristov updated https://github.com/llvm/llvm-project/pull/87366

>From b6ac47b8e03c8510dda1a69c325de71508e815ea Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Tue, 2 Apr 2024 19:27:29 +0300
Subject: [PATCH 1/2] [libc++][ranges] LWG4035: `single_view` should provide
 `empty`

Implements: https://wg21.link/LWG4035
---
 libcxx/include/__ranges/single_view.h         |  2 +
 .../range.single.view/empty.pass.cpp          | 49 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp

diff --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h
index f91c7c35263676..45244f34994d74 100644
--- a/libcxx/include/__ranges/single_view.h
+++ b/libcxx/include/__ranges/single_view.h
@@ -70,6 +70,8 @@ class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS single_view : public view_interface<s
 
   _LIBCPP_HIDE_FROM_ABI constexpr const _Tp* end() const noexcept { return data() + 1; }
 
+  _LIBCPP_HIDE_FROM_ABI static constexpr bool empty() noexcept { return false; }
+
   _LIBCPP_HIDE_FROM_ABI static constexpr size_t size() noexcept { return 1; }
 
   _LIBCPP_HIDE_FROM_ABI constexpr _Tp* data() noexcept { return __value_.operator->(); }
diff --git a/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp b/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp
new file mode 100644
index 00000000000000..fe73b5ef2b3409
--- /dev/null
+++ b/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp
@@ -0,0 +1,49 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++03, c++11, c++14, c++17
+
+// static constexpr bool empty() noexcept;
+
+#include <cassert>
+#include <concepts>
+#include <ranges>
+#include <utility>
+
+#include "test_macros.h"
+
+struct Empty {};
+struct BigType {
+  char buffer[64] = {10};
+};
+
+template <typename T>
+constexpr void test_empty(T value) {
+  using SingleView = std::ranges::single_view<T>;
+  SingleView sv{value};
+
+  assert(!SingleView::empty());
+  static_assert(noexcept(SingleView::empty()));
+  static_assert(noexcept(std::ranges::empty(sv)));
+  static_assert(noexcept(std::ranges::empty(std::as_const(sv))));
+}
+
+constexpr bool test() {
+  test_empty<int>(92);
+  test_empty<Empty>(Empty{});
+  test_empty<BigType>(BigType{});
+
+  return true;
+}
+
+int main(int, char**) {
+  test();
+  static_assert(test());
+
+  return 0;
+}

>From 513561ef0133f07c4068deeaa1690c5f5826eb9d Mon Sep 17 00:00:00 2001
From: Hristo Hristov <hghristov.rmm at gmail.com>
Date: Tue, 2 Apr 2024 19:36:44 +0300
Subject: [PATCH 2/2] Minor tweak

---
 .../ranges/range.factories/range.single.view/empty.pass.cpp    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp b/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp
index fe73b5ef2b3409..ea462e820ec43b 100644
--- a/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp
+++ b/libcxx/test/std/ranges/range.factories/range.single.view/empty.pass.cpp
@@ -27,7 +27,8 @@ constexpr void test_empty(T value) {
   using SingleView = std::ranges::single_view<T>;
   SingleView sv{value};
 
-  assert(!SingleView::empty());
+  std::same_as<bool> decltype(auto) result = SingleView::empty();
+  assert(result == false);
   static_assert(noexcept(SingleView::empty()));
   static_assert(noexcept(std::ranges::empty(sv)));
   static_assert(noexcept(std::ranges::empty(std::as_const(sv))));



More information about the libcxx-commits mailing list