Merge branch 'mr/jicquel/github.PR#76' into 'master'

Github PR#76: Prefer quantified expressions See merge request eng/toolchain/gnatcoll-core!87
AdaCore · Mar 20, 2024 · abae75c · abae75c
2 parents 35b6ab0 + f4dc8f7
commit abae75c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 61 deletions.
diff --git a/src/gnatcoll-json.adb b/src/gnatcoll-json.adb
@@ -1609,13 +1609,9 @@ package body GNATCOLL.JSON is
    function Has_Field (Val : JSON_Value; Field : UTF8_String) return Boolean is
       Vals : Object_Items_Pkg.Vector renames Val.Data.Obj_Value.Vals;
    begin
-      for J in Vals.First_Index .. Vals.Last_Index loop
-         if Field = Vals.Element (J).Key then
-            return True;
-         end if;
-      end loop;
-
-      return False;
+      return
+        (for some J in Vals.First_Index .. Vals.Last_Index =>
+           Field = Vals.Element (J).Key);
    end Has_Field;
 
    ---------
@@ -1748,16 +1744,14 @@ package body GNATCOLL.JSON is
             then
                return False;
             else
-               for J in Left.Data.Arr_Value.Arr.Vals.First_Index ..
-                 Left.Data.Arr_Value.Arr.Vals.Last_Index
-               loop
-                  if not (Left.Data.Arr_Value.Arr.Vals (J) =  --  recursive
-                            Right.Data.Arr_Value.Arr.Vals (J))
-                  then
-                     return False;
-                  end if;
-               end loop;
-               return True;
+               return
+                 (for all J in
+                    Left.Data.Arr_Value.Arr.Vals.First_Index ..
+                      Left.Data.Arr_Value.Arr.Vals.Last_Index
+                  =>
+                    (Left.Data.Arr_Value.Arr.Vals (J) =  --  recursive
+
+                     Right.Data.Arr_Value.Arr.Vals (J)));
             end if;
 
          when JSON_Object_Type =>

diff --git a/src/gnatcoll-strings_impl.adb b/src/gnatcoll-strings_impl.adb
@@ -2512,12 +2512,7 @@ package body GNATCOLL.Strings_Impl is
 
       function Is_Upper (Self : XString) return Boolean is
       begin
-         for C of Self loop
-            if C /= To_Upper (C) then
-               return False;
-            end if;
-         end loop;
-         return True;
+         return (for all C of Self => (C = To_Upper (C)));
       end Is_Upper;
 
       --------------
@@ -2526,12 +2521,7 @@ package body GNATCOLL.Strings_Impl is
 
       function Is_Lower (Self : XString) return Boolean is
       begin
-         for C of Self loop
-            if C /= To_Lower (C) then
-               return False;
-            end if;
-         end loop;
-         return True;
+         return (for all C of Self => (C = To_Lower (C)));
       end Is_Lower;
 
    end Strings;

diff --git a/src/gnatcoll-utils.adb b/src/gnatcoll-utils.adb
@@ -1098,16 +1098,11 @@ package body GNATCOLL.Utils is
                --  pattern will consume a character from Str
                --  (i.e next character in Pattern is not a ' * ').
 
-               for Index in S_I .. Str'Last loop
-                  if Match
-                    (Str (Index .. Str'Last),
-                     Pattern (P_I .. Pattern'Last))
-                  then
-                     return True;
-                  end if;
-               end loop;
-
-               return False;
+               return
+                 (for some Index in S_I .. Str'Last =>
+                    Match
+                      (Str (Index .. Str'Last),
+                       Pattern (P_I .. Pattern'Last)));
 
             when others =>
                Next_Str_Char;

diff --git a/src/projects/gnatcoll-projects-normalize.adb b/src/projects/gnatcoll-projects-normalize.adb
@@ -436,15 +436,10 @@ package body GNATCOLL.Projects.Normalize is
                  Ext_Variable_Name;
 
             when N_Variable_Reference =>
-               for J in Variable_Nodes'First .. Variable_Nodes_Last loop
-                  if GPR.Tree.Name_Of (Node, Tree) =
-                    GPR.Tree.Name_Of (Variable_Nodes (J), Tree)
-                  then
-                     return True;
-                  end if;
-               end loop;
-
-               return False;
+               return
+                 (for some J in Variable_Nodes'First .. Variable_Nodes_Last =>
+                    GPR.Tree.Name_Of (Node, Tree) =
+                    GPR.Tree.Name_Of (Variable_Nodes (J), Tree));
 
             when others =>
                return False;

diff --git a/src/projects/gnatcoll-projects.adb b/src/projects/gnatcoll-projects.adb
@@ -3903,13 +3903,7 @@ package body GNATCOLL.Projects is
          return True;
       end if;
 
-      for T of Host_Targets_List loop
-         if T = Tgt then
-            return True;
-         end if;
-      end loop;
-
-      return False;
+      return (for some T of Host_Targets_List => T = Tgt);
    end Target_Same_As_Host;
 
    ------------------
@@ -5409,12 +5403,7 @@ package body GNATCOLL.Projects is
          Ext_Name : GPR.Name_Id) return Boolean
       is
       begin
-         for I in 1 .. Last - 1 loop
-            if UVs (I).Name = Ext_Name then
-               return False;
-            end if;
-         end loop;
-         return True;
+         return (for all I in 1 .. Last - 1 => (UVs (I).Name /= Ext_Name));
       end Not_Already;
 
       ------------------