aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2023-04-10 10:12:13 +0200
committerMarc Poulhiès <poulhies@adacore.com>2023-05-30 09:12:16 +0200
commit32e6ea21745153b440cb56b96d35a4b06bb473d6 (patch)
tree4d8a48546df058c7002ea7d69ac76ad49351e23e
parent3590b8e7850cc77324c0116718d3587401142d1c (diff)
downloadgcc-32e6ea21745153b440cb56b96d35a4b06bb473d6.zip
gcc-32e6ea21745153b440cb56b96d35a4b06bb473d6.tar.gz
gcc-32e6ea21745153b440cb56b96d35a4b06bb473d6.tar.bz2
ada: Use generalized loop iteration in Put_Image routines
gcc/ada/ * libgnat/a-cidlli.adb (Put_Image): Simplify. * libgnat/a-coinve.adb (Put_Image): Likewise.
-rw-r--r--gcc/ada/libgnat/a-cidlli.adb13
-rw-r--r--gcc/ada/libgnat/a-coinve.adb13
2 files changed, 10 insertions, 16 deletions
diff --git a/gcc/ada/libgnat/a-cidlli.adb b/gcc/ada/libgnat/a-cidlli.adb
index 65582d1..9e6ad70 100644
--- a/gcc/ada/libgnat/a-cidlli.adb
+++ b/gcc/ada/libgnat/a-cidlli.adb
@@ -1283,22 +1283,19 @@ is
is
First_Time : Boolean := True;
use System.Put_Images;
+ begin
+ Array_Before (S);
- procedure Put_Elem (Position : Cursor);
- procedure Put_Elem (Position : Cursor) is
- begin
+ for X of V loop
if First_Time then
First_Time := False;
else
Simple_Array_Between (S);
end if;
- Element_Type'Put_Image (S, Element (Position));
- end Put_Elem;
+ Element_Type'Put_Image (S, X);
+ end loop;
- begin
- Array_Before (S);
- Iterate (V, Put_Elem'Access);
Array_After (S);
end Put_Image;
diff --git a/gcc/ada/libgnat/a-coinve.adb b/gcc/ada/libgnat/a-coinve.adb
index 846f819..dd0e8cd 100644
--- a/gcc/ada/libgnat/a-coinve.adb
+++ b/gcc/ada/libgnat/a-coinve.adb
@@ -2679,22 +2679,19 @@ is
is
First_Time : Boolean := True;
use System.Put_Images;
+ begin
+ Array_Before (S);
- procedure Put_Elem (Position : Cursor);
- procedure Put_Elem (Position : Cursor) is
- begin
+ for X of V loop
if First_Time then
First_Time := False;
else
Simple_Array_Between (S);
end if;
- Element_Type'Put_Image (S, Element (Position));
- end Put_Elem;
+ Element_Type'Put_Image (S, X);
+ end loop;
- begin
- Array_Before (S);
- Iterate (V, Put_Elem'Access);
Array_After (S);
end Put_Image;