From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Piotr Trojanek <trojanek@adacore.com>
Subject: [Ada] Improve pretty-printing of iterated component associations
Date: Mon, 5 Sep 2022 09:25:51 +0200 [thread overview]
Message-ID: <20220905072551.GA1174495@poulhies-Precision-5550> (raw)
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
Pretty-printing used mostly in the debugger now handles more Ada 2022
syntax features. In particular, now it correctly handles expressions like
"[for E of A when E /= X => E]".
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* sprint.adb (Sprint_Node_Actual): Handle iterator_specification within
iterated_component_association and iterator_filter within
iterator_specification.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1182 bytes --]
diff --git a/gcc/ada/sprint.adb b/gcc/ada/sprint.adb
--- a/gcc/ada/sprint.adb
+++ b/gcc/ada/sprint.adb
@@ -1341,9 +1341,13 @@ package body Sprint is
when N_Iterated_Component_Association =>
Set_Debug_Sloc;
Write_Str (" for ");
- Write_Id (Defining_Identifier (Node));
- Write_Str (" in ");
- Sprint_Bar_List (Discrete_Choices (Node));
+ if Present (Iterator_Specification (Node)) then
+ Sprint_Node (Iterator_Specification (Node));
+ else
+ Write_Id (Defining_Identifier (Node));
+ Write_Str (" in ");
+ Sprint_Bar_List (Discrete_Choices (Node));
+ end if;
Write_Str (" => ");
Sprint_Node (Expression (Node));
@@ -2307,6 +2311,11 @@ package body Sprint is
Sprint_Node (Name (Node));
+ if Present (Iterator_Filter (Node)) then
+ Write_Str (" when ");
+ Sprint_Node (Iterator_Filter (Node));
+ end if;
+
when N_Itype_Reference =>
Write_Indent_Str_Sloc ("reference ");
Write_Id (Itype (Node));
reply other threads:[~2022-09-05 7:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20220905072551.GA1174495@poulhies-Precision-5550 \
--to=poulhies@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=trojanek@adacore.com \
/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).