From cd502796cfd03b91dcc1bfeae2d9137d38ff3951 Mon Sep 17 00:00:00 2001 From: Tom Honermann Date: Fri, 29 Nov 2019 17:43:51 +0000 Subject: [PATCH] libstdc++: P1423R3 char8_t remediation (4/4) New tests This patch adds new tests to validate new deleted overloads of wchar_t, char8_t, char16_t, and char32_t for ordinary and wide formatted character and string ostream inserters. Additionally, new tests are added to validate invocations of u8path with sequences of char8_t for both the C++17 and filesystem TS implementations. 2019-11-29 Tom Honermann New tests * testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: New test to validate deleted overloads of character and string inserters for narrow ostreams. * testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: New test to validate deleted overloads of character and string inserters for wide ostreams. * testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: New test to validate u8path invocations with sequences of char8_t. * testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc: New test to validate u8path invocations with sequences of char8_t. From-SVN: r278858 --- libstdc++-v3/ChangeLog | 12 ++++ .../inserters_character/char/deleted.cc | 43 +++++++++++++ .../inserters_character/wchar_t/deleted.cc | 43 +++++++++++++ .../filesystem/path/factory/u8path-char8_t.cc | 60 +++++++++++++++++++ .../filesystem/path/factory/u8path-char8_t.cc | 52 ++++++++++++++++ 5 files changed, 210 insertions(+) create mode 100644 libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc create mode 100644 libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc create mode 100644 libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc create mode 100644 libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b7b11ecde28..5cc6aacc016 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,17 @@ 2019-11-29 Tom Honermann + New tests + * testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc: + New test to validate deleted overloads of character and string + inserters for narrow ostreams. + * testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc: + New test to validate deleted overloads of character and string + inserters for wide ostreams. + * testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc: New test + to validate u8path invocations with sequences of char8_t. + * testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc: + New test to validate u8path invocations with sequences of char8_t. + Updates to existing tests * testsuite/experimental/feat-char8_t.cc: Updated the expected __cpp_lib_char8_t feature test macro value. diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc new file mode 100644 index 00000000000..f2eb538f42e --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 29.7.2 Header synopsys; deleted character inserters. + +// Test character inserters defined as deleted by P1423. + +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include + +void test_character_inserters(std::ostream &os) +{ + os << 'x'; // ok. + os << L'x'; // { dg-error "use of deleted function" } + os << u8'x'; // { dg-error "use of deleted function" } + os << u'x'; // { dg-error "use of deleted function" } + os << U'x'; // { dg-error "use of deleted function" } +} + +void test_string_inserters(std::ostream &os) +{ + os << "text"; // ok. + os << L"text"; // { dg-error "use of deleted function" } + os << u8"text"; // { dg-error "use of deleted function" } + os << u"text"; // { dg-error "use of deleted function" } + os << U"text"; // { dg-error "use of deleted function" } +} diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc new file mode 100644 index 00000000000..1422a01aab3 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/deleted.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// 29.7.2 Header synopsys; deleted character inserters. + +// Test wide character inserters defined as deleted by P1423. + +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include + +void test_character_inserters(std::wostream &os) +{ + os << 'x'; // ok. + os << L'x'; // ok. + os << u8'x'; // { dg-error "use of deleted function" } + os << u'x'; // { dg-error "use of deleted function" } + os << U'x'; // { dg-error "use of deleted function" } +} + +void test_string_inserters(std::wostream &os) +{ + os << "text"; // ok. + os << L"text"; // ok. + os << u8"text"; // { dg-error "use of deleted function" } + os << u"text"; // { dg-error "use of deleted function" } + os << U"text"; // { dg-error "use of deleted function" } +} diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc new file mode 100644 index 00000000000..867ee5b3856 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc @@ -0,0 +1,60 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17 -fchar8_t" } +// { dg-do run { target c++17 } } + +#include +#include +#include + +namespace fs = std::filesystem; + +void +test01() +{ + fs::path p = fs::u8path(u8""); + VERIFY( p.empty() ); + + p = fs::u8path(u8"filename1"); + VERIFY( p.u8string() == u8"filename1" ); + + p = fs::u8path(u8"\xf0\x9d\x84\x9e"); + VERIFY( p.u8string() == u8"\U0001D11E" ); + + std::u8string s1 = u8"filename2"; + p = fs::u8path(s1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string s2 = u8"filename3"; + p = fs::u8path(s2.begin(), s2.end()); + VERIFY( p.u8string() == u8"filename3" ); + + std::u8string_view sv1{ s1 }; + p = fs::u8path(sv1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string_view sv2{ s2 }; + p = fs::u8path(sv2.begin(), sv2.end()); + VERIFY( p.u8string() == u8"filename3" ); +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc b/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc new file mode 100644 index 00000000000..dc509c3f912 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc @@ -0,0 +1,52 @@ +// Copyright (C) 2019 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-lstdc++fs -fchar8_t" } +// { dg-do run { target c++11 } } +// { dg-require-filesystem-ts "" } + +#include +#include + +namespace fs = std::experimental::filesystem; + +void +test01() +{ + fs::path p = fs::u8path(u8""); + VERIFY( p.empty() ); + + p = fs::u8path(u8"filename1"); + VERIFY( p.u8string() == u8"filename1" ); + + p = fs::u8path(u8"\xf0\x9d\x84\x9e"); + VERIFY( p.u8string() == u8"\U0001D11E" ); + + std::u8string s1 = u8"filename2"; + p = fs::u8path(s1); + VERIFY( p.u8string() == u8"filename2" ); + + std::u8string s2 = u8"filename3"; + p = fs::u8path(s2.begin(), s2.end()); + VERIFY( p.u8string() == u8"filename3" ); +} + +int +main() +{ + test01(); +} -- 2.30.2