From cb539f3b30f59c7a53bac36aa94962e9cb99fb0e Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Wed, 25 Mar 2020 18:59:04 +0100 Subject: [PATCH] [Ada] Alphabetic ordering for name and pragmas 2020-06-12 Piotr Trojanek gcc/ada/ * par-prag.adb: Fix ordering. * snames.ads-tmpl (Name_Test_Case, Pragma_Test_Case): Likewise. * sem_prag.adb (Sig_Flags): Likewise. --- gcc/ada/par-prag.adb | 22 +++++++++++----------- gcc/ada/sem_prag.adb | 16 ++++++++-------- gcc/ada/snames.ads-tmpl | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gcc/ada/par-prag.adb b/gcc/ada/par-prag.adb index 0a1905affee..db6808db3ed 100644 --- a/gcc/ada/par-prag.adb +++ b/gcc/ada/par-prag.adb @@ -1350,21 +1350,21 @@ begin | Pragma_Convention | Pragma_Deadline_Floor | Pragma_Debug_Policy - | Pragma_Depends - | Pragma_Detect_Blocking | Pragma_Default_Initial_Condition | Pragma_Default_Scalar_Storage_Order | Pragma_Default_Storage_Pool + | Pragma_Depends + | Pragma_Detect_Blocking | Pragma_Disable_Atomic_Synchronization | Pragma_Discard_Names | Pragma_Dispatching_Domain | Pragma_Effective_Reads | Pragma_Effective_Writes - | Pragma_Eliminate | Pragma_Elaborate | Pragma_Elaborate_All | Pragma_Elaborate_Body | Pragma_Elaboration_Checks + | Pragma_Eliminate | Pragma_Enable_Atomic_Synchronization | Pragma_Export | Pragma_Export_Function @@ -1376,8 +1376,8 @@ begin | Pragma_Extensions_Visible | Pragma_External | Pragma_External_Name_Casing - | Pragma_Favor_Top_Level | Pragma_Fast_Math + | Pragma_Favor_Top_Level | Pragma_Finalize_Storage_Only | Pragma_Ghost | Pragma_Global @@ -1402,8 +1402,8 @@ begin | Pragma_Interface | Pragma_Interface_Name | Pragma_Interrupt_Handler - | Pragma_Interrupt_State | Pragma_Interrupt_Priority + | Pragma_Interrupt_State | Pragma_Invariant | Pragma_Keep_Names | Pragma_License @@ -1437,9 +1437,9 @@ begin | Pragma_No_Tagged_Streams | Pragma_Normalize_Scalars | Pragma_Obsolescent - | Pragma_Ordered | Pragma_Optimize | Pragma_Optimize_Alignment + | Pragma_Ordered | Pragma_Overflow_Mode | Pragma_Overriding_Renamings | Pragma_Pack @@ -1469,6 +1469,8 @@ begin | Pragma_Pure | Pragma_Pure_Function | Pragma_Queuing_Policy + | Pragma_Rational + | Pragma_Ravenscar | Pragma_Refined_Depends | Pragma_Refined_Global | Pragma_Refined_Post @@ -1477,10 +1479,8 @@ begin | Pragma_Remote_Access_Type | Pragma_Remote_Call_Interface | Pragma_Remote_Types - | Pragma_Restricted_Run_Time - | Pragma_Rational - | Pragma_Ravenscar | Pragma_Rename_Pragma + | Pragma_Restricted_Run_Time | Pragma_Reviewable | Pragma_Secondary_Stack_Size | Pragma_Share_Generic @@ -1490,9 +1490,9 @@ begin | Pragma_Short_Descriptors | Pragma_Simple_Storage_Pool_Type | Pragma_SPARK_Mode + | Pragma_Static_Elaboration_Desired | Pragma_Storage_Size | Pragma_Storage_Unit - | Pragma_Static_Elaboration_Desired | Pragma_Stream_Convert | Pragma_Subtitle | Pragma_Suppress @@ -1522,12 +1522,12 @@ begin | Pragma_Unsuppress | Pragma_Unused | Pragma_Use_VADS_Size + | Pragma_Validity_Checks | Pragma_Volatile | Pragma_Volatile_Components | Pragma_Volatile_Full_Access | Pragma_Volatile_Function | Pragma_Weak_External - | Pragma_Validity_Checks => null; diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 75d5b0e4ae8..a7356c749cc 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -30876,11 +30876,11 @@ package body Sem_Prag is Pragma_Deadline_Floor => -1, Pragma_Debug => -1, Pragma_Debug_Policy => 0, - Pragma_Detect_Blocking => 0, Pragma_Default_Initial_Condition => -1, Pragma_Default_Scalar_Storage_Order => 0, Pragma_Default_Storage_Pool => 0, Pragma_Depends => -1, + Pragma_Detect_Blocking => 0, Pragma_Disable_Atomic_Synchronization => 0, Pragma_Discard_Names => 0, Pragma_Dispatching_Domain => -1, @@ -30902,9 +30902,9 @@ package body Sem_Prag is Pragma_Extensions_Allowed => 0, Pragma_Extensions_Visible => 0, Pragma_External => -1, - Pragma_Favor_Top_Level => 0, Pragma_External_Name_Casing => 0, Pragma_Fast_Math => 0, + Pragma_Favor_Top_Level => 0, Pragma_Finalize_Storage_Only => 0, Pragma_Ghost => 0, Pragma_Global => -1, @@ -30968,9 +30968,9 @@ package body Sem_Prag is Pragma_Obsolescent => 0, Pragma_Optimize => 0, Pragma_Optimize_Alignment => 0, + Pragma_Ordered => 0, Pragma_Overflow_Mode => 0, Pragma_Overriding_Renamings => 0, - Pragma_Ordered => 0, Pragma_Pack => 0, Pragma_Page => 0, Pragma_Part_Of => 0, @@ -30978,7 +30978,6 @@ package body Sem_Prag is Pragma_Passive => 0, Pragma_Persistent_BSS => 0, Pragma_Polling => 0, - Pragma_Prefix_Exception_Messages => 0, Pragma_Post => -1, Pragma_Postcondition => -1, Pragma_Post_Class => -1, @@ -30988,6 +30987,7 @@ package body Sem_Prag is Pragma_Predicate_Failure => -1, Pragma_Preelaborable_Initialization => -1, Pragma_Preelaborate => 0, + Pragma_Prefix_Exception_Messages => 0, Pragma_Pre_Class => -1, Pragma_Priority => -1, Pragma_Priority_Specific_Dispatching => 0, @@ -31006,35 +31006,35 @@ package body Sem_Prag is Pragma_Refined_Post => -1, Pragma_Refined_State => -1, Pragma_Relative_Deadline => 0, - Pragma_Rename_Pragma => 0, Pragma_Remote_Access_Type => -1, Pragma_Remote_Call_Interface => -1, Pragma_Remote_Types => -1, + Pragma_Rename_Pragma => 0, Pragma_Restricted_Run_Time => 0, Pragma_Restriction_Warnings => 0, Pragma_Restrictions => 0, Pragma_Reviewable => -1, Pragma_Secondary_Stack_Size => -1, - Pragma_Short_Circuit_And_Or => 0, Pragma_Share_Generic => 0, Pragma_Shared => 0, Pragma_Shared_Passive => 0, + Pragma_Short_Circuit_And_Or => 0, Pragma_Short_Descriptors => 0, Pragma_Simple_Storage_Pool_Type => 0, Pragma_Source_File_Name => 0, Pragma_Source_File_Name_Project => 0, Pragma_Source_Reference => 0, Pragma_SPARK_Mode => 0, + Pragma_Static_Elaboration_Desired => 0, Pragma_Storage_Size => -1, Pragma_Storage_Unit => 0, - Pragma_Static_Elaboration_Desired => 0, Pragma_Stream_Convert => 0, Pragma_Style_Checks => 0, Pragma_Subtitle => 0, Pragma_Suppress => 0, - Pragma_Suppress_Exception_Locations => 0, Pragma_Suppress_All => 0, Pragma_Suppress_Debug_Info => 0, + Pragma_Suppress_Exception_Locations => 0, Pragma_Suppress_Initialization => 0, Pragma_System_Name => 0, Pragma_Task_Dispatching_Policy => 0, diff --git a/gcc/ada/snames.ads-tmpl b/gcc/ada/snames.ads-tmpl index a1a7bf7bfca..871178814f4 100644 --- a/gcc/ada/snames.ads-tmpl +++ b/gcc/ada/snames.ads-tmpl @@ -667,10 +667,10 @@ package Snames is Name_Suppress_Debug_Info : constant Name_Id := N + $; -- GNAT Name_Suppress_Initialization : constant Name_Id := N + $; -- GNAT Name_System_Name : constant Name_Id := N + $; -- Ada 83 - Name_Test_Case : constant Name_Id := N + $; -- GNAT Name_Task_Info : constant Name_Id := N + $; -- GNAT Name_Task_Name : constant Name_Id := N + $; -- GNAT Name_Task_Storage : constant Name_Id := N + $; -- GNAT + Name_Test_Case : constant Name_Id := N + $; -- GNAT Name_Thread_Local_Storage : constant Name_Id := N + $; -- GNAT Name_Time_Slice : constant Name_Id := N + $; -- GNAT Name_Title : constant Name_Id := N + $; -- GNAT @@ -2087,10 +2087,10 @@ package Snames is Pragma_Suppress_Debug_Info, Pragma_Suppress_Initialization, Pragma_System_Name, - Pragma_Test_Case, Pragma_Task_Info, Pragma_Task_Name, Pragma_Task_Storage, + Pragma_Test_Case, Pragma_Thread_Local_Storage, Pragma_Time_Slice, Pragma_Title, -- 2.30.2