diff --git a/libcxx/include/string_view b/libcxx/include/string_view index f98bbb5345dc..20a4e06cd4cc 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -156,6 +156,11 @@ namespace std { template <> struct hash; template <> struct hash; + constexpr basic_string operator "" s( const char *str, size_t len ); // C++17 + constexpr basic_string operator "" s( const wchar_t *str, size_t len ); // C++17 + constexpr basic_string operator "" s( const char16_t *str, size_t len ); // C++17 + constexpr basic_string operator "" s( const char32_t *str, size_t len ); // C++17 + } // namespace std @@ -749,6 +754,38 @@ hash >::operator()( return __do_string_hash(__val.data(), __val.data() + __val.size()); } + +#if _LIBCPP_STD_VER > 11 +inline namespace literals +{ + inline namespace string_view_literals + { + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view operator "" sv(const char *__str, size_t __len) + { + return basic_string_view (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view operator "" sv(const wchar_t *__str, size_t __len) + { + return basic_string_view (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view operator "" sv(const char16_t *__str, size_t __len) + { + return basic_string_view (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR + basic_string_view operator "" sv(const char32_t *__str, size_t __len) + { + return basic_string_view (__str, __len); + } + } +} +#endif _LIBCPP_END_NAMESPACE_STD #endif // _LIBCPP_STRING_VIEW diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp new file mode 100644 index 000000000000..131bea928a7d --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp @@ -0,0 +1,56 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include +#include + +int main() +{ + using namespace std::literals::string_view_literals; + + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + static_assert ( std::is_same::value, "" ); + + std::string_view foo; + std::wstring_view Lfoo; + std::u16string_view ufoo; + std::u32string_view Ufoo; + + foo = ""sv; assert( foo.size() == 0); + foo = u8""sv; assert( foo.size() == 0); + Lfoo = L""sv; assert(Lfoo.size() == 0); + ufoo = u""sv; assert(ufoo.size() == 0); + Ufoo = U""sv; assert(Ufoo.size() == 0); + + foo = " "sv; assert( foo.size() == 1); + foo = u8" "sv; assert( foo.size() == 1); + Lfoo = L" "sv; assert(Lfoo.size() == 1); + ufoo = u" "sv; assert(ufoo.size() == 1); + Ufoo = U" "sv; assert(Ufoo.size() == 1); + + foo = "ABC"sv; assert( foo == "ABC"); assert( foo == std::string_view ( "ABC")); + foo = u8"ABC"sv; assert( foo == u8"ABC"); assert( foo == std::string_view (u8"ABC")); + Lfoo = L"ABC"sv; assert(Lfoo == L"ABC"); assert(Lfoo == std::wstring_view ( L"ABC")); + ufoo = u"ABC"sv; assert(ufoo == u"ABC"); assert(ufoo == std::u16string_view( u"ABC")); + Ufoo = U"ABC"sv; assert(Ufoo == U"ABC"); assert(Ufoo == std::u32string_view( U"ABC")); + + static_assert( "ABC"sv.size() == 3, ""); + static_assert(u8"ABC"sv.size() == 3, ""); + static_assert( L"ABC"sv.size() == 3, ""); + static_assert( u"ABC"sv.size() == 3, ""); + static_assert( U"ABC"sv.size() == 3, ""); +} diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal1.fail.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal1.fail.cpp new file mode 100644 index 000000000000..07878a56abff --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal1.fail.cpp @@ -0,0 +1,22 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 + +#include +#include + +int main() +{ + using std::string_view; + + string_view foo = ""sv; // should fail w/conversion operator not found +} diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal1.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal1.pass.cpp new file mode 100644 index 000000000000..2481be0a60af --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal1.pass.cpp @@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include +#include + +int main() +{ + using namespace std::literals; + + std::string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal2.fail.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal2.fail.cpp new file mode 100644 index 000000000000..b6194c5428b5 --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal2.fail.cpp @@ -0,0 +1,20 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 + +#include +#include + +int main() +{ + std::string_view foo = ""sv; // should fail w/conversion operator not found +} diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal2.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal2.pass.cpp new file mode 100644 index 000000000000..299f27df7082 --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal2.pass.cpp @@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include +#include + +int main() +{ + using namespace std::literals::string_view_literals; + + std::string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp new file mode 100644 index 000000000000..dea663535f88 --- /dev/null +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal3.pass.cpp @@ -0,0 +1,24 @@ +// -*- C++ -*- +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// UNSUPPORTED: c++98, c++03, c++11 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9 +// Note: libc++ supports string_view before C++17, but literals were introduced in C++14 + +#include +#include + +int main() +{ + using namespace std; + + string_view foo = ""sv; + assert(foo.length() == 0); +} diff --git a/libcxx/www/cxx1z_status.html b/libcxx/www/cxx1z_status.html index 7c15fdfc4ce3..22503b98016e 100644 --- a/libcxx/www/cxx1z_status.html +++ b/libcxx/www/cxx1z_status.html @@ -124,7 +124,7 @@ P0003R5LWGRemoving Deprecated Exception Specifications from C++17Issaquah P0067R5LWGElementary string conversions, revision 5Issaquah - P0403R1LWGLiteral suffixes for basic_string_viewIssaquah + P0403R1LWGLiteral suffixes for basic_string_viewIssaquahComplete4.0 P0414R2LWGMerging shared_ptr changes from Library Fundamentals to C++17Issaquah P0418R2LWGFail or succeed: there is no atomic latticeIssaquah P0426R1LWGConstexpr for std::char_traitsIssaquah