From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailout2.rbg.tum.de (mailout2.rbg.tum.de [IPv6:2a09:80c0::202]) by sourceware.org (Postfix) with ESMTPS id 0FF023858D33; Sun, 24 Apr 2022 15:50:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0FF023858D33 Received: from mailrelay1.rbg.tum.de (mailrelay1.in.tum.de [131.159.254.14]) by mailout2.rbg.tum.de (Postfix) with ESMTPS id 677E24C0486; Sun, 24 Apr 2022 17:50:35 +0200 (CEST) Received: by mailrelay1.rbg.tum.de (Postfix, from userid 112) id 6227A6D8; Sun, 24 Apr 2022 17:50:35 +0200 (CEST) Received: from mailrelay1.rbg.tum.de (localhost [127.0.0.1]) by mailrelay1.rbg.tum.de (Postfix) with ESMTP id 418E76D7; Sun, 24 Apr 2022 17:50:35 +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 4004055F; Sun, 24 Apr 2022 17:50:35 +0200 (CEST) Received: by mail.in.tum.de (Postfix, from userid 112) id 3D5594A0447; Sun, 24 Apr 2022 17:50:35 +0200 (CEST) Received: (Authenticated sender: fent) by mail.in.tum.de (Postfix) with ESMTPSA id C55294A02C8; Sun, 24 Apr 2022 17:50:34 +0200 (CEST) (Extended-Queue-bit xtech_hd@fff.in.tum.de) From: Philipp Fent To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Philipp Fent Subject: [PATCH] libstdc++: Add pretty printer for std::initializer_list Date: Sun, 24 Apr 2022 17:50:25 +0200 Message-Id: <20220424155025.150437-1-fent@in.tum.de> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2022 15:50:39 -0000 Re-using the std::span printer, this now shows the contents of the initializer list instead of the pointer and length members. Signed-off-by: Philipp Fent --- libstdc++-v3/python/libstdcxx/v6/printers.py | 23 +++++++++++++++++-- .../libstdc++-prettyprinters/cxx11.cc | 6 +++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py index 6d8b765f2..48798b6c1 100644 --- a/libstdc++-v3/python/libstdcxx/v6/printers.py +++ b/libstdc++-v3/python/libstdcxx/v6/printers.py @@ -1657,7 +1657,7 @@ class StdRegexStatePrinter: class StdSpanPrinter: "Print a std::span" - class _iterator(Iterator): + class iterator(Iterator): def __init__(self, begin, size): self.count = 0 self.begin = begin @@ -1686,7 +1686,24 @@ class StdSpanPrinter: return '%s of length %d' % (self.typename, self.size) def children(self): - return self._iterator(self.val['_M_ptr'], self.size) + return self.iterator(self.val['_M_ptr'], self.size) + + def display_hint(self): + return 'array' + +class StdInitializerListPrinter: + "Print a std::initializer_list" + + def __init__(self, typename, val): + self.typename = typename + self.val = val + self.size = val['_M_len'] + + def to_string(self): + return '%s of length %d' % (self.typename, self.size) + + def children(self): + return StdSpanPrinter.iterator(self.val['_M_array'], self.size) def display_hint(self): return 'array' @@ -2156,6 +2173,8 @@ def build_libstdcxx_dictionary (): libstdcxx_printer.add_version('std::tr1::', 'unordered_multiset', Tr1UnorderedSetPrinter) + libstdcxx_printer.add_version('std::', 'initializer_list', StdInitializerListPrinter) + # std::regex components libstdcxx_printer.add_version('std::__detail::', '_State', StdRegexStatePrinter) diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc index 4262ca88b..621d13bd0 100644 --- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc +++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/cxx11.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include "../util/testsuite_allocator.h" // NullablePointer typedef std::tuple ExTuple; @@ -191,6 +192,11 @@ main() std::error_code ecfut0 = std::make_error_code(std::future_errc{}); // { dg-final { note-test ecfut0 {std::error_code = {"future": 0}} } } + std::initializer_list emptyIl = {}; + // { dg-final { note-test emptyIl {std::initializer_list of length 0} } } + std::initializer_list il = {3, 4}; + // { dg-final { note-test il {std::initializer_list of length 2 = {3, 4}} } } + placeholder(""); // Mark SPOT use(efl); use(fl); -- 2.36.0