Author: marshall Date: Thu Feb 8 08:25:57 2018 New Revision: 324619 URL: http://llvm.org/viewvc/llvm-project?rev=324619&view=rev Log: Clean up string's deduction guides tests. Mark old versions of clang as unsupported, b/c they don't have deduction guides, even in C++17 mode
Added: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp - copied, changed from r324618, libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp Removed: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp Modified: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp Removed: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp?rev=324618&view=auto ============================================================================== --- libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp (original) +++ libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp (removed) @@ -1,55 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// 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 -// XFAIL: c++17 - -// 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'}} - } - -} Modified: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp?rev=324619&r1=324618&r2=324619&view=diff ============================================================================== --- libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp (original) +++ libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.pass.cpp Thu Feb 8 08:25:57 2018 @@ -13,17 +13,6 @@ // 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> @@ -128,50 +117,4 @@ int main() test(input_iterator<const char*>(s), input_iterator<const char*>(s+50), A()); } #endif - -#if 0 -// 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 -#endif } Copied: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp (from r324618, libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp) URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp?p2=libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp&p1=libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp&r1=324618&r2=324619&rev=324619&view=diff ============================================================================== --- libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc.fail.cpp (original) +++ libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.fail.cpp Thu Feb 8 08:25:57 2018 @@ -9,7 +9,7 @@ // <string> // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: c++17 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9, clang.4-0 // template<class InputIterator, // class Allocator = allocator<typename iterator_traits<InputIterator>::value_type>> Added: libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp?rev=324619&view=auto ============================================================================== --- libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp (added) +++ libcxx/trunk/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp Thu Feb 8 08:25:57 2018 @@ -0,0 +1,82 @@ +//===----------------------------------------------------------------------===// +// +// 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 +// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9, clang.4-0 + +// template<class InputIterator> +// 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> +#include <cstddef> + +#include "test_macros.h" +#include "test_allocator.h" +#include "../input_iterator.h" +#include "min_allocator.h" + +int main() +{ + { + 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); + } +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits