From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id 591183858D20 for ; Mon, 12 Jun 2023 23:11:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 591183858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id A4F3310047D8B for ; Mon, 12 Jun 2023 23:11:07 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 8qglq9w7ywySw8qglqVfUw; Mon, 12 Jun 2023 23:11:07 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=IIjHtijG c=1 sm=1 tr=0 ts=6487a60b a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=of4jigFt-DYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=WyTFfsXVkfX8KFV4_REA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=aooHfqDBW6KBuSHRTp2fHYZDzJMccyYBgtHxWux9lqE=; b=vX4qA0JzjLTX/3OqdnSFyo8vCS 0dx8HwVBTb700lOMM4jYnoiRopR2d++w1weoLQiJZFNUahBt3TZLzbGteY+6iHNigvLzDDKbFf57E b9PbvrMTjmzy24RcwXBsZv4nT; Received: from 75-166-136-83.hlrn.qwest.net ([75.166.136.83]:39070 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1q8qgl-000jRQ-F1; Mon, 12 Jun 2023 17:11:07 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Style history variable output Date: Mon, 12 Jun 2023 17:11:00 -0600 Message-Id: <20230612231100.18608-1-tom@tromey.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.136.83 X-Source-L: No X-Exim-ID: 1q8qgl-000jRQ-F1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-136-83.hlrn.qwest.net (localhost.localdomain) [75.166.136.83]:39070 X-Source-Auth: tom+tromey.com X-Email-Count: 1 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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: When printing a value, I think the history reference -- the "$1" in the output -- should be styled using the "variable" style. This patch implements this. --- gdb/printcmd.c | 3 ++- gdb/testsuite/gdb.base/style.exp | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/printcmd.c b/gdb/printcmd.c index d8d97493bab..204dbfc8219 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1253,7 +1253,8 @@ print_value (value *val, const value_print_options &opts) annotate_value_history_begin (histindex, val->type ()); - gdb_printf ("$%d = ", histindex); + gdb_printf ("%p[$%d%p] = ", variable_name_style.style ().ptr (), + histindex, nullptr); annotate_value_history_value (); diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index 0370550d251..0e64ed35c2b 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -196,8 +196,12 @@ proc run_style_tests { } { set sfield [limited_style string_field variable] set efield [limited_style e_field variable] set evalue [limited_style VALUE_TWO variable] + # The two parts of the left hand side are styled separately. + # This is just an oddity of the current implementation. + set lhs \ + [limited_style "\\\$" variable][limited_style "$decimal" variable] gdb_test "print struct_value" \ - "\{$ifield = 23,.*$sfield = .*,.*$efield = $evalue.*" + "$lhs = \{$ifield = 23,.*$sfield = .*,.*$efield = $evalue.*" set ffield [limited_style field variable] set cstart [string_to_regexp "/* XXX "] -- 2.39.2