From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH] Use generic_printstr from ada_language::printstr
Date: Wed, 4 Dec 2024 11:32:53 -0700 [thread overview]
Message-ID: <20241204183254.296681-1-tromey@adacore.com> (raw)
Currently, if you create a lazy string while in Ada language mode, the
string will be rendered strangely, like:
"["d0"]["9f"]["d1"]["80"]["d0"]["b8"]...
This happens because ada_printstr does not really handle UTF-8
decoding.
This patch changes ada_language::printstr to use generic_printstr when
UTF-8 is used.
Note that this code could probably be improved some more -- the
current patch only addresses the narrow case of the Python API. I've
filed a follow-up bug for the remaining changes.
---
gdb/ada-lang.c | 11 +++++-
gdb/testsuite/gdb.ada/lazy-string.exp | 43 ++++++++++++++++++++++
gdb/testsuite/gdb.ada/lazy-string/main.adb | 25 +++++++++++++
3 files changed, 77 insertions(+), 2 deletions(-)
create mode 100644 gdb/testsuite/gdb.ada/lazy-string.exp
create mode 100644 gdb/testsuite/gdb.ada/lazy-string/main.adb
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index bd5dcced54a..e86b664e3e2 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13800,8 +13800,15 @@ class ada_language : public language_defn
const char *encoding, int force_ellipses,
const struct value_print_options *options) const override
{
- ada_printstr (stream, elttype, string, length, encoding,
- force_ellipses, options);
+ /* ada_printstr doesn't handle UTF-8 too well, but we want this
+ for lazy-string printing. Defer this case to the generic
+ code. */
+ if (encoding != nullptr && strcasecmp (encoding, "UTF-8") == 0)
+ generic_printstr (stream, elttype, string, length, encoding,
+ force_ellipses, '"', 0, options);
+ else
+ ada_printstr (stream, elttype, string, length, encoding,
+ force_ellipses, options);
}
/* See language.h. */
diff --git a/gdb/testsuite/gdb.ada/lazy-string.exp b/gdb/testsuite/gdb.ada/lazy-string.exp
new file mode 100644
index 00000000000..39c100142b4
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/lazy-string.exp
@@ -0,0 +1,43 @@
+# Copyright 2024 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test GDB's 'set print characters' setting works for Ada strings.
+
+load_lib "ada.exp"
+load_lib gdb-python.exp
+
+require allow_ada_tests allow_python_tests
+
+standard_ada_testfile main
+
+# Enable basic use of UTF-8. LC_ALL gets reset for each testfile.
+setenv LC_ALL C.UTF-8
+
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} {
+ return -1
+}
+
+clean_restart ${testfile}
+
+set bp_location [gdb_get_line_number "STOP" ${testdir}/main.adb]
+if ![runto "main.adb:$bp_location" ] then {
+ return -1
+}
+
+gdb_test_no_output "python arg = gdb.parse_and_eval('arg.all')"
+
+gdb_test "python print(str(arg.lazy_string(encoding='utf-8')))" \
+ "\"funçao\"" \
+ "print lazy string using utf-8"
diff --git a/gdb/testsuite/gdb.ada/lazy-string/main.adb b/gdb/testsuite/gdb.ada/lazy-string/main.adb
new file mode 100644
index 00000000000..b5ccd011d25
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/lazy-string/main.adb
@@ -0,0 +1,25 @@
+-- Copyright 2024 Free Software Foundation, Inc.
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+procedure Main is
+
+ procedure Blah (Arg : String) is
+ begin
+ null; -- STOP
+ end;
+
+begin
+ Blah ("funçao");
+end Main;
--
2.47.0
next reply other threads:[~2024-12-04 18:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-04 18:32 Tom Tromey [this message]
2024-12-12 11:29 ` Andrew Burgess
2024-12-12 14:42 ` Tom Tromey
2024-12-12 14:58 ` 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=20241204183254.296681-1-tromey@adacore.com \
--to=tromey@adacore.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).