diff mbox series

[Ada] Improve pretty-printing of iterated component associations

Message ID 20220905072551.GA1174495@poulhies-Precision-5550
State New, archived
Headers
Series [Ada] Improve pretty-printing of iterated component associations |

Commit Message

Marc Poulhiès Sept. 5, 2022, 7:25 a.m. UTC 
  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.
diff mbox series

Patch

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));