P2321R2: Added std::views::zip.

stl/inc/yvals_core.h

@@ -319,13 +319,15 @@
 // P1989R2 Range Constructor For string_view
 // P2077R3 Heterogeneous Erasure Overloads For Associative Containers
 // P2136R3 invoke_r()
+// P2165R4 Compatibility Between tuple, pair, And tuple-like Objects
+//     (changes to views::zip only)
 // P2166R1 Prohibiting basic_string And basic_string_view Construction From nullptr
 // P2186R2 Removing Garbage Collection Support
 // P2273R3 constexpr unique_ptr
 // P2291R3 constexpr Integral <charconv>
 // P2302R4 ranges::contains, ranges::contains_subrange
 // P2321R2 zip
-//     (changes to pair, tuple, and vector<bool>::reference only)
+//     (missing views::zip_transform, views::adjacent, and views::adjacent_transform)
 // P2387R3 Pipe Support For User-Defined Range Adaptors
 // P2417R2 More constexpr bitset
 // P2438R2 string::substr() &&

tests/libcxx/expected_results.txt

@@ -43,6 +43,9 @@ std/containers/unord/unord.set/insert_and_emplace_allocator_requirements.pass.cp
 # Bogus test believes that copyability of array<T, 0> must be the same as array<T, 1>
 std/containers/sequences/array/array.cons/implicit_copy.pass.cpp FAIL
 
+# Bogus test returns a non-const int& using a const iterator's member variable
+std/ranges/range.adaptors/range.zip/end.pass.cpp FAIL
+
 # libc++ doesn't implement LWG-3648: "format should not print bool with 'c'"
 std/utilities/format/format.functions/vformat_to.locale.pass.cpp FAIL
 std/utilities/format/format.functions/vformat_to.pass.cpp FAIL
@@ -55,6 +58,21 @@ std/strings/basic.string/string.nonmembers/string_op+/allocator_propagation.pass
 # libc++ hasn't updated move_iterator for P2520R0
 std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp FAIL
 
+# libc++ doesn't implement LWG-3692: "zip_view::iterator's operator<=> is overconstrained"
+std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp FAIL
+
+# libc++ is incorrect on the constraints for constructors of zip_view::iterator and zip_view::sentinel
+std/ranges/range.adaptors/range.zip/begin.pass.cpp SKIPPED
+std/ranges/range.adaptors/range.zip/sentinel/ctor.default.pass.cpp SKIPPED
+
+# libc++ has not implemented P2165R4: "Compatibility between tuple, pair, and tuple-like objects"
+# for zip_view
+std/ranges/range.adaptors/range.zip/cpo.pass.cpp FAIL
+std/ranges/range.adaptors/range.zip/ctor.default.pass.cpp FAIL
+std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp FAIL
+std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp FAIL
+std/ranges/range.adaptors/range.zip/iterator/subscript.pass.cpp FAIL
+
 
 # *** INTERACTIONS WITH CONTEST / C1XX THAT UPSTREAM LIKELY WON'T FIX ***
 # Tracked by VSO-593630 "<filesystem> Enable libcxx filesystem tests"
@@ -192,32 +210,6 @@ std/utilities/tuple/tuple.tuple/tuple.cnstr/recursion_depth.pass.cpp SKIPPED
 # P2321R2 zip
 std/language.support/support.limits/support.limits.general/tuple.version.compile.pass.cpp FAIL
 std/language.support/support.limits/support.limits.general/utility.version.compile.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/begin.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/borrowing.compile.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/cpo.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/ctad.compile.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/ctor.default.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/end.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/general.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/decrement.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/increment.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/iter_move.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/iter_swap.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/iterator/subscript.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/range.concept.compile.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/sentinel/ctor.default.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp FAIL
-std/ranges/range.adaptors/range.zip/size.pass.cpp FAIL
 
 # P2255R2 "Type Traits To Detect References Binding To Temporaries"
 std/language.support/support.limits/support.limits.general/type_traits.version.compile.pass.cpp FAIL

tests/libcxx/skipped_tests.txt

@@ -43,6 +43,9 @@ containers\unord\unord.set\insert_and_emplace_allocator_requirements.pass.cpp
 # Bogus test believes that copyability of array<T, 0> must be the same as array<T, 1>
 containers\sequences\array\array.cons\implicit_copy.pass.cpp
 
+# Bogus test returns a non-const int& using a const iterator's member variable
+ranges\range.adaptors\range.zip\end.pass.cpp
+
 # libc++ doesn't implement LWG-3648: "format should not print bool with 'c'"
 utilities\format\format.functions\vformat_to.locale.pass.cpp
 utilities\format\format.functions\vformat_to.pass.cpp
@@ -55,6 +58,21 @@ strings\basic.string\string.nonmembers\string_op+\allocator_propagation.pass.cpp
 # libc++ hasn't updated move_iterator for P2520R0
 iterators\predef.iterators\move.iterators\move.iterator\types.pass.cpp
 
+# libc++ doesn't implement LWG-3692: "zip_view::iterator's operator<=> is overconstrained"
+ranges\range.adaptors\range.zip\iterator\compare.pass.cpp
+
+# libc++ is incorrect on the constraints for constructors of zip_view::iterator and zip_view::sentinel
+ranges\range.adaptors\range.zip\begin.pass.cpp
+ranges\range.adaptors\range.zip\sentinel\ctor.default.pass.cpp
+
+# libc++ has not implemented P2165R4: "Compatibility between tuple, pair, and tuple-like objects"
+# for zip_view
+ranges\range.adaptors\range.zip\cpo.pass.cpp
+ranges\range.adaptors\range.zip\ctor.default.pass.cpp
+ranges\range.adaptors\range.zip\iterator\deref.pass.cpp
+ranges\range.adaptors\range.zip\iterator\member_types.compile.pass.cpp
+ranges\range.adaptors\range.zip\iterator\subscript.pass.cpp
+
 
 # *** INTERACTIONS WITH CONTEST / C1XX THAT UPSTREAM LIKELY WON'T FIX ***
 # Tracked by VSO-593630 "<filesystem> Enable libcxx filesystem tests"
@@ -192,32 +210,6 @@ utilities\tuple\tuple.tuple\tuple.cnstr\recursion_depth.pass.cpp
 # P2321R2 zip
 language.support\support.limits\support.limits.general\tuple.version.compile.pass.cpp
 language.support\support.limits\support.limits.general\utility.version.compile.pass.cpp
-ranges\range.adaptors\range.zip\begin.pass.cpp
-ranges\range.adaptors\range.zip\borrowing.compile.pass.cpp
-ranges\range.adaptors\range.zip\cpo.pass.cpp
-ranges\range.adaptors\range.zip\ctad.compile.pass.cpp
-ranges\range.adaptors\range.zip\ctor.default.pass.cpp
-ranges\range.adaptors\range.zip\ctor.views.pass.cpp
-ranges\range.adaptors\range.zip\end.pass.cpp
-ranges\range.adaptors\range.zip\general.pass.cpp
-ranges\range.adaptors\range.zip\iterator\arithmetic.pass.cpp
-ranges\range.adaptors\range.zip\iterator\compare.pass.cpp
-ranges\range.adaptors\range.zip\iterator\ctor.default.pass.cpp
-ranges\range.adaptors\range.zip\iterator\ctor.other.pass.cpp
-ranges\range.adaptors\range.zip\iterator\decrement.pass.cpp
-ranges\range.adaptors\range.zip\iterator\deref.pass.cpp
-ranges\range.adaptors\range.zip\iterator\increment.pass.cpp
-ranges\range.adaptors\range.zip\iterator\iter_move.pass.cpp
-ranges\range.adaptors\range.zip\iterator\iter_swap.pass.cpp
-ranges\range.adaptors\range.zip\iterator\member_types.compile.pass.cpp
-ranges\range.adaptors\range.zip\iterator\singular.pass.cpp
-ranges\range.adaptors\range.zip\iterator\subscript.pass.cpp
-ranges\range.adaptors\range.zip\range.concept.compile.pass.cpp
-ranges\range.adaptors\range.zip\sentinel\ctor.default.pass.cpp
-ranges\range.adaptors\range.zip\sentinel\ctor.other.pass.cpp
-ranges\range.adaptors\range.zip\sentinel\eq.pass.cpp
-ranges\range.adaptors\range.zip\sentinel\minus.pass.cpp
-ranges\range.adaptors\range.zip\size.pass.cpp
 
 # P2255R2 "Type Traits To Detect References Binding To Temporaries"
 language.support\support.limits\support.limits.general\type_traits.version.compile.pass.cpp

tests/std/test.lst

@@ -548,6 +548,7 @@ tests\P2273R3_constexpr_unique_ptr
 tests\P2302R4_ranges_alg_contains
 tests\P2302R4_ranges_alg_contains_subrange
 tests\P2321R2_proxy_reference
+tests\P2321R2_views_zip
 tests\P2387R3_bind_back
 tests\P2387R3_pipe_support_for_user_defined_range_adaptors
 tests\P2401R0_conditional_noexcept_for_exchange

tests/std/tests/P2321R2_views_zip/env.lst

@@ -0,0 +1,13 @@
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# NOTE: zip_view::_Iterator defines ADL overloads for iter_swap and iter_move,
+# so the test fails to compile unless /permissive- is set. This issue isn't
+# unique to zip_view; all view types whose iterators define overloads for these
+# functions have this requirement.
+RUNALL_INCLUDE ..\strict_concepts_latest_matrix.lst
+RUNALL_CROSSLIST
+PM_CL="/DTEST_INPUT"
+PM_CL="/DTEST_FORWARD"
+PM_CL="/DTEST_BIDIRECTIONAL"
+PM_CL="/DTEST_RANDOM"