From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id 892493858D20 for ; Thu, 17 Feb 2022 22:05:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 892493858D20 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 cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id E561A10047B87 for ; Thu, 17 Feb 2022 22:05:51 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouNn7CRykku4KouNnOTsm; Thu, 17 Feb 2022 22:05:51 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=LOaj/La9 c=1 sm=1 tr=0 ts=620ec6bf a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=oGFeUVbbRNcA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=6474qjNDIIT7h3PhyjwA: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:References:In-Reply-To: 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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=pUg5sJMQamTW9pbbghY4vgkR/MjLNcz9152fCTrSZas=; b=yHnDqe/qB7kO298pHluly1hcjR mtIyG8uRYVl/gDNtz0Xi3FrhgkIHyF4uQm+z6NXKPTD6mgzAHxiyRbhok7QDRAwtUNRHw8DX7My6W rrewY1s3pFtAQDptn8ueXqCah; Received: from 75-166-146-214.hlrn.qwest.net ([75.166.146.214]:41036 helo=prentzel.Home) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nKouN-002A2c-1d; Thu, 17 Feb 2022 15:05:51 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 07/18] Remove language_defn::emitchar Date: Thu, 17 Feb 2022 15:05:35 -0700 Message-Id: <20220217220547.3874030-8-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220217220547.3874030-1-tom@tromey.com> References: <20220217220547.3874030-1-tom@tromey.com> 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.146.214 X-Source-L: No X-Exim-ID: 1nKouN-002A2c-1d X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-146-214.hlrn.qwest.net (prentzel.Home) [75.166.146.214]:41036 X-Source-Auth: tom+tromey.com X-Email-Count: 13 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2022 22:05:54 -0000 Nothing outside of the specific language implementations ever calls language_defn::emitchar. This patch removes this method and updates the rest of the code. In some spots, the method is entirely removed; in others, just the 'override' is removed. --- gdb/ada-lang.c | 8 -------- gdb/c-lang.c | 19 +++---------------- gdb/f-lang.h | 12 ++---------- gdb/language.c | 9 --------- gdb/language.h | 6 ------ gdb/m2-lang.h | 2 +- gdb/p-lang.h | 2 +- gdb/rust-lang.c | 10 ++++++---- gdb/rust-lang.h | 12 +----------- 9 files changed, 14 insertions(+), 66 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d2f620cbb04..e3bd1fa7c17 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -13317,14 +13317,6 @@ class ada_language : public language_defn /* See language.h. */ - void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override - { - ada_emit_char (ch, chtype, stream, quoter, 1); - } - - /* See language.h. */ - void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { diff --git a/gdb/c-lang.c b/gdb/c-lang.c index 562736a5ee8..f7dee8c31d8 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c @@ -139,20 +139,6 @@ classify_type (struct type *elttype, struct gdbarch *gdbarch, return result; } -/* Print the character C on STREAM as part of the contents of a - literal string whose delimiter is QUOTER. Note that that format - for printing characters and strings is language specific. */ - -void -language_defn::emitchar (int c, struct type *type, - struct ui_file *stream, int quoter) const -{ - const char *encoding; - - classify_type (type, type->arch (), &encoding); - generic_emit_char (c, type, stream, quoter, encoding); -} - /* See language.h. */ void @@ -160,8 +146,9 @@ language_defn::printchar (int c, struct type *type, struct ui_file * stream) const { c_string_type str_type; + const char *encoding; - str_type = classify_type (type, type->arch (), NULL); + str_type = classify_type (type, type->arch (), &encoding); switch (str_type) { case C_CHAR: @@ -178,7 +165,7 @@ language_defn::printchar (int c, struct type *type, } fputc_filtered ('\'', stream); - emitchar (c, type, stream, '\''); + generic_emit_char (c, type, stream, '\'', encoding); fputc_filtered ('\'', stream); } diff --git a/gdb/f-lang.h b/gdb/f-lang.h index 11debd5569f..388c832dcdb 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -149,20 +149,12 @@ class f_language : public language_defn /* See language.h. */ - void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override - { - const char *encoding = get_encoding (chtype); - generic_emit_char (ch, chtype, stream, quoter, encoding); - } - - /* See language.h. */ - void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { fputs_filtered ("'", stream); - emitchar (ch, chtype, stream, '\''); + const char *encoding = get_encoding (chtype); + generic_emit_char (ch, chtype, stream, '\'', encoding); fputs_filtered ("'", stream); } diff --git a/gdb/language.c b/gdb/language.c index 20b6d8ccf9b..dff9f8bdaf9 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -786,15 +786,6 @@ class auto_or_unknown_language : public language_defn /* See language.h. */ - void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override - { - error (_("emit character not implemented for language \"%s\""), - natural_name ()); - } - - /* See language.h. */ - void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { diff --git a/gdb/language.h b/gdb/language.h index f2885000259..2820eca0050 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -524,12 +524,6 @@ struct language_defn virtual int parser (struct parser_state *ps) const; - /* Print the character CH (of type CHTYPE) on STREAM as part of the - contents of a literal string whose delimiter is QUOTER. */ - - virtual void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const; - virtual void printchar (int ch, struct type *chtype, struct ui_file * stream) const; diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h index 86a093e5f1b..ee2fc6fb8bc 100644 --- a/gdb/m2-lang.h +++ b/gdb/m2-lang.h @@ -93,7 +93,7 @@ class m2_language : public language_defn /* See language.h. */ void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override; + struct ui_file *stream, int quoter) const; /* See language.h. */ diff --git a/gdb/p-lang.h b/gdb/p-lang.h index 429ef23aea4..b831bde0af6 100644 --- a/gdb/p-lang.h +++ b/gdb/p-lang.h @@ -110,7 +110,7 @@ class pascal_language : public language_defn /* See language.h. */ void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override + struct ui_file *stream, int quoter) const { int in_quotes = 0; diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index d2960d5dc62..a6094cd3b25 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -1592,13 +1592,14 @@ rust_language::print_type (struct type *type, const char *varstring, /* See language.h. */ void -rust_language::emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const +rust_language::printchar (int ch, struct type *chtype, + struct ui_file *stream) const { + fputs_filtered ("'", stream); if (!rust_chartype_p (chtype)) - generic_emit_char (ch, chtype, stream, quoter, + generic_emit_char (ch, chtype, stream, '\'', target_charset (chtype->arch ())); - else if (ch == '\\' || ch == quoter) + else if (ch == '\\') fprintf_filtered (stream, "\\%c", ch); else if (ch == '\n') fputs_filtered ("\\n", stream); @@ -1614,6 +1615,7 @@ rust_language::emitchar (int ch, struct type *chtype, fprintf_filtered (stream, "\\x%02x", ch); else fprintf_filtered (stream, "\\u{%06x}", ch); + fputs_filtered ("'", stream); } /* See language.h. */ diff --git a/gdb/rust-lang.h b/gdb/rust-lang.h index 60a1967ff45..1db83fe75ae 100644 --- a/gdb/rust-lang.h +++ b/gdb/rust-lang.h @@ -170,18 +170,8 @@ class rust_language : public language_defn /* See language.h. */ - void emitchar (int ch, struct type *chtype, - struct ui_file *stream, int quoter) const override; - - /* See language.h. */ - void printchar (int ch, struct type *chtype, - struct ui_file *stream) const override - { - fputs_filtered ("'", stream); - emitchar (ch, chtype, stream, '\''); - fputs_filtered ("'", stream); - } + struct ui_file *stream) const override; /* See language.h. */ -- 2.31.1