From ca0be23b39df3255ff5272b5c3d9442aee7584b2 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 23 Jul 2013 17:05:24 +0000 Subject: [PATCH] Implement string suffixes from N3642 llvm-svn: 186956 --- libcxx/include/string | 41 ++++++++++++++++ .../basic.string.literals/literal.pass.cpp | 47 +++++++++++++++++++ .../basic.string.literals/literal1.fail.cpp | 22 +++++++++ .../basic.string.literals/literal1.pass.cpp | 20 ++++++++ .../basic.string.literals/literal2.fail.cpp | 20 ++++++++ .../basic.string.literals/literal2.pass.cpp | 20 ++++++++ 6 files changed, 170 insertions(+) create mode 100644 libcxx/test/strings/basic.string.literals/literal.pass.cpp create mode 100644 libcxx/test/strings/basic.string.literals/literal1.fail.cpp create mode 100644 libcxx/test/strings/basic.string.literals/literal1.pass.cpp create mode 100644 libcxx/test/strings/basic.string.literals/literal2.fail.cpp create mode 100644 libcxx/test/strings/basic.string.literals/literal2.pass.cpp diff --git a/libcxx/include/string b/libcxx/include/string index 89f75cd2ed01..88d32b1ca882 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -422,6 +422,11 @@ template <> struct hash; template <> struct hash; template <> struct hash; +basic_string operator "" s( const char *str, size_t len ); // C++14 +basic_string operator "" s( const wchar_t *str, size_t len ); // C++14 +basic_string operator "" s( const char16_t *str, size_t len ); // C++14 +basic_string operator "" s( const char32_t *str, size_t len ); // C++14 + } // std */ @@ -4097,6 +4102,42 @@ getline(basic_istream<_CharT, _Traits>&& __is, #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES +#if _LIBCPP_STD_VER > 11 +// Literal suffixes for basic_string [basic.string.literals] +// inline // Deviation from N3690. +// We believe the inline to be a defect and have submitted an LWG issue. +// An LWG issue number has not yet been assigned. +namespace literals +{ + inline namespace string_literals + { + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char *__str, size_t __len ) + { + return basic_string (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const wchar_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char16_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } + + inline _LIBCPP_INLINE_VISIBILITY + basic_string operator "" s( const char32_t *__str, size_t __len ) + { + return basic_string (__str, __len); + } + } +} +#endif + _LIBCPP_EXTERN_TEMPLATE(class basic_string) _LIBCPP_EXTERN_TEMPLATE(class basic_string) diff --git a/libcxx/test/strings/basic.string.literals/literal.pass.cpp b/libcxx/test/strings/basic.string.literals/literal.pass.cpp new file mode 100644 index 000000000000..a2442012fcf6 --- /dev/null +++ b/libcxx/test/strings/basic.string.literals/literal.pass.cpp @@ -0,0 +1,47 @@ +// -*- 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. +// +//===----------------------------------------------------------------------===// +#include +#include + +int main() +{ +#if _LIBCPP_STD_VER > 11 + using namespace std::literals::string_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 foo; + std::wstring Lfoo; + std::u16string ufoo; + std::u32string Ufoo; + + foo = ""s; assert( foo.size() == 0); + foo = u8""s; assert( foo.size() == 0); + Lfoo = L""s; assert(Lfoo.size() == 0); + ufoo = u""s; assert(ufoo.size() == 0); + Ufoo = U""s; assert(Ufoo.size() == 0); + + foo = " "s; assert( foo.size() == 1); + foo = u8" "s; assert( foo.size() == 1); + Lfoo = L" "s; assert(Lfoo.size() == 1); + ufoo = u" "s; assert(ufoo.size() == 1); + Ufoo = U" "s; assert(Ufoo.size() == 1); + + foo = "ABC"s; assert( foo == "ABC"); assert( foo == std::string ( "ABC")); + foo = u8"ABC"s; assert( foo == u8"ABC"); assert( foo == std::string (u8"ABC")); + Lfoo = L"ABC"s; assert(Lfoo == L"ABC"); assert(Lfoo == std::wstring ( L"ABC")); + ufoo = u"ABC"s; assert(ufoo == u"ABC"); assert(ufoo == std::u16string( u"ABC")); + Ufoo = U"ABC"s; assert(Ufoo == U"ABC"); assert(Ufoo == std::u32string( U"ABC")); +#endif +} diff --git a/libcxx/test/strings/basic.string.literals/literal1.fail.cpp b/libcxx/test/strings/basic.string.literals/literal1.fail.cpp new file mode 100644 index 000000000000..0901c62c8ca8 --- /dev/null +++ b/libcxx/test/strings/basic.string.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. +// +//===----------------------------------------------------------------------===// +#include +#include + +int main() +{ +#if _LIBCPP_STD_VER > 11 + using namespace std; + + std::string foo = ""s; // should fail w/conversion operator not found +#else +#error +#endif +} diff --git a/libcxx/test/strings/basic.string.literals/literal1.pass.cpp b/libcxx/test/strings/basic.string.literals/literal1.pass.cpp new file mode 100644 index 000000000000..adc2615f2493 --- /dev/null +++ b/libcxx/test/strings/basic.string.literals/literal1.pass.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. +// +//===----------------------------------------------------------------------===// +#include +#include + +int main() +{ +#if _LIBCPP_STD_VER > 11 + using namespace std::literals; + + std::string foo = ""s; +#endif +} diff --git a/libcxx/test/strings/basic.string.literals/literal2.fail.cpp b/libcxx/test/strings/basic.string.literals/literal2.fail.cpp new file mode 100644 index 000000000000..35c637507092 --- /dev/null +++ b/libcxx/test/strings/basic.string.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. +// +//===----------------------------------------------------------------------===// +#include +#include + +int main() +{ +#if _LIBCPP_STD_VER > 11 + std::string foo = ""s; // should fail w/conversion operator not found +#else +#error +#endif +} diff --git a/libcxx/test/strings/basic.string.literals/literal2.pass.cpp b/libcxx/test/strings/basic.string.literals/literal2.pass.cpp new file mode 100644 index 000000000000..81c03862d2be --- /dev/null +++ b/libcxx/test/strings/basic.string.literals/literal2.pass.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. +// +//===----------------------------------------------------------------------===// +#include +#include + +int main() +{ +#if _LIBCPP_STD_VER > 11 + using namespace std::literals::string_literals; + + std::string foo = ""s; +#endif +}