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 A3D82385AC30 for ; Thu, 17 Feb 2022 22:05:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A3D82385AC30 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 1B6F810047A69 for ; Thu, 17 Feb 2022 22:05:55 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KouQn5brWnAlUKouQnzJVt; Thu, 17 Feb 2022 22:05:55 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=QIOt+iHL c=1 sm=1 tr=0 ts=620ec6c3 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=4AWYn4mOalZovHVqlnYA: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=eabSriP2bHf9prvb4UpqrKGYRq8z/1yLT0uY/zomSyk=; b=VFF3/9W+Jw2lIEDz4oxyGTbWUf QNcXXXDau0uPFaGBs/LhLigxzjy2dKpxejaJ+VmAUZ/yeBLAC11+DJiy4EZYXCDE1lgssC09R8xmU 8AWDy7kCNkPnoIX5Z0J+hcXgk; Received: from 75-166-146-214.hlrn.qwest.net ([75.166.146.214]:41038 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 1nKouQ-002ABb-B3; Thu, 17 Feb 2022 15:05:54 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 18/18] Simplify Fortran string printing Date: Thu, 17 Feb 2022 15:05:46 -0700 Message-Id: <20220217220547.3874030-19-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: 1nKouQ-002ABb-B3 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-146-214.hlrn.qwest.net (prentzel.Home) [75.166.146.214]:41038 X-Source-Auth: tom+tromey.com X-Email-Count: 24 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.5 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:57 -0000 Now that generic_emit_char has a default encoding, Fortran can remove its get_encoding method and just rely on the default. --- gdb/f-lang.c | 27 --------------------------- gdb/f-lang.h | 13 +------------ 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index eaeda884aef..7fdc767ccdb 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -74,33 +74,6 @@ static value *fortran_prepare_argument (struct expression *exp, int arg_num, bool is_internal_call_p, struct type *func_type, enum noside noside); -/* Return the encoding that should be used for the character type - TYPE. */ - -const char * -f_language::get_encoding (struct type *type) -{ - const char *encoding; - - switch (TYPE_LENGTH (type)) - { - case 1: - encoding = target_charset (type->arch ()); - break; - case 4: - if (type_byte_order (type) == BFD_ENDIAN_BIG) - encoding = "UTF-32BE"; - else - encoding = "UTF-32LE"; - break; - - default: - error (_("unrecognized character type")); - } - - return encoding; -} - /* A helper function for the "bound" intrinsics that checks that TYPE diff --git a/gdb/f-lang.h b/gdb/f-lang.h index fc2cdc1786b..c3c76193dc4 100644 --- a/gdb/f-lang.h +++ b/gdb/f-lang.h @@ -152,8 +152,7 @@ class f_language : public language_defn void printchar (int ch, struct type *chtype, struct ui_file *stream) const override { - const char *encoding = get_encoding (chtype); - generic_emit_char (ch, chtype, stream, '\'', encoding); + generic_emit_char (ch, chtype, stream, '\'', nullptr); } /* See language.h. */ @@ -163,14 +162,9 @@ class f_language : public language_defn const char *encoding, int force_ellipses, const struct value_print_options *options) const override { - const char *type_encoding = get_encoding (elttype); - if (TYPE_LENGTH (elttype) == 4) fputs_filtered ("4_", stream); - if (!encoding || !*encoding) - encoding = type_encoding; - generic_printstr (stream, elttype, string, length, encoding, force_ellipses, '\'', 0, options); } @@ -223,11 +217,6 @@ class f_language : public language_defn (const lookup_name_info &lookup_name) const override; private: - /* Return the encoding that should be used for the character type - TYPE. */ - - static const char *get_encoding (struct type *type); - /* Print any asterisks or open-parentheses needed before the variable name (to describe its type). -- 2.31.1