From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout1.rbg.tum.de (mailout1.rbg.tum.de [131.159.0.201]) by sourceware.org (Postfix) with ESMTPS id 75FCA3856962; Sun, 4 Sep 2022 18:48:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 75FCA3856962 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=in.tum.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=in.tum.de Received: from mailrelay1.rbg.tum.de (mailrelay1.in.tum.de [131.159.254.14]) by mailout1.rbg.tum.de (Postfix) with ESMTPS id 9870690; Sun, 4 Sep 2022 20:48:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=in.tum.de; s=20220209; t=1662317283; bh=FO65aQJ6VjbqPu87JNmANcNDLrvTCWtIsMdtmXbsaxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XirqHcAPsgjG3Th2OW1nu0eOI07MYe4QIi+nxKExaqj8ekM92X0qxGIxBJMmUrQn7 7BP9YUQU73QSLb9ITkgIWnjvcJMGCaqyQqB2d/6aeHum2R/Vkw159CaZM9A8ykHfDh ytZZ5alNfnJKFHiN/rOvC6zN6+YXVIHcpE2ETCBI7X4ExG+2sx5EEFPN2e1fcEkLaE NkGAS1E4m5i49qXgve8vlanMtMv07+O0y1bsGzci5jm/QQ9tOz6S+ahUiXAxd6+K0a 1VawaHaJETqu3cyVNnZCZSFaWdetljEjYvLsEgt4w1qeSHdIC0slri1moLWkMYE0Ki W2axuiJRxcYwg== Received: by mailrelay1.rbg.tum.de (Postfix, from userid 112) id 95B251AFE; Sun, 4 Sep 2022 20:48:03 +0200 (CEST) Received: from mailrelay1.rbg.tum.de (localhost [127.0.0.1]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 753BE1AFD; Sun, 4 Sep 2022 20:48:03 +0200 (CEST) Received: from mail.in.tum.de (vmrbg426.in.tum.de [131.159.0.73]) by mailrelay1.rbg.tum.de (Postfix) with ESMTPS id 739541AFC; Sun, 4 Sep 2022 20:48:03 +0200 (CEST) Received: by mail.in.tum.de (Postfix, from userid 112) id 70CA34A04C4; Sun, 4 Sep 2022 20:48:03 +0200 (CEST) Received: (Authenticated sender: fent) by mail.in.tum.de (Postfix) with ESMTPSA id E455A4A0321; Sun, 4 Sep 2022 20:48:02 +0200 (CEST) (Extended-Queue-bit xtech_to@fff.in.tum.de) From: Philipp Fent To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Philipp Fent Subject: [PATCH 2/2] libstdc++: Add pretty printer for std::stringstream Date: Sun, 4 Sep 2022 20:47:35 +0200 Message-Id: <20220904184735.177348-2-fent@in.tum.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220904184735.177348-1-fent@in.tum.de> References: <20220904184735.177348-1-fent@in.tum.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Signed-off-by: Philipp Fent --- libstdc++-v3/python/libstdcxx/v6/printers.py | 37 +++++++++++++++++++ .../libstdc++-prettyprinters/debug.cc | 5 +++ .../libstdc++-prettyprinters/simple.cc | 5 +++ .../libstdc++-prettyprinters/simple11.cc | 5 +++ 4 files changed, 52 insertions(+) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index d70c8d5d616..5083f693387 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -969,6 +969,39 @@ class StdStringPrinter: def display_hint (self): return 'string' +class StdStringBufPrinter: + "Print a std::basic_stringbuf" + + def __init__(self, _, val): + self.val = val + + def to_string(self): + pbase = self.val['_M_out_beg'] + pptr = self.val['_M_out_cur'] + egptr = self.val['_M_in_end'] + # Logic from basic_stringbuf::_M_high_mark() + if pptr: + if not egptr or pptr > egptr: + return pbase.string(length = pptr - pbase) + else: + return pbase.string(length = pptr - egptr) + return self.val['_M_string'] + + def display_hint(self): + return 'string' + +class StdStringStreamPrinter: + "Print a std::basic_stringstream" + + def __init__(self, _, val): + self.val = val + + def to_string(self): + return self.val['_M_stringbuf'] + + def display_hint(self): + return 'string' + class Tr1HashtableIterator(Iterator): def __init__ (self, hashtable): self.buckets = hashtable['_M_buckets'] @@ -2232,6 +2265,10 @@ def build_libstdcxx_dictionary (): libstdcxx_printer.add_version('std::', 'initializer_list', StdInitializerListPrinter) libstdcxx_printer.add_version('std::', 'atomic', StdAtomicPrinter) + libstdcxx_printer.add_version('std::', 'basic_stringbuf', StdStringBufPrinter) + libstdcxx_printer.add_version('std::__cxx11::', 'basic_stringbuf', StdStringBufPrinter) + libstdcxx_printer.add_version('std::', 'basic_stringstream', StdStringStreamPrinter) + libstdcxx_printer.add_version('std::__cxx11::', 'basic_stringstream', StdStringStreamPrinter) # std::regex components libstdcxx_printer.add_version('std::__detail::', '_State', diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc index 98bbc182551..7efec6d0f8b 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/debug.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -110,6 +111,10 @@ main() __gnu_cxx::slist::iterator slliter = sll.begin(); // { dg-final { note-test slliter {47} } } + std::stringstream sstream; + sstream << "abc"; +// { dg-final { note-test sstream "\"abc\"" } } + std::cout << "\n"; return 0; // Mark SPOT } diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc index 1f85775bff0..584989ce09f 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -169,6 +170,10 @@ main() __gnu_cxx::slist::iterator slliter0; // { dg-final { note-test slliter0 {non-dereferenceable iterator for __gnu_cxx::slist} } } + std::stringstream sstream; + sstream << "abc"; +// { dg-final { note-test sstream "\"abc\"" } } + std::cout << "\n"; return 0; // Mark SPOT } diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc index 6f21675cf41..6edd7e929fe 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/simple11.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -162,6 +163,10 @@ main() __gnu_cxx::slist::iterator slliter0; // { dg-final { note-test slliter0 {non-dereferenceable iterator for __gnu_cxx::slist} } } + std::stringstream sstream; + sstream << "abc"; +// { dg-final { note-test sstream "\"abc\"" } } + std::cout << "\n"; return 0; // Mark SPOT } -- 2.37.3