Routine Next is implemented both as a procedure and as a function. The
procedure variant seems meant to be used when iterating, e.g.:
Next (Decl);
because it is more readable than the corresponding functions:
Decl := Next (Decl);
(and it is inlined anyway, so there is no performance penalty). This
patch makes use of the procedure variants where possible; uses of
function were detected with:
$ grep " \([[:alpha:]_]\+\) := Next (\1)" *.adb
Note: procedural version is kept in sem_prag.adb, where it is used to
iterate over pragma arguments and it feels more readable there.
Semantics is unaffected.
Tested on x86_64-pc-linux-gnu, committed on trunk
2020-06-11 Piotr Trojanek <troja...@adacore.com>
gcc/ada/
* checks.adb, exp_ch7.adb, exp_ch9.adb, exp_smem.adb, lib.adb,
nlists.adb, sem.adb, sem_aggr.adb, sem_ch3.adb, sem_ch6.adb,
sem_ch8.adb, sem_dim.adb, sem_res.adb, sem_util.adb,
sem_warn.adb: Replace uses of Next function with procedure.--- gcc/ada/checks.adb
+++ gcc/ada/checks.adb
@@ -3531,7 +3531,7 @@ package body Checks is
-- Move to next subscript
- Sub := Next (Sub);
+ Next (Sub);
end loop;
end Apply_Subscript_Validity_Checks;
--- gcc/ada/exp_ch7.adb
+++ gcc/ada/exp_ch7.adb
@@ -2852,7 +2852,7 @@ package body Exp_Ch7 is
exit;
end if;
- Result := Next (Result);
+ Next (Result);
end loop;
return Result;
@@ -2895,7 +2895,7 @@ package body Exp_Ch7 is
if No_Initialization (Decl) then
if No (Expression (Last_Init)) then
loop
- Last_Init := Next (Last_Init);
+ Next (Last_Init);
exit when No (Last_Init);
exit when Nkind (Last_Init) = N_Object_Declaration
and then Nkind (Expression (Last_Init)) = N_Reference
--- gcc/ada/exp_ch9.adb
+++ gcc/ada/exp_ch9.adb
@@ -2130,7 +2130,7 @@ package body Exp_Ch9 is
if Present (First_Formal (Iface_Op))
and then Is_Controlling_Formal (First_Formal (Iface_Op))
then
- Iface_Op_Param := Next (Iface_Op_Param);
+ Next (Iface_Op_Param);
end if;
Wrapper_Param := First (Wrapper_Params);
@@ -2215,7 +2215,7 @@ package body Exp_Ch9 is
if Is_Private_Primitive_Subprogram (Subp_Id)
and then not Has_Controlling_Result (Subp_Id)
then
- Formal := Next (Formal);
+ Next (Formal);
end if;
while Present (Formal) loop
--- gcc/ada/exp_smem.adb
+++ gcc/ada/exp_smem.adb
@@ -454,7 +454,7 @@ package body Exp_Smem is
begin
while Next (Nod) /= After loop
- Nod := Next (Nod);
+ Next (Nod);
end loop;
return Nod;
--- gcc/ada/lib.adb
+++ gcc/ada/lib.adb
@@ -1335,7 +1335,7 @@ package body Lib is
and then (Nkind (Context_Item) /= N_With_Clause
or else Limited_Present (Context_Item))
loop
- Context_Item := Next (Context_Item);
+ Next (Context_Item);
end loop;
if Present (Context_Item) then
@@ -1359,7 +1359,7 @@ package body Lib is
Write_Eol;
end if;
- Context_Item := Next (Context_Item);
+ Next (Context_Item);
end loop;
Outdent;
--- gcc/ada/nlists.adb
+++ gcc/ada/nlists.adb
@@ -243,7 +243,7 @@ package body Nlists is
N := F;
loop
Set_List_Link (N, To);
- N := Next (N);
+ Next (N);
exit when No (N);
end loop;
@@ -530,7 +530,7 @@ package body Nlists is
loop
Set_List_Link (N, LC);
exit when N = L;
- N := Next (N);
+ Next (N);
end loop;
if Present (Before) then
@@ -597,7 +597,7 @@ package body Nlists is
loop
Set_List_Link (N, LC);
exit when N = L;
- N := Next (N);
+ Next (N);
end loop;
if Present (After) then
@@ -699,7 +699,7 @@ package body Nlists is
Node := First (List);
while Present (Node) loop
Result := Result + 1;
- Node := Next (Node);
+ Next (Node);
end loop;
return Result;
@@ -756,7 +756,7 @@ package body Nlists is
while Present (E) loop
Append (New_Copy (E), NL);
- E := Next (E);
+ Next (E);
end loop;
return NL;
@@ -784,7 +784,7 @@ package body Nlists is
Append (New_Copy (E), NL);
end if;
- E := Next (E);
+ Next (E);
end loop;
return NL;
@@ -990,7 +990,7 @@ package body Nlists is
begin
N := Node;
loop
- N := Next (N);
+ Next (N);
exit when not Nkind_In (N, N_Pragma, N_Null_Statement);
end loop;
@@ -1040,7 +1040,7 @@ package body Nlists is
begin
Elmt := First (List);
for J in 1 .. Index - 1 loop
- Elmt := Next (Elmt);
+ Next (Elmt);
end loop;
return Elmt;
--- gcc/ada/sem.adb
+++ gcc/ada/sem.adb
@@ -2377,7 +2377,7 @@ package body Sem is
Action (Lib_Unit);
end if;
- Context_Item := Next (Context_Item);
+ Next (Context_Item);
end loop;
end Walk_Withs_Immediate;
--- gcc/ada/sem_aggr.adb
+++ gcc/ada/sem_aggr.adb
@@ -4170,7 +4170,7 @@ package body Sem_Aggr is
raise Unrecoverable_Error;
end if;
- Assoc := Next (Assoc);
+ Next (Assoc);
end loop;
end;
end if;
--- gcc/ada/sem_ch3.adb
+++ gcc/ada/sem_ch3.adb
@@ -1032,7 +1032,7 @@ package body Sem_Ch3 is
Param := First (Parameter_Specifications (Def));
while Present (Param) loop
Check_For_Premature_Usage (Parameter_Type (Param));
- Param := Next (Param);
+ Next (Param);
end loop;
end if;
--- gcc/ada/sem_ch6.adb
+++ gcc/ada/sem_ch6.adb
@@ -7340,10 +7340,10 @@ package body Sem_Ch6 is
-- rest of the parameters.
if not In_Scope then
- Prim_Param := Next (Prim_Param);
+ Next (Prim_Param);
end if;
- Iface_Param := Next (Iface_Param);
+ Next (Iface_Param);
while Present (Iface_Param) and then Present (Prim_Param) loop
Iface_Id := Defining_Identifier (Iface_Param);
Iface_Typ := Find_Parameter_Type (Iface_Param);
--- gcc/ada/sem_ch8.adb
+++ gcc/ada/sem_ch8.adb
@@ -7230,7 +7230,7 @@ package body Sem_Ch8 is
return True;
end if;
- Clause := Next (Clause);
+ Next (Clause);
end loop;
return False;
--- gcc/ada/sem_dim.adb
+++ gcc/ada/sem_dim.adb
@@ -681,7 +681,7 @@ package body Sem_Dim is
-- Skip the symbol expression when present
if Present (Symbol_Expr) and then Num_Choices = 0 then
- Expr := Next (Expr);
+ Next (Expr);
end if;
Position := Low_Position_Bound;
--- gcc/ada/sem_res.adb
+++ gcc/ada/sem_res.adb
@@ -4960,7 +4960,7 @@ package body Sem_Res is
Expr := Next (First (Expressions (Disc_Exp)));
if Present (Expr) then
Check_Allocator_Discrim_Accessibility_Exprs (Expr, Alloc_Typ);
- Expr := Next (Expr);
+ Next (Expr);
if Present (Expr) then
Check_Allocator_Discrim_Accessibility_Exprs
(Expr, Alloc_Typ);
@@ -9276,7 +9276,7 @@ package body Sem_Res is
end loop;
end if;
- Alt := Next (Alt);
+ Next (Alt);
end loop;
end;
end if;
--- gcc/ada/sem_util.adb
+++ gcc/ada/sem_util.adb
@@ -10169,7 +10169,7 @@ package body Sem_Util is
return Entity (Expression (Assoc));
end if;
- Assoc := Next (Assoc);
+ Next (Assoc);
end loop;
return Empty;
@@ -13824,7 +13824,7 @@ package body Sem_Util is
Defining_Identifier (Decl));
end if;
- Decl := Next (Decl);
+ Next (Decl);
end loop;
end Inspect_Deferred_Constant_Completion;
@@ -20661,7 +20661,7 @@ package body Sem_Util is
while Present (E) loop
Append (New_Copy_Tree (E), NL);
- E := Next (E);
+ Next (E);
end loop;
return NL;
@@ -28309,7 +28309,7 @@ package body Sem_Util is
begin
for Idx in Result'Range loop
Result (Idx) := Chosen_Interval (Range_Or_Expr);
- Range_Or_Expr := Next (Range_Or_Expr);
+ Next (Range_Or_Expr);
end loop;
pragma Assert (not Present (Range_Or_Expr));
Check_Consistency (Result);
@@ -28492,7 +28492,7 @@ package body Sem_Util is
Count := Count + 1; -- an ordinary expression or range
end if;
- Choice := Next (Choice);
+ Next (Choice);
end loop;
return Count;
end Unmerged_Choice_Count;
@@ -28510,14 +28510,14 @@ package body Sem_Util is
while Present (Others_Choice) loop
Count := Count + 1;
Result (Count) := Chosen_Interval (Others_Choice);
- Others_Choice := Next (Others_Choice);
+ Next (Others_Choice);
end loop;
end;
else
Count := Count + 1;
Result (Count) := Chosen_Interval (Choice);
end if;
- Choice := Next (Choice);
+ Next (Choice);
end loop;
pragma Assert (Count = Result'Last);
Normalize_Interval_List (Result, Count);
--- gcc/ada/sem_warn.adb
+++ gcc/ada/sem_warn.adb
@@ -4734,7 +4734,7 @@ package body Sem_Warn is
return;
end if;
- X := Next (X);
+ Next (X);
end loop;
end if;
end if;
