From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id BF74C385C409; Fri, 19 Nov 2021 20:24:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BF74C385C409 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-5423] libstdc++: Improve tests for stringstream constructors in C++20 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 5faf1c8c7ab64340945972ee5acb9eb0a655567a X-Git-Newrev: be08d573177b2004706759eedfdd4113f69e4c5c Message-Id: <20211119202415.BF74C385C409@sourceware.org> Date: Fri, 19 Nov 2021 20:24:15 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Nov 2021 20:24:15 -0000 https://gcc.gnu.org/g:be08d573177b2004706759eedfdd4113f69e4c5c commit r12-5423-gbe08d573177b2004706759eedfdd4113f69e4c5c Author: Jonathan Wakely Date: Fri Nov 19 13:33:24 2021 +0000 libstdc++: Improve tests for stringstream constructors in C++20 This ensures all constructors are checked. libstdc++-v3/ChangeLog: * testsuite/27_io/basic_istringstream/cons/char/1.cc: Check all constructors. * testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc: Likewise. * testsuite/27_io/basic_stringstream/cons/char/1.cc: Likewise. * testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc: Likewise. Diff: --- .../27_io/basic_istringstream/cons/char/1.cc | 119 +++++++++++++++++--- .../27_io/basic_istringstream/cons/wchar_t/1.cc | 119 +++++++++++++++++--- .../27_io/basic_ostringstream/cons/char/1.cc | 121 +++++++++++++++++--- .../27_io/basic_ostringstream/cons/wchar_t/1.cc | 122 ++++++++++++++++++--- .../27_io/basic_stringstream/cons/char/1.cc | 121 +++++++++++++++++--- .../27_io/basic_stringstream/cons/wchar_t/1.cc | 119 +++++++++++++++++--- 6 files changed, 633 insertions(+), 88 deletions(-) diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc index bfd56b98dff..a3c736eba0c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/char/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.3.2 basic_istringstream constructors [istringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,29 +49,120 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = char; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using istringstream = std::basic_istringstream; auto const mode = std::ios_base::in; - str_type s1(cstr); + alloc_type a1(1); + const string s1(cstr, a1); + // basic_istringstream() { - std::istringstream::allocator_type a; - std::istringstream sbuf(s1, mode, a); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + istringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_istringstream(openmode) { - std::istringstream sbuf(s1, mode); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + istringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_istringstream(const basic_string&, openmode = in) { - std::istringstream sbuf(s1); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + istringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(const basic_string&, openmode = in) + { + istringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(openmode, const A&) + { + istringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(basic_string&&, openmode = in) + { + istringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(basic_string&&, openmode = in) + { + istringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(const basic_string&, const A&) + { + alloc_type a2(2); + istringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + istringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + istringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + istringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::string s2 = cstr; + istringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } } diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc index 5573a72311d..a3c1afe6aa2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/cons/wchar_t/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.3.2 basic_istringstream constructors [istringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,29 +49,120 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = wchar_t; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using istringstream = std::basic_istringstream; auto const mode = std::ios_base::in; - str_type s1(cstr); + alloc_type a1(1); + const string s1(cstr, a1); + // basic_istringstream() { - std::wistringstream::allocator_type a; - std::wistringstream sbuf(s1, mode, a); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + istringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_istringstream(openmode) { - std::wistringstream sbuf(s1, mode); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + istringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_istringstream(const basic_string&, openmode = in) { - std::wistringstream sbuf(s1); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + istringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(const basic_string&, openmode = in) + { + istringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(openmode, const A&) + { + istringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(basic_string&&, openmode = in) + { + istringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(basic_string&&, openmode = in) + { + istringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_istringstream(const basic_string&, const A&) + { + alloc_type a2(2); + istringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + istringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + istringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + istringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_istringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::wstring s2 = cstr; + istringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } } diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc index 93d35756a74..a337916441e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/char/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.4.2 basic_ostringstream constructors [ostringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,29 +49,120 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = char; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using ostringstream = std::basic_ostringstream; - auto const mode = std::ios_base::out; - str_type s1(cstr); + auto const mode = std::ios_base::in; + alloc_type a1(1); + const string s1(cstr, a1); + // basic_ostringstream() { - std::ostringstream::allocator_type a; - std::ostringstream sbuf(s1, mode, a); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + ostringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_ostringstream(openmode) { - std::ostringstream sbuf(s1, mode); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + ostringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_ostringstream(const basic_string&, openmode = in) { - std::ostringstream sbuf(s1); - std::string s2(cstr); - VERIFY( sbuf.str() == s2 ); + ostringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(const basic_string&, openmode = in) + { + ostringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(openmode, const A&) + { + ostringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(basic_string&&, openmode = in) + { + ostringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(basic_string&&, openmode = in) + { + ostringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(const basic_string&, const A&) + { + alloc_type a2(2); + ostringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + ostringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + ostringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + ostringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::string s2 = cstr; + ostringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } } diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc index 12767c781d7..12e40a79740 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/cons/wchar_t/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.4.2 basic_ostringstream constructors [ostringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,32 +49,122 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = wchar_t; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using ostringstream = std::basic_ostringstream; - auto const mode = std::ios_base::out; - str_type s1(cstr); + auto const mode = std::ios_base::in; + alloc_type a1(1); + const string s1(cstr, a1); + // basic_ostringstream() { - std::wostringstream::allocator_type a; - std::wostringstream sbuf(s1, mode, a); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + ostringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_ostringstream(openmode) { - std::wostringstream sbuf(s1, mode); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + ostringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_ostringstream(const basic_string&, openmode = in) { - std::wostringstream sbuf(s1); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + ostringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(const basic_string&, openmode = in) + { + ostringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(openmode, const A&) + { + ostringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(basic_string&&, openmode = in) + { + ostringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(basic_string&&, openmode = in) + { + ostringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_ostringstream(const basic_string&, const A&) + { + alloc_type a2(2); + ostringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + ostringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + ostringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_ostringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + ostringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); } -} + // basic_ostringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::wstring s2 = cstr; + ostringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); + } +} int main() { diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc index 7cb9f34ca04..6395ae3e242 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/char/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.5.2 basic_stringstream constructors [stringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,29 +49,120 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = char; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using stringstream = std::basic_stringstream; - auto const mode = std::ios_base::in | std::ios_base::out; - str_type s1(cstr); + auto const mode = std::ios_base::in; + alloc_type a1(1); + const string s1(cstr, a1); + // basic_stringstream() { - std::stringstream::allocator_type a; - std::stringstream ss(s1, mode, a); - std::string s2(cstr); - VERIFY( ss.str() == s2 ); + alloc_type a0; + stringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_stringstream(openmode) { - std::stringstream ss(s1, mode); - std::string s2(cstr); - VERIFY( ss.str() == s2 ); + alloc_type a0; + stringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_stringstream(const basic_string&, openmode = in) { - std::stringstream ss(s1); - std::string s2(cstr); - VERIFY( ss.str() == s2 ); + stringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(const basic_string&, openmode = in) + { + stringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(openmode, const A&) + { + stringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(basic_string&&, openmode = in) + { + stringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(basic_string&&, openmode = in) + { + stringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(const basic_string&, const A&) + { + alloc_type a2(2); + stringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + stringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + stringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::string s2 = cstr; + stringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::string s2 = cstr; + stringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } } diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc index 5573a72311d..d4c412276cc 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/cons/wchar_t/1.cc @@ -15,7 +15,7 @@ // with this library; see the file COPYING3. If not see // . -// C++20 29.8.2.2 basic_stringbuf constructors [stringbuf.cons +// C++20 29.8.5.2 basic_stringstream constructors [stringstream.cons] // { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } @@ -49,29 +49,120 @@ test02() void test03() { - using alloc_type = __gnu_test::tracker_allocator; - using str_type = std::basic_string, alloc_type>; + using C = wchar_t; + using alloc_type = __gnu_test::uneq_allocator; + using traits_type = std::char_traits; + using string = std::basic_string; + using stringstream = std::basic_stringstream; auto const mode = std::ios_base::in; - str_type s1(cstr); + alloc_type a1(1); + const string s1(cstr, a1); + // basic_stringstream() { - std::wistringstream::allocator_type a; - std::wistringstream sbuf(s1, mode, a); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + stringstream ss; + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_stringstream(openmode) { - std::wistringstream sbuf(s1, mode); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + alloc_type a0; + stringstream ss(mode); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } + // basic_stringstream(const basic_string&, openmode = in) { - std::wistringstream sbuf(s1); - std::wstring s2(cstr); - VERIFY( sbuf.str() == s2 ); + stringstream ss(s1); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(const basic_string&, openmode = in) + { + stringstream ss(s1, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(openmode, const A&) + { + stringstream ss(mode, a1); + VERIFY( ss.str().empty() ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(basic_string&&, openmode = in) + { + stringstream ss(string{s1}); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(basic_string&&, openmode = in) + { + stringstream ss(string(s1), mode); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a1 ); + VERIFY( ss.str().get_allocator() == a1 ); + } + + // basic_stringstream(const basic_string&, const A&) + { + alloc_type a2(2); + stringstream ss(s1, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + stringstream ss(s2, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + stringstream ss(s1, mode, a2); + VERIFY( ss.str() == s1 ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode, const A&) + { + alloc_type a2(2); + const std::wstring s2 = cstr; + stringstream ss(s2, mode, a2); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a2 ); + VERIFY( ss.str().get_allocator() == a2 ); + } + + // basic_stringstream(const basic_string&, openmode = in) + { + alloc_type a0; + const std::wstring s2 = cstr; + stringstream ss(s2, mode); + VERIFY( ss.str() == cstr ); + VERIFY( ss.rdbuf()->get_allocator() == a0 ); + VERIFY( ss.str().get_allocator() == a0 ); } }