]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ada: Remove unnecessary qualifiers for First/Next list operations
authorPiotr Trojanek <trojanek@adacore.com>
Thu, 2 Mar 2023 21:43:12 +0000 (22:43 +0100)
committerMarc Poulhiès <dkm@gcc.gnu.org>
Tue, 7 Jan 2025 12:33:33 +0000 (13:33 +0100)
Code cleanup related to work on expression functions for GNATprove
(which require accessibility checks even when they are not expanded
and thus have no explicit return statements).

gcc/ada/ChangeLog:

* accessibility.adb (First_Selector): Remove redundant and locally
inconsistent parenthesis.
(Check_Return_Construct_Accessibility): Remove qualifier from list
operation.
* sem_util.adb (Is_Prim_Of_Abst_Type_With_Nonstatic_CW_Pre_Post):
Likewise.

gcc/ada/accessibility.adb
gcc/ada/sem_util.adb

index 376eb9d0bb9414fb1fecbb44544d459171f6ae73..1d7d3a137862c2d6a7fc42a572d0cc4f2eb7a3ac 100644 (file)
@@ -1213,7 +1213,7 @@ package body Accessibility is
             return First (Choices (Assoc));
 
          elsif Nkind (Assoc) = N_Discriminant_Association then
-            return (First (Selector_Names (Assoc)));
+            return First (Selector_Names (Assoc));
 
          else
             raise Program_Error;
@@ -1292,7 +1292,7 @@ package body Accessibility is
                exit;
             end if;
 
-            Nlists.Next (Return_Con);
+            Next (Return_Con);
          end loop;
 
          pragma Assert (Present (Return_Con));
@@ -1693,7 +1693,7 @@ package body Accessibility is
          if not Is_List_Member (Assoc) then
             exit;
          else
-            Nlists.Next (Assoc);
+            Next (Assoc);
          end if;
       end loop;
    end Check_Return_Construct_Accessibility;
index 24f27d081673d058674e7ffd280f64289c492db3..a11afa8be2d37ed2e638798095613d5d03388757 100644 (file)
@@ -12654,8 +12654,7 @@ package body Sem_Util is
               and then Class_Present (Prag)
             then
                Pragma_Arg :=
-                 Nlists.First
-                   (Pragma_Argument_Associations (Prag));
+                 First (Pragma_Argument_Associations (Prag));
 
                if not Is_Static_Expression (Expression (Pragma_Arg)) then
                   return True;