From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 13/18] Change generic_emit_char to print the quotes
Date: Thu, 17 Feb 2022 15:05:41 -0700 [thread overview]
Message-ID: <20220217220547.3874030-14-tom@tromey.com> (raw)
In-Reply-To: <20220217220547.3874030-1-tom@tromey.com>
All callers of generic_emit_char print the quotes around the
character, then pass the quote character to the function. It seemed
better to just have generic_emit_char print the quotes itself.
---
gdb/c-lang.c | 2 --
gdb/f-lang.h | 2 --
gdb/valprint.c | 2 ++
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index f7dee8c31d8..b8097eb8c07 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -164,9 +164,7 @@ language_defn::printchar (int c, struct type *type,
break;
}
- fputc_filtered ('\'', stream);
generic_emit_char (c, type, stream, '\'', encoding);
- fputc_filtered ('\'', stream);
}
/* Print the character string STRING, printing at most LENGTH
diff --git a/gdb/f-lang.h b/gdb/f-lang.h
index 388c832dcdb..fc2cdc1786b 100644
--- a/gdb/f-lang.h
+++ b/gdb/f-lang.h
@@ -152,10 +152,8 @@ class f_language : public language_defn
void printchar (int ch, struct type *chtype,
struct ui_file *stream) const override
{
- fputs_filtered ("'", stream);
const char *encoding = get_encoding (chtype);
generic_emit_char (ch, chtype, stream, '\'', encoding);
- fputs_filtered ("'", stream);
}
/* See language.h. */
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 39c75e82a71..f873377fc8c 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -2295,6 +2295,7 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream,
c_buf = (gdb_byte *) alloca (TYPE_LENGTH (type));
pack_long (c_buf, type, c);
+ fputc_filtered (quoter, stream);
wchar_iterator iter (c_buf, TYPE_LENGTH (type), encoding, TYPE_LENGTH (type));
/* This holds the printable form of the wchar_t data. */
@@ -2356,6 +2357,7 @@ generic_emit_char (int c, struct type *type, struct ui_file *stream,
obstack_1grow (&output, '\0');
fputs_filtered ((const char *) obstack_base (&output), stream);
+ fputc_filtered (quoter, stream);
}
/* Return the repeat count of the next character/byte in ITER,
--
2.31.1
next prev parent reply other threads:[~2022-02-17 22:05 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 22:05 [PATCH v2 00/18] Refactor character printing Tom Tromey
2022-02-17 22:05 ` [PATCH v2 01/18] Fix latent quote char bug in generic_printstr Tom Tromey
2022-02-17 22:05 ` [PATCH v2 02/18] Boolify need_escape in generic_emit_char Tom Tromey
2022-02-17 22:05 ` [PATCH v2 03/18] Remove c_emit_char Tom Tromey
2022-02-17 22:05 ` [PATCH v2 04/18] Remove c_printstr Tom Tromey
2022-02-17 22:05 ` [PATCH v2 05/18] Don't use wchar_printable in print_wchar Tom Tromey
2022-02-22 15:36 ` Andrew Burgess
2022-10-10 16:39 ` Tom Tromey
2022-02-17 22:05 ` [PATCH v2 06/18] Fix a latent bug " Tom Tromey
2022-02-17 22:05 ` [PATCH v2 07/18] Remove language_defn::emitchar Tom Tromey
2022-02-17 22:05 ` [PATCH v2 08/18] Add gdb_iswcntrl Tom Tromey
2022-02-17 22:05 ` [PATCH v2 09/18] Include \0 in printable wide characters Tom Tromey
2022-02-23 13:49 ` Andrew Burgess
2022-02-23 22:28 ` Tom Tromey
2022-02-23 23:59 ` Tom Tromey
2022-02-17 22:05 ` [PATCH v2 10/18] Use a ui_file in print_wchar Tom Tromey
2022-02-17 22:05 ` [PATCH v2 11/18] Add an emitter callback to generic_printstr and generic_emit_char Tom Tromey
2022-02-17 22:05 ` [PATCH v2 12/18] Add a default encoding to generic_emit_char and generic_printstr Tom Tromey
2022-02-17 22:05 ` Tom Tromey [this message]
2022-02-17 22:05 ` [PATCH v2 14/18] Use generic_emit_char in Rust Tom Tromey
2022-02-17 22:05 ` [PATCH v2 15/18] Use generic_emit_char in Ada Tom Tromey
2022-02-17 22:05 ` [PATCH v2 16/18] Use generic_emit_char in Modula-2 Tom Tromey
2022-02-23 20:17 ` Gaius Mulley
2022-03-16 12:29 ` [PATCH] Additional modula2 tests Gaius Mulley
2022-04-07 14:21 ` Tom Tromey
2022-04-09 23:16 ` Gaius Mulley
2022-04-11 19:45 ` [PATCH v1] Array access in Modula-2 Gaius Mulley
2022-02-17 22:05 ` [PATCH v2 17/18] Use generic_emit_char in Pascal Tom Tromey
2022-02-17 22:05 ` [PATCH v2 18/18] Simplify Fortran string printing Tom Tromey
2022-10-10 17:37 ` [PATCH v2 00/18] Refactor character printing Tom Tromey
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=20220217220547.3874030-14-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).