[libcxx] r292823 - Implement LWG#2778: basic_string_view is missing constexpr.

[Marshall Clow via cfe-commits]

Author: marshall
Date: Mon Jan 23 13:53:28 2017
New Revision: 292823

URL: http://llvm.org/viewvc/llvm-project?rev=292823&view=rev
Log:
Implement LWG#2778: basic_string_view is missing constexpr.

Added:
    libcxx/trunk/test/std/strings/string.view/string.view.cons/assign.pass.cpp
Modified:
    libcxx/trunk/include/string_view
    libcxx/trunk/www/cxx1z_status.html

Modified: libcxx/trunk/include/string_view
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/string_view?rev=292823&r1=292822&r2=292823&view=diff
==============================================================================
--- libcxx/trunk/include/string_view (original)
+++ libcxx/trunk/include/string_view Mon Jan 23 13:53:28 2017
@@ -206,7 +206,7 @@ public:
 	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
 	basic_string_view(const basic_string_view&) _NOEXCEPT = default;
 
-	_LIBCPP_INLINE_VISIBILITY
+	_LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
 	basic_string_view& operator=(const basic_string_view&) _NOEXCEPT = default;
 
 	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
@@ -235,16 +235,16 @@ public:
 	_LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
 	const_iterator cend()   const _NOEXCEPT { return __data + __size; }
 
-	_LIBCPP_INLINE_VISIBILITY
+	_LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
 	const_reverse_iterator rbegin()   const _NOEXCEPT { return const_reverse_iterator(cend()); }
 
-	_LIBCPP_INLINE_VISIBILITY
+	_LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
 	const_reverse_iterator rend()     const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
 
-	_LIBCPP_INLINE_VISIBILITY
+	_LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
 	const_reverse_iterator crbegin()  const _NOEXCEPT { return const_reverse_iterator(cend()); }
 
-	_LIBCPP_INLINE_VISIBILITY
+	_LIBCPP_CONSTEXPR_AFTER_CXX14 _LIBCPP_INLINE_VISIBILITY
 	const_reverse_iterator crend()    const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
 
 	// [string.view.capacity], capacity

Added: libcxx/trunk/test/std/strings/string.view/string.view.cons/assign.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/string.view/string.view.cons/assign.pass.cpp?rev=292823&view=auto
==============================================================================
--- libcxx/trunk/test/std/strings/string.view/string.view.cons/assign.pass.cpp (added)
+++ libcxx/trunk/test/std/strings/string.view/string.view.cons/assign.pass.cpp Mon Jan 23 13:53:28 2017
@@ -0,0 +1,50 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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_view>
+
+// constexpr basic_string_view& operator=(const basic_string_view &) noexcept = default;
+
+#include <string_view>
+#include <cassert>
+
+#include "test_macros.h"
+
+template<typename T>
+#if TEST_STD_VER > 11
+constexpr
+#endif
+bool test (T sv0)
+    {
+    T sv1;
+    sv1 = sv0;
+//  We can't just say "sv0 == sv1" here because string_view::compare
+//  isn't constexpr until C++17, and we want to support back to C++14
+    return sv0.size() == sv1.size() && sv0.data() == sv1.data();
+    }
+
+int main () {
+
+    assert( test<std::string_view>    ( "1234"));
+#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
+    assert( test<std::u16string_view> (u"1234"));
+    assert( test<std::u32string_view> (U"1234"));
+#endif
+    assert( test<std::wstring_view>   (L"1234"));
+
+#if TEST_STD_VER > 11
+    static_assert( test<std::string_view>    ({ "abc", 3}), "");
+#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
+    static_assert( test<std::u16string_view> ({u"abc", 3}), "");
+    static_assert( test<std::u32string_view> ({U"abc", 3}), "");
+#endif
+    static_assert( test<std::wstring_view>   ({L"abc", 3}), "");
+#endif
+}

Modified: libcxx/trunk/www/cxx1z_status.html
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/www/cxx1z_status.html?rev=292823&r1=292822&r2=292823&view=diff
==============================================================================
--- libcxx/trunk/www/cxx1z_status.html (original)
+++ libcxx/trunk/www/cxx1z_status.html Mon Jan 23 13:53:28 2017
@@ -409,7 +409,7 @@
 	<tr><td><a href="http://wg21.link/LWG2771">2771</a></td><td>Broken Effects of some basic_string::compare functions in terms of basic_string_view</td><td>Issaquah</td><td>Complete</td></tr>
 	<tr><td><a href="http://wg21.link/LWG2773">2773</a></td><td>Making std::ignore constexpr</td><td>Issaquah</td><td></td></tr>
 	<tr><td><a href="http://wg21.link/LWG2777">2777</a></td><td>basic_string_view::copy should use char_traits::copy</td><td>Issaquah</td><td>Complete</td></tr>
-	<tr><td><a href="http://wg21.link/LWG2778">2778</a></td><td>basic_string_view is missing constexpr</td><td>Issaquah</td><td></td></tr>
+	<tr><td><a href="http://wg21.link/LWG2778">2778</a></td><td>basic_string_view is missing constexpr</td><td>Issaquah</td><td>Complete</td></tr>
 
 <!--
 	<tr><td><a href="http://wg21.link/LWG1214">1214</a></td><td>Insufficient/inconsistent key immutability requirements for associative containers</td><td>Urbana</td><td></td></tr>
@@ -417,7 +417,7 @@
 <!-- 	<tr><td></td><td></td><td></td><td></td></tr> -->
   </table>
 
-  <p>Last Updated: 19-Jan-2017</p>
+  <p>Last Updated: 23-Jan-2017</p>
 </div>
 </body>
 </html>