From: Piotr Trojanek <[email protected]>

Put code for Interrupts_System_By_Default in alphabetic order. Code cleanup.

gcc/ada/ChangeLog:

        * par-prag.adb (Prag): Fix order.
        * sem_prag.adb (Analyze_Pragma, Sig_Flags): Likewise.
        * snames.ads-tmpl (Preset Names, Pragma_Id): Likewise.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/par-prag.adb    |  2 +-
 gcc/ada/sem_prag.adb    | 26 +++++++++++++-------------
 gcc/ada/snames.ads-tmpl |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gcc/ada/par-prag.adb b/gcc/ada/par-prag.adb
index b3c6f153502..63eb2ddb695 100644
--- a/gcc/ada/par-prag.adb
+++ b/gcc/ada/par-prag.adb
@@ -1490,6 +1490,7 @@ begin
          | Pragma_Interrupt_Handler
          | Pragma_Interrupt_Priority
          | Pragma_Interrupt_State
+         | Pragma_Interrupts_System_By_Default
          | Pragma_Invariant
          | Pragma_Keep_Names
          | Pragma_License
@@ -1519,7 +1520,6 @@ begin
          | Pragma_No_Raise
          | Pragma_No_Return
          | Pragma_No_Run_Time
-         | Pragma_Interrupts_System_By_Default
          | Pragma_No_Strict_Aliasing
          | Pragma_No_Tagged_Streams
          | Pragma_Normalize_Scalars
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index a22ae61cd55..18c3315bcee 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -21108,6 +21108,18 @@ package body Sem_Prag is
             end loop;
          end Interrupt_State;
 
+         ----------------------------------
+         -- Interrupts_System_By_Default --
+         ----------------------------------
+
+         --  pragma Interrupts_System_By_Default;
+
+         when Pragma_Interrupts_System_By_Default =>
+            GNAT_Pragma;
+            Check_Arg_Count (0);
+            Check_Valid_Configuration_Pragma;
+            Interrupts_System_By_Default := True;
+
          ---------------
          -- Invariant --
          ---------------
@@ -22772,18 +22784,6 @@ package body Sem_Prag is
                end if;
             end;
 
-         ----------------------------------
-         -- Interrupts_System_By_Default --
-         ----------------------------------
-
-         --  pragma Interrupts_System_By_Default;
-
-         when Pragma_Interrupts_System_By_Default =>
-            GNAT_Pragma;
-            Check_Arg_Count (0);
-            Check_Valid_Configuration_Pragma;
-            Interrupts_System_By_Default := True;
-
          -----------------------
          -- No_Tagged_Streams --
          -----------------------
@@ -34917,6 +34917,7 @@ package body Sem_Prag is
       Pragma_Interrupt_Handler              => -1,
       Pragma_Interrupt_Priority             => -1,
       Pragma_Interrupt_State                => -1,
+      Pragma_Interrupts_System_By_Default   =>  0,
       Pragma_Invariant                      => -1,
       Pragma_Keep_Names                     =>  0,
       Pragma_License                        =>  0,
@@ -34947,7 +34948,6 @@ package body Sem_Prag is
       Pragma_No_Raise                       =>  0,
       Pragma_No_Return                      =>  0,
       Pragma_No_Run_Time                    => -1,
-      Pragma_Interrupts_System_By_Default   =>  0,
       Pragma_No_Strict_Aliasing             => -1,
       Pragma_No_Tagged_Streams              =>  0,
       Pragma_Normalize_Scalars              =>  0,
diff --git a/gcc/ada/snames.ads-tmpl b/gcc/ada/snames.ads-tmpl
index c9948d926a0..3fa60851c95 100644
--- a/gcc/ada/snames.ads-tmpl
+++ b/gcc/ada/snames.ads-tmpl
@@ -463,12 +463,12 @@ package Snames is
    Name_Implicit_Packing               : constant Name_Id := N + $; -- GNAT
    Name_Initialize_Scalars             : constant Name_Id := N + $; -- GNAT
    Name_Interrupt_State                : constant Name_Id := N + $; -- GNAT
+   Name_Interrupts_System_By_Default   : constant Name_Id := N + $; -- GNAT
    Name_License                        : constant Name_Id := N + $; -- GNAT
    Name_Locking_Policy                 : constant Name_Id := N + $;
    Name_No_Component_Reordering        : constant Name_Id := N + $; -- GNAT
    Name_No_Heap_Finalization           : constant Name_Id := N + $; -- GNAT
    Name_No_Run_Time                    : constant Name_Id := N + $; -- GNAT
-   Name_Interrupts_System_By_Default   : constant Name_Id := N + $; -- GNAT
    Name_No_Strict_Aliasing             : constant Name_Id := N + $; -- GNAT
    Name_Normalize_Scalars              : constant Name_Id := N + $;
    Name_Optimize_Alignment             : constant Name_Id := N + $; -- GNAT
@@ -1814,12 +1814,12 @@ package Snames is
       Pragma_Implicit_Packing,
       Pragma_Initialize_Scalars,
       Pragma_Interrupt_State,
+      Pragma_Interrupts_System_By_Default,
       Pragma_License,
       Pragma_Locking_Policy,
       Pragma_No_Component_Reordering,
       Pragma_No_Heap_Finalization,
       Pragma_No_Run_Time,
-      Pragma_Interrupts_System_By_Default,
       Pragma_No_Strict_Aliasing,
       Pragma_Normalize_Scalars,
       Pragma_Optimize_Alignment,
-- 
2.53.0

Reply via email to