Implement deduction guide for basic_string as described in P0433

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@324569 91177308-0d34-0410-b5e6-96231b3b80d8
2018-02-08 06:34:03 +00:00
parent 60020e6384
commit 5b1e87e52d
4 changed files with 132 additions and 2 deletions
--- a/include/string
+++ b/include/string
@@ -311,6 +311,13 @@ public:
    bool __invariants() const;
 };

+template<class InputIterator,
+         class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+basic_string(InputIterator, InputIterator, Allocator = Allocator())
+   -> basic_string<typename iterator_traits<InputIterator>::value_type,
+                  char_traits<typename iterator_traits<InputIterator>::value_type>,
+                  Allocator>;   // C++17
+
 template<class charT, class traits, class Allocator>
 basic_string<charT, traits, Allocator>
 operator+(const basic_string<charT, traits, Allocator>& lhs,
@@ -1485,6 +1492,18 @@ private:
    friend basic_string operator+<>(const basic_string&, value_type);
 };

+#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES
+template<class _InputIterator,
+         class _CharT = typename iterator_traits<_InputIterator>::value_type,
+         class _Allocator = allocator<_CharT>,
+         class = typename enable_if<__is_input_iterator<_InputIterator>::value, void>::type,
+         class = typename enable_if<__is_allocator<_Allocator>::value, void>::type
+         >
+basic_string(_InputIterator, _InputIterator, _Allocator = _Allocator())
+  -> basic_string<_CharT, char_traits<_CharT>, _Allocator>;
+#endif
+
+                  
 template <class _CharT, class _Traits, class _Allocator>
 inline _LIBCPP_INLINE_VISIBILITY
 void
--- a/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp
+++ b/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp
@@ -0,0 +1,54 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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.
+//
+//===----------------------------------------------------------------------===//
+
+// <string>
+// UNSUPPORTED: c++98, c++03, c++11, c++14
+
+// template<class InputIterator,
+//      class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+//  basic_string(InputIterator, InputIterator, Allocator = Allocator())
+//    -> basic_string<typename iterator_traits<InputIterator>::value_type,
+//                 char_traits<typename iterator_traits<InputIterator>::value_type>,
+//                 Allocator>;
+//
+//  The deduction guide shall not participate in overload resolution if InputIterator
+//  is a type that does not qualify as an input iterator, or if Allocator is a type
+//  that does not qualify as an allocator.
+
+
+#include <string>
+#include <iterator>
+#include <cassert>
+#include <cstddef>
+
+#include "test_macros.h"
+
+class NotAnItertor {};
+
+template <typename T>
+struct NotAnAllocator { typedef T value_type; };
+
+int main()
+{
+    { // Not an iterator at all
+    std::basic_string s1{NotAnItertor{}, NotAnItertor{}, std::allocator<char>{}}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
+    }
+    { // Not an input iterator
+    const char16_t* s = u"12345678901234";
+    std::basic_string<char16_t> s0;
+    std::basic_string s1{std::back_insert_iterator(s0), //  expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
+                         std::back_insert_iterator(s0),
+                         std::allocator<char16_t>{}};
+    }
+    { // Not an allocator
+    const wchar_t* s = L"12345678901234";
+    std::basic_string s1{s, s+10, NotAnAllocator<wchar_t>{}}; // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'basic_string'}}
+    }
+
+}
--- a/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
+++ b/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp
@@ -13,6 +13,18 @@
 //   basic_string(InputIterator begin, InputIterator end,
 //   const Allocator& a = Allocator());

+// template<class InputIterator,
+//      class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>>
+//  basic_string(InputIterator, InputIterator, Allocator = Allocator())
+//    -> basic_string<typename iterator_traits<InputIterator>::value_type,
+//                 char_traits<typename iterator_traits<InputIterator>::value_type>,
+//                 Allocator>;
+//
+//	The deduction guide shall not participate in overload resolution if InputIterator
+//  is a type that does not qualify as an input iterator, or if Allocator is a type
+//  that does not qualify as an allocator.
+
+
 #include <string>
 #include <iterator>
 #include <cassert>
@@ -116,4 +128,48 @@ int main()
    test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A());
    }
 #endif
+
+//  Test deduction guides
+#if TEST_STD_VER > 14
+    {
+    const char* s = "12345678901234";
+    std::basic_string s1{s, s+10, std::allocator<char>{}};
+    using S = decltype(s1); // what type did we get?
+    static_assert(std::is_same_v<S::value_type,                      char>,  "");
+    static_assert(std::is_same_v<S::traits_type,    std::char_traits<char>>, "");
+    static_assert(std::is_same_v<S::allocator_type,   std::allocator<char>>, "");
+    assert(s1.size() == 10);
+    assert(s1.compare(0, s1.size(), s, s1.size()) == 0);
+    }
+    {
+    const wchar_t* s = L"12345678901234";
+    std::basic_string s1{s, s+10, test_allocator<wchar_t>{}};
+    using S = decltype(s1); // what type did we get?
+    static_assert(std::is_same_v<S::value_type,                      wchar_t>,  "");
+    static_assert(std::is_same_v<S::traits_type,    std::char_traits<wchar_t>>, "");
+    static_assert(std::is_same_v<S::allocator_type,   test_allocator<wchar_t>>, "");
+    assert(s1.size() == 10);
+    assert(s1.compare(0, s1.size(), s, s1.size()) == 0);
+    }
+    {
+    const char16_t* s = u"12345678901234";
+    std::basic_string s1{s, s+10, min_allocator<char16_t>{}};
+    using S = decltype(s1); // what type did we get?
+    static_assert(std::is_same_v<S::value_type,                      char16_t>,  "");
+    static_assert(std::is_same_v<S::traits_type,    std::char_traits<char16_t>>, "");
+    static_assert(std::is_same_v<S::allocator_type,    min_allocator<char16_t>>, "");
+    assert(s1.size() == 10);
+    assert(s1.compare(0, s1.size(), s, s1.size()) == 0);
+    }
+    {
+    const char32_t* s = U"12345678901234";
+    std::basic_string s1{s, s+10, explicit_allocator<char32_t>{}};
+    using S = decltype(s1); // what type did we get?
+    static_assert(std::is_same_v<S::value_type,                        char32_t>,  "");
+    static_assert(std::is_same_v<S::traits_type,      std::char_traits<char32_t>>, "");
+    static_assert(std::is_same_v<S::allocator_type, explicit_allocator<char32_t>>, "");
+    assert(s1.size() == 10);
+    assert(s1.compare(0, s1.size(), s, s1.size()) == 0);
+    }
+#endif
 }
--- a/www/cxx1z_status.html
+++ b/www/cxx1z_status.html
@@ -150,7 +150,7 @@
 	<tr><td><a href="https://wg21.link/P0298R3">P0298R3</a></td><td>CWG</td><td>A byte type definition</td><td>Kona</td><td>Complete</td><td>5.0</td></tr>
 	<tr><td><a href="https://wg21.link/P0317R1">P0317R1</a></td><td>LWG</td><td>Directory Entry Caching for Filesystem</td><td>Kona</td><td></td><td></td></tr>
 	<tr><td><a href="https://wg21.link/P0430R2">P0430R2</a></td><td>LWG</td><td>File system library on non-POSIX-like operating systems</td><td>Kona</td><td></td><td></td></tr>
-	<tr><td><a href="https://wg21.link/P0433R2">P0433R2</a></td><td>LWG</td><td>Toward a resolution of US7 and US14: Integrating template deduction for class templates into the standard library</td><td>Kona</td><td></td><td></td></tr>
+	<tr><td><a href="https://wg21.link/P0433R2">P0433R2</a></td><td>LWG</td><td>Toward a resolution of US7 and US14: Integrating template deduction for class templates into the standard library</td><td>Kona</td><td><i>In progress</i></td><td>7.0</td></tr>
 	<tr><td><a href="https://wg21.link/P0452R1">P0452R1</a></td><td>LWG</td><td>Unifying &lt;numeric&gt; Parallel Algorithms</td><td>Kona</td><td></td><td></td></tr>
 	<tr><td><a href="https://wg21.link/P0467R2">P0467R2</a></td><td>LWG</td><td>Iterator Concerns for Parallel Algorithms</td><td>Kona</td><td></td><td></td></tr>
 	<tr><td><a href="https://wg21.link/P0492R2">P0492R2</a></td><td>LWG</td><td>Proposed Resolution of C++17 National Body Comments for Filesystems</td><td>Kona</td><td></td><td></td></tr>
@@ -161,7 +161,7 @@
 	<tr><td><a href="https://wg21.link/P0574R1">P0574R1</a></td><td>LWG</td><td>Algorithm Complexity Constraints and Parallel Overloads</td><td>Kona</td><td></td><td></td></tr>
 	<tr><td><a href="https://wg21.link/P0599R1">P0599R1</a></td><td>LWG</td><td>noexcept for hash functions</td><td>Kona</td><td>Complete</td><td>5.0</td></tr>
 	<tr><td><a href="https://wg21.link/P0604R0">P0604R0</a></td><td>LWG</td><td>Resolving GB 55, US 84, US 85, US 86</td><td>Kona</td><td></td><td></td></tr>
-	<tr><td><a href="https://wg21.link/P0607R0">P0607R0</a></td><td>LWG</td><td>Inline Variables for the Standard Library</td><td>Kona</td><td>In Progress</td><td>6.0</td></tr>
+	<tr><td><a href="https://wg21.link/P0607R0">P0607R0</a></td><td>LWG</td><td>Inline Variables for the Standard Library</td><td>Kona</td><td><i>In Progress</i></td><td>6.0</td></tr>
 	<tr><td><a href="https://wg21.link/P0618R0">P0618R0</a></td><td>LWG</td><td>Deprecating &lt;codecvt&gt;</td><td>Kona</td><td></td><td></td></tr>
 	<tr><td><a href="https://wg21.link/P0623R0">P0623R0</a></td><td>LWG</td><td>Final C++17 Parallel Algorithms Fixes</td><td>Kona</td><td></td><td></td></tr>
  	<tr><td></td><td></td><td></td><td></td><td></td><td></td></tr>
@@ -172,6 +172,7 @@
  </table>

 <p><i>The parts of P0607 that are not done are the &lt;regex&gt; bits.</i></p>
+<p><i>So far, only the &lt;string&gt; part of P0433 has been implemented.</i></p>

 <p><i>[ Note: "Nothing to do" means that no library changes were needed to implement this change -- end note]</i></p>