diff options
author | Piotr Trojanek <trojanek@adacore.com> | 2024-07-05 13:01:08 +0200 |
---|---|---|
committer | Marc Poulhiès <dkm@gcc.gnu.org> | 2024-08-02 09:08:09 +0200 |
commit | 4d9dfa0082ee46ce969283fafe67b2008ab661fc (patch) | |
tree | e2279bf0e9a007d9c74aa5388f42b23937786f59 /gcc | |
parent | 32c4a7278fd182af126c4f37228e467a3e4db568 (diff) | |
download | gcc-4d9dfa0082ee46ce969283fafe67b2008ab661fc.zip gcc-4d9dfa0082ee46ce969283fafe67b2008ab661fc.tar.gz gcc-4d9dfa0082ee46ce969283fafe67b2008ab661fc.tar.bz2 |
ada: Simplify code by reusing Choice_List
Code cleanup; semantics is unaffected.
gcc/ada/
* exp_aggr.adb (Gen_Assign): Fix layout.
* sem_aggr.adb (Empty_Range): Reuse Choice_List.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/exp_aggr.adb | 8 | ||||
-rw-r--r-- | gcc/ada/sem_aggr.adb | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 25af78a..7a2d057 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -1010,8 +1010,8 @@ package body Exp_Aggr is -- Returns a new reference to the index type name function Gen_Assign - (Ind : Node_Id; - Expr : Node_Id) return List_Id; + (Ind : Node_Id; + Expr : Node_Id) return List_Id; -- Ind must be a side-effect-free expression. If the input aggregate N -- to Build_Loop contains no subaggregates, then this function returns -- the assignment statement: @@ -1237,8 +1237,8 @@ package body Exp_Aggr is ---------------- function Gen_Assign - (Ind : Node_Id; - Expr : Node_Id) return List_Id + (Ind : Node_Id; + Expr : Node_Id) return List_Id is function Add_Loop_Actions (Lis : List_Id) return List_Id; -- Collect insert_actions generated in the construction of a loop, diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 565f2cb..656d789 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -2735,15 +2735,9 @@ package body Sem_Aggr is ----------------- function Empty_Range (A : Node_Id) return Boolean is - R : Node_Id; + R : constant Node_Id := First (Choice_List (A)); begin - if Nkind (A) = N_Iterated_Component_Association then - R := First (Discrete_Choices (A)); - else - R := First (Choices (A)); - end if; - return No (Next (R)) and then Nkind (R) = N_Range and then Compile_Time_Compare |