diff --git a/libcxx/include/__iterator/concepts.h b/libcxx/include/__iterator/concepts.h --- a/libcxx/include/__iterator/concepts.h +++ b/libcxx/include/__iterator/concepts.h @@ -104,6 +104,14 @@ requires { typename _ITER_CONCEPT<_Ip>; } && derived_from<_ITER_CONCEPT<_Ip>, input_iterator_tag>; +// [iterator.concept.forward] +template +concept forward_iterator = + input_iterator<_Ip> && + derived_from<_ITER_CONCEPT<_Ip>, forward_iterator_tag> && + incrementable<_Ip> && + sentinel_for<_Ip, _Ip>; + // clang-format on #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h --- a/libcxx/include/__ranges/concepts.h +++ b/libcxx/include/__ranges/concepts.h @@ -55,6 +55,9 @@ template concept input_range = range<_Tp>&& input_iterator >; +template +concept forward_range = input_range<_Tp>&& forward_iterator >; + } // namespace ranges #endif // !defined(_LIBCPP_HAS_NO_RANGES) diff --git a/libcxx/include/iterator b/libcxx/include/iterator --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -72,6 +72,10 @@ template concept input_iterator = see below; // since C++20 +// [iterator.concept.forward], concept forward_­iterator +template + concept forward_iterator = see below; // since C++20 + template struct iterator diff --git a/libcxx/include/ranges b/libcxx/include/ranges --- a/libcxx/include/ranges +++ b/libcxx/include/ranges @@ -47,6 +47,9 @@ // [range.refinements], other range refinements template concept input_range = see below; + + template + concept forward_range = see below; } */ diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp @@ -0,0 +1,169 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// template +// concept forward_iterator; + +#include + +#include +#include +#include +#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "test_iterators.h" + +namespace standard_types { +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert( + std::forward_iterator::const_reverse_iterator>); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert(std::forward_iterator::const_reverse_iterator>); + +// +#ifndef _LIBCPP_HAS_NO_FILESYSTEM_LIBRARY +static_assert(!std::forward_iterator); +static_assert( + !std::forward_iterator); +#endif + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); + +// +static_assert( + !std::forward_iterator > >); +static_assert( + !std::forward_iterator > >); +static_assert(!std::forward_iterator > >); +static_assert( + !std::forward_iterator::iterator> >); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert(std::forward_iterator::const_reverse_iterator>); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert( + std::forward_iterator::const_reverse_iterator>); + +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert( + std::forward_iterator::const_reverse_iterator>); + +// +static_assert(!std::forward_iterator >); +static_assert(!std::forward_iterator >); +static_assert(!std::forward_iterator >); +static_assert(!std::forward_iterator >); + +// +static_assert(!std::forward_iterator >); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert(std::forward_iterator::const_reverse_iterator>); + +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert( + std::forward_iterator::const_reverse_iterator>); + +// +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); + +// +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); +static_assert(std::forward_iterator); + +// +static_assert(std::forward_iterator::iterator>); +static_assert( + std::forward_iterator::const_iterator>); + +static_assert( + std::forward_iterator::iterator>); +static_assert( + std::forward_iterator::const_iterator>); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); + +static_assert( + std::forward_iterator::iterator>); +static_assert( + std::forward_iterator::const_iterator>); + +// +static_assert(std::forward_iterator::iterator>); +static_assert(std::forward_iterator::const_iterator>); +static_assert(std::forward_iterator::reverse_iterator>); +static_assert(std::forward_iterator::const_reverse_iterator>); +static_assert(!std::forward_iterator >); +} // namespace standard_types + +static_assert(!std::forward_iterator); + +struct not_input_iterator { + using difference_type = std::ptrdiff_t; + using iterator_concept = std::forward_iterator_tag; + + int operator*() const; + + not_input_iterator& operator++(); + not_input_iterator operator++(int); +}; +static_assert(std::input_or_output_iterator && + !std::input_iterator && + !std::forward_iterator); diff --git a/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp copy from libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp copy to libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp --- a/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp +++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/subsumption.compile.pass.cpp @@ -11,29 +11,24 @@ // UNSUPPORTED: gcc-10 // template -// concept input_iterator; - -#include +// concept forward_iterator; #include -struct range { - int* begin(); - int* end(); -}; +#include // clang-format off -template -requires std::input_iterator > -[[nodiscard]] constexpr bool check_input_range_subsumption() { +template +requires std::derived_from, std::forward_iterator_tag> +[[nodiscard]] constexpr bool check_subsumption() { return false; } -template +template requires true -[[nodiscard]] constexpr bool check_input_range_subsumption() { +[[nodiscard]] constexpr bool check_subsumption() { return true; } // clang-format on -static_assert(check_input_range_subsumption()); +static_assert(check_subsumption()); diff --git a/libcxx/test/std/ranges/range.refinements/forward_range.compile.pass.cpp b/libcxx/test/std/ranges/range.refinements/forward_range.compile.pass.cpp new file mode 100644 --- /dev/null +++ b/libcxx/test/std/ranges/range.refinements/forward_range.compile.pass.cpp @@ -0,0 +1,67 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: libcpp-no-concepts +// UNSUPPORTED: gcc-10 + +// template +// concept forward_range; + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "test_range.h" + +namespace stdr = std::ranges; + +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range); +static_assert(stdr::forward_range); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); + +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range >); +static_assert(stdr::forward_range >); +static_assert( + stdr::forward_range > >); +static_assert( + stdr::forward_range > >); +static_assert( + stdr::forward_range > >); +static_assert(stdr::forward_range > >); +static_assert(stdr::forward_range > >); diff --git a/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp b/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp --- a/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp +++ b/libcxx/test/std/ranges/range.refinements/subsumption.compile.pass.cpp @@ -37,3 +37,19 @@ // clang-format on static_assert(check_input_range_subsumption()); + +// clang-format off +template +requires std::forward_iterator > +[[nodiscard]] constexpr bool check_forward_range_subsumption() { + return false; +} + +template +requires true +[[nodiscard]] constexpr bool check_forward_range_subsumption() { + return true; +} +// clang-format on + +static_assert(check_forward_range_subsumption()); diff --git a/libcxx/test/support/test_range.h b/libcxx/test/support/test_range.h --- a/libcxx/test/support/test_range.h +++ b/libcxx/test/support/test_range.h @@ -35,4 +35,12 @@ sentinel end() const; }; +template +struct forward_range { + forward_iterator > begin(); + forward_iterator > begin() const; + sentinel end(); + sentinel end() const; +}; + #endif // LIBCXX_TEST_SUPPORT_TEST_RANGE_H