From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 18/18] Simplify Fortran string printing
Date: Wed, 16 Feb 2022 06:55:18 -0700 [thread overview]
Message-ID: <20220216135518.3162480-19-tom@tromey.com> (raw)
In-Reply-To: <20220216135518.3162480-1-tom@tromey.com>
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;
-}
-
\f
/* 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
prev parent reply other threads:[~2022-02-16 13:55 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-16 13:55 [PATCH 00/18] Refactor character printing Tom Tromey
2022-02-16 13:55 ` [PATCH 01/18] Fix latent quote char bug in generic_printstr Tom Tromey
2022-02-16 15:38 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 02/18] Boolify need_escape in generic_emit_char Tom Tromey
2022-02-16 15:39 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 03/18] Remove c_emit_char Tom Tromey
2022-02-16 15:40 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 04/18] Remove c_printstr Tom Tromey
2022-02-16 15:46 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 05/18] Don't use wchar_printable in print_wchar Tom Tromey
2022-02-16 15:52 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 06/18] Fix a latent bug " Tom Tromey
2022-02-16 16:02 ` Andrew Burgess
2022-02-17 22:02 ` Tom Tromey
2022-02-16 13:55 ` [PATCH 07/18] Remove language_defn::emitchar Tom Tromey
2022-02-16 16:12 ` Andrew Burgess
2022-02-17 22:02 ` Tom Tromey
2022-02-16 13:55 ` [PATCH 08/18] Add gdb_iswcntrl Tom Tromey
2022-02-16 16:13 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 09/18] Include \0 in printable wide characters Tom Tromey
2022-02-16 17:19 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 10/18] Use a ui_file in print_wchar Tom Tromey
2022-02-16 17:25 ` Andrew Burgess
2022-02-16 13:55 ` [PATCH 11/18] Add an emitter callback to generic_printstr and generic_emit_char Tom Tromey
2022-02-16 17:47 ` Andrew Burgess
2022-02-16 20:40 ` Tom Tromey
2022-02-16 21:00 ` Tom Tromey
2022-02-16 13:55 ` [PATCH 12/18] Add a default encoding to generic_emit_char and generic_printstr Tom Tromey
2022-02-16 13:55 ` [PATCH 13/18] Change generic_emit_char to print the quotes Tom Tromey
2022-02-16 13:55 ` [PATCH 14/18] Use generic_emit_char in Rust Tom Tromey
2022-02-16 13:55 ` [PATCH 15/18] Use generic_emit_char in Ada Tom Tromey
2022-02-16 13:55 ` [PATCH 16/18] Use generic_emit_char in Modula-2 Tom Tromey
2022-02-16 13:55 ` [PATCH 17/18] Use generic_emit_char in Pascal Tom Tromey
2022-02-16 13:55 ` Tom Tromey [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220216135518.3162480-19-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).