[PATCH 4/4]: C++ P1423R3 char8_t remediation: New tests

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 4/4]: C++ P1423R3 char8_t remediation: New tests

Tom Honermann
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.

libstdc++-v3/ChangeLog:

2019-09-15  Tom Honermann  <[hidden email]>

      *
libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc:
        New test to validate deleted overloads of character and string
        inserters for narrow ostreams.
      *
libstdc++-v3/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.
      *
libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc:
        New test to validate u8path invocations with sequences of
        char8_t.
      *
libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc
        New test to validate u8path invocations with sequences of
        char8_t.

Tom.

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..87afb295086
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// 29.7.2 Header <ostream> synopsys; deleted character inserters.
+
+// Test character inserters defined as deleted by P1423.
+
+// { dg-options "-std=gnu++17 -fchar8_t" }
+// { dg-do compile { target c++17 } }
+
+#include <ostream>
+
+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..701de16822b
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// 29.7.2 Header <ostream> synopsys; deleted character inserters.
+
+// Test wide character inserters defined as deleted by P1423.
+
+// { dg-options "-std=gnu++17 -fchar8_t" }
+// { dg-do compile { target c++17 } }
+
+#include <ostream>
+
+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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++17 -fchar8_t" }
+// { dg-do run { target c++17 } }
+
+#include <filesystem>
+#include <string_view>
+#include <testsuite_hooks.h>
+
+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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-lstdc++fs -fchar8_t" }
+// { dg-do run { target c++11 } }
+// { dg-require-filesystem-ts "" }
+
+#include <experimental/filesystem>
+#include <testsuite_hooks.h>
+
+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();
+}
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 4/4]: C++ P1423R3 char8_t remediation: New tests

Tom Honermann
A revised patch is attached that modifies the tests for deleted ostream
inserters to require C++2a.  This is required by the revision of patch
2/4 that adds proper preprocessor conditionals to the definitions.

Tom.

On 9/15/19 3:40 PM, Tom Honermann wrote:

> 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.
>
> libstdc++-v3/ChangeLog:
>
> 2019-09-15  Tom Honermann  <[hidden email]>
>
>       *
> libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/char/deleted.cc:
>
>         New test to validate deleted overloads of character and string
>         inserters for narrow ostreams.
>       *
> libstdc++-v3/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.
>       *
> libstdc++-v3/testsuite/27_io/filesystem/path/factory/u8path-char8_t.cc:
>         New test to validate u8path invocations with sequences of
>         char8_t.
>       *
> libstdc++-v3/testsuite/experimental/filesystem/path/factory/u8path-char8_t.cc
>
>         New test to validate u8path invocations with sequences of
>         char8_t.
>
> Tom.

commit b7eb4714cc2c999ce0491358fcbcebf4a8723185
Author: Tom Honermann <[hidden email]>
Date:   Sun Sep 15 22:25:28 2019 -0400

    P1423R3 char8_t remediation: 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.

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
+// <http://www.gnu.org/licenses/>.
+
+// 29.7.2 Header <ostream> synopsys; deleted character inserters.
+
+// Test character inserters defined as deleted by P1423.
+
+// { dg-options "-std=gnu++2a" }
+// { dg-do compile { target c++2a } }
+
+#include <ostream>
+
+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
+// <http://www.gnu.org/licenses/>.
+
+// 29.7.2 Header <ostream> 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 <ostream>
+
+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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++17 -fchar8_t" }
+// { dg-do run { target c++17 } }
+
+#include <filesystem>
+#include <string_view>
+#include <testsuite_hooks.h>
+
+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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-lstdc++fs -fchar8_t" }
+// { dg-do run { target c++11 } }
+// { dg-require-filesystem-ts "" }
+
+#include <experimental/filesystem>
+#include <testsuite_hooks.h>
+
+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();
+}