aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2023-03-10 00:14:32 +0100
committerMarc Poulhiès <poulhies@adacore.com>2023-05-25 09:44:19 +0200
commit93d0457ec9c03acd009eef3cd5b725172e988648 (patch)
treeb3a268a631b3869f6b094dc87b94f10ed072838d
parentf7f8e290a11a2d1ab0eefa5a87d4d56f0146f9d4 (diff)
downloadgcc-93d0457ec9c03acd009eef3cd5b725172e988648.zip
gcc-93d0457ec9c03acd009eef3cd5b725172e988648.tar.gz
gcc-93d0457ec9c03acd009eef3cd5b725172e988648.tar.bz2
ada: Use procedural variant of Next_Index where possible
Code cleanup; semantics is unaffected. gcc/ada/ * einfo-utils.adb (Write_Entity_Info): Use procedural Next_Index. * sem_aggr.adb (Collect_Aggr_Bounds): Reuse local constant. (Resolve_Null_Array_Aggregate): Use procedural Next_Index.
-rw-r--r--gcc/ada/einfo-utils.adb2
-rw-r--r--gcc/ada/sem_aggr.adb6
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb
index fa28a9e..d1db66f 100644
--- a/gcc/ada/einfo-utils.adb
+++ b/gcc/ada/einfo-utils.adb
@@ -3171,7 +3171,7 @@ package body Einfo.Utils is
Index := First_Index (Id);
while Present (Index) loop
Write_Attribute (" ", Etype (Index));
- Index := Next_Index (Index);
+ Next_Index (Index);
end loop;
Write_Eol;
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 33c44c4..d9520ca 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -464,8 +464,8 @@ package body Sem_Aggr is
This_Range : constant Node_Id := Aggregate_Bounds (N);
-- The aggregate range node of this specific sub-aggregate
- This_Low : constant Node_Id := Low_Bound (Aggregate_Bounds (N));
- This_High : constant Node_Id := High_Bound (Aggregate_Bounds (N));
+ This_Low : constant Node_Id := Low_Bound (This_Range);
+ This_High : constant Node_Id := High_Bound (This_Range);
-- The aggregate bounds of this specific sub-aggregate
Assoc : Node_Id;
@@ -4175,7 +4175,7 @@ package body Sem_Aggr is
Append (Make_Range (Loc, New_Copy_Tree (Lo), Hi), Constr);
Analyze_And_Resolve (Last (Constr), Etype (Index));
- Index := Next_Index (Index);
+ Next_Index (Index);
end loop;
Set_Compile_Time_Known_Aggregate (N);