[libcxx] r332811 - Implement deduction guides for forward_list
Marshall Clow via cfe-commits
cfe-commits at lists.llvm.org
Sat May 19 09:02:06 PDT 2018
Author: marshall
Date: Sat May 19 09:02:05 2018
New Revision: 332811
URL: http://llvm.org/viewvc/llvm-project?rev=332811&view=rev
Log:
Implement deduction guides for forward_list
Added:
libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp
libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp
Modified:
libcxx/trunk/include/forward_list
Modified: libcxx/trunk/include/forward_list
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/forward_list?rev=332811&r1=332810&r2=332811&view=diff
==============================================================================
--- libcxx/trunk/include/forward_list (original)
+++ libcxx/trunk/include/forward_list Sat May 19 09:02:05 2018
@@ -134,6 +134,11 @@ public:
void reverse() noexcept;
};
+
+template <class InputIterator, class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+ forward_list(InputIterator, InputIterator, Allocator = Allocator())
+ -> forward_list<typename iterator_traits<InputIterator>::value_type, Allocator>; // C++17
+
template <class T, class Allocator>
bool operator==(const forward_list<T, Allocator>& x,
const forward_list<T, Allocator>& y);
@@ -845,6 +850,23 @@ private:
__sort(__node_pointer __f, difference_type __sz, _Compare& __comp);
};
+
+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _InputIterator,
+ class _Alloc = typename std::allocator<typename iterator_traits<_InputIterator>::value_type>,
+ class = typename enable_if<__is_allocator<_Alloc>::value, void>::type
+ >
+forward_list(_InputIterator, _InputIterator)
+ -> forward_list<typename iterator_traits<_InputIterator>::value_type, _Alloc>;
+
+template<class _InputIterator,
+ class _Alloc,
+ class = typename enable_if<__is_allocator<_Alloc>::value, void>::type
+ >
+forward_list(_InputIterator, _InputIterator, _Alloc)
+ -> forward_list<typename iterator_traits<_InputIterator>::value_type, _Alloc>;
+#endif
+
template <class _Tp, class _Alloc>
inline
forward_list<_Tp, _Alloc>::forward_list(const allocator_type& __a)
Added: libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp?rev=332811&view=auto
==============================================================================
--- libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp (added)
+++ libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp Sat May 19 09:02:05 2018
@@ -0,0 +1,42 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <forward_list>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: libcpp-no-deduction-guides
+
+
+// template <class InputIterator, class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+// forward_list(InputIterator, InputIterator, Allocator = Allocator())
+// -> forward_list<typename iterator_traits<InputIterator>::value_type, Allocator>;
+//
+
+
+#include <forward_list>
+#include <iterator>
+#include <cassert>
+#include <cstddef>
+#include <climits> // INT_MAX
+
+struct A {};
+
+int main()
+{
+// Test the explicit deduction guides
+
+// Test the implicit deduction guides
+ {
+// forward_list (allocator &)
+ std::forward_list fwl((std::allocator<int>())); // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'forward_list'}}
+// Note: The extra parens are necessary, since otherwise clang decides it is a function declaration.
+// Also, we can't use {} instead of parens, because that constructs a
+// forward_list<allocator<int>, allocator<allocator<int>>>
+ }
+
+}
Added: libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp?rev=332811&view=auto
==============================================================================
--- libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp (added)
+++ libcxx/trunk/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.pass.cpp Sat May 19 09:02:05 2018
@@ -0,0 +1,103 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// <forward_list>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: libcpp-no-deduction-guides
+
+
+// template <class InputIterator, class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+// deque(InputIterator, InputIterator, Allocator = Allocator())
+// -> deque<typename iterator_traits<InputIterator>::value_type, Allocator>;
+//
+
+
+#include <forward_list>
+#include <iterator>
+#include <cassert>
+#include <cstddef>
+#include <climits> // INT_MAX
+
+#include "test_macros.h"
+#include "test_iterators.h"
+#include "test_allocator.h"
+
+struct A {};
+
+int main()
+{
+
+// Test the explicit deduction guides
+ {
+ const int arr[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+ std::forward_list fwl(std::begin(arr), std::end(arr));
+
+ static_assert(std::is_same_v<decltype(fwl), std::forward_list<int>>, "");
+ assert(std::equal(fwl.begin(), fwl.end(), std::begin(arr), std::end(arr)));
+ }
+
+ {
+ const long arr[] = {INT_MAX, 1L, 2L, 3L };
+ std::forward_list fwl(std::begin(arr), std::end(arr), std::allocator<long>());
+ static_assert(std::is_same_v<decltype(fwl)::value_type, long>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 4); // no size for forward_list
+ auto it = fwl.begin();
+ assert(*it++ == INT_MAX);
+ assert(*it++ == 1L);
+ assert(*it++ == 2L);
+ }
+
+// Test the implicit deduction guides
+
+ {
+// We don't expect this one to work.
+// std::forward_list fwl(std::allocator<int>()); // deque (allocator &)
+ }
+
+ {
+ std::forward_list fwl(1, A{}); // deque (size_type, T)
+ static_assert(std::is_same_v<decltype(fwl)::value_type, A>, "");
+ static_assert(std::is_same_v<decltype(fwl)::allocator_type, std::allocator<A>>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 1); // no size for forward_list
+ }
+
+ {
+ std::forward_list fwl(1, A{}, test_allocator<A>()); // deque (size_type, T, allocator)
+ static_assert(std::is_same_v<decltype(fwl)::value_type, A>, "");
+ static_assert(std::is_same_v<decltype(fwl)::allocator_type, test_allocator<A>>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 1); // no size for forward_list
+ }
+
+ {
+ std::forward_list fwl{1U, 2U, 3U, 4U, 5U}; // deque(initializer-list)
+ static_assert(std::is_same_v<decltype(fwl)::value_type, unsigned>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 5); // no size for forward_list
+ auto it = fwl.begin();
+ std::advance(it, 2);
+ assert(*it == 3U);
+ }
+
+ {
+ std::forward_list fwl({1.0, 2.0, 3.0, 4.0}, test_allocator<double>()); // deque(initializer-list, allocator)
+ static_assert(std::is_same_v<decltype(fwl)::value_type, double>, "");
+ static_assert(std::is_same_v<decltype(fwl)::allocator_type, test_allocator<double>>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 4); // no size for forward_list
+ auto it = fwl.begin();
+ std::advance(it, 3);
+ assert(*it == 4.0);
+ }
+
+ {
+ std::forward_list<long double> source;
+ std::forward_list fwl(source); // deque(deque &)
+ static_assert(std::is_same_v<decltype(fwl)::value_type, long double>, "");
+ static_assert(std::is_same_v<decltype(fwl)::allocator_type, std::allocator<long double>>, "");
+ assert(std::distance(fwl.begin(), fwl.end()) == 0); // no size for forward_list
+ }
+}
More information about the cfe-commits
mailing list