[Ada] Minor wording changes wrt Ada 202x

2020-06-05  Arnaud Charlet  <charlet@adacore.com>

gcc/ada/

	* par-ch3.adb, par-ch4.adb, scng.adb, sem_aggr.adb,
	sem_ch10.adb, sem_ch12.adb, sem_prag.adb: Update wording: change
	Ada_2020 to Ada 2020 in comments and mention -gnat2020 instead
	of -gnatX switch.

diff --git a/gcc/ada/par-ch3.adb b/gcc/ada/par-ch3.adb
index 9065f4bb75ced1921f6c19ab82a74d11e9fdaedb..34d93632bdb9d0bdf329a1dfeee24be3c8dffb86 100644 (file)
--- a/gcc/ada/par-ch3.adb
+++ b/gcc/ada/par-ch3.adb
@@ -1487,7 +1487,7 @@ package body Ch3 is
          if Ada_Version < Ada_2020 then
             Error_Msg_SC
               ("object renaming without subtype is an Ada 202x feature");
-            Error_Msg_SC ("\compile with -gnatX");
+            Error_Msg_SC ("\compile with -gnat2020");
          end if;
 
          Scan; -- past renames

diff --git a/gcc/ada/par-ch4.adb b/gcc/ada/par-ch4.adb
index e759ce1ff26c3df10bf4d21f81a10b0b01df824e..68d56649fad41c65306a552928f1762b484298f1 100644 (file)
--- a/gcc/ada/par-ch4.adb
+++ b/gcc/ada/par-ch4.adb
@@ -1690,8 +1690,10 @@ package body Ch4 is
          Set_Component_Associations (Aggregate_Node, Assoc_List);
          Set_Is_Homogeneous_Aggregate (Aggregate_Node);
          Scan;  --  past right bracket
+
          if Token = Tok_Apostrophe then
             Scan;
+
             if Token = Tok_Identifier then
                return P_Reduction_Attribute_Reference (Aggregate_Node);
             end if;
@@ -2928,7 +2930,7 @@ package body Ch4 is
             when Tok_At_Sign =>  --  AI12-0125 : target_name
                if Ada_Version < Ada_2020 then
                   Error_Msg_SC ("target name is an Ada 202x feature");
-                  Error_Msg_SC ("\compile with -gnatX");
+                  Error_Msg_SC ("\compile with -gnat2020");
                end if;
 
                Node1 := P_Name;
@@ -3403,7 +3405,7 @@ package body Ch4 is
 
       if Ada_Version < Ada_2020 then
          Error_Msg_SC ("iterated component is an Ada 202x feature");
-         Error_Msg_SC ("\compile with -gnatX");
+         Error_Msg_SC ("\compile with -gnat2020");
       end if;
 
       return Assoc_Node;

diff --git a/gcc/ada/scng.adb b/gcc/ada/scng.adb
index d5da797327710737136617216c411dc3ed603583..e3da051f41b30ef662f39b9b18435b6d1407313d 100644 (file)
--- a/gcc/ada/scng.adb
+++ b/gcc/ada/scng.adb
@@ -1617,7 +1617,7 @@ package body Scng is
 
          when '@' =>
             if Ada_Version < Ada_2020 then
-               Error_Msg ("target_name is an Ada 2020 feature", Scan_Ptr);
+               Error_Msg ("target_name is an Ada 202x feature", Scan_Ptr);
                Scan_Ptr := Scan_Ptr + 1;
 
             else

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 1f2fd5995d9ee5664b9579cbf8ffdb23dddd0c0d..5e43417d8e131dc22f0e4fd29022b358809fa9e8 100644 (file)
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -2805,7 +2805,7 @@ package body Sem_Aggr is
    begin
       if Ada_Version < Ada_2020 then
          Error_Msg_N ("delta_aggregate is an Ada 202x feature", N);
-         Error_Msg_N ("\compile with -gnatX", N);
+         Error_Msg_N ("\compile with -gnat2020", N);
       end if;
 
       if not Is_Composite_Type (Typ) then

diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index 944abfe977a589882a715f700784eeeb3655bfc5..d48ddd23dd2a5ffb87e098dfc5f04b95b12d6f1d 100644 (file)
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -2706,7 +2706,7 @@ package body Sem_Ch10 is
                   if Ada_Version < Ada_2020
                     and then Warn_On_Ada_202X_Compatibility
                   then
-                     Error_Msg_N ("& is an Ada 202X unit?i?", Name (N));
+                     Error_Msg_N ("& is an Ada 202x unit?i?", Name (N));
                   end if;
             end case;
          end if;

diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 4dd2a31921e14a1b0903e1a8f7dee5bbe6d6e618..76159bc24055f6fe8730250bd309e78a727759e1 100644 (file)
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -1096,7 +1096,7 @@ package body Sem_Ch12 is
       --  package. As usual an other association must be last in the list.
 
       procedure Build_Subprogram_Wrappers;
-      --  Ada_2020: AI12-0272 introduces pre/postconditions for formal
+      --  Ada 2020: AI12-0272 introduces pre/postconditions for formal
       --  subprograms. The implementation of making the formal into a renaming
       --  of the actual does not work, given that subprogram renaming cannot
       --  carry aspect specifications. Instead we must create subprogram
@@ -3554,7 +3554,7 @@ package body Sem_Ch12 is
 
       Generate_Reference_To_Generic_Formals (Current_Scope);
 
-      --  For Ada_2020, some formal parameters can carry aspects, which must
+      --  For Ada 2020, some formal parameters can carry aspects, which must
       --  be name-resolved at the end of the list of formal parameters (which
       --  has the semantics of a declaration list).
 
@@ -12361,7 +12361,7 @@ package body Sem_Ch12 is
       Subt       : Entity_Id;
 
       procedure Check_Shared_Variable_Control_Aspects;
-      --  Ada_2020: Verify that shared variable control aspects (RM C.6)
+      --  Ada 2020: Verify that shared variable control aspects (RM C.6)
       --  that may be specified for a formal type are obeyed by the actual.
 
       procedure Diagnose_Predicated_Actual;
@@ -12392,7 +12392,7 @@ package body Sem_Ch12 is
       --  Check_Shared_Variable_Control_Aspects --
       --------------------------------------------
 
-      --  Ada_2020: Verify that shared variable control aspects (RM C.6)
+      --  Ada 2020: Verify that shared variable control aspects (RM C.6)
       --  that may be specified for the formal are obeyed by the actual.
 
       procedure Check_Shared_Variable_Control_Aspects is
@@ -13079,7 +13079,7 @@ package body Sem_Ch12 is
          --  Perform atomic/volatile checks (RM C.6(12)). Note that AI05-0218-1
          --  removes the second instance of the phrase "or allow pass by copy".
 
-         --  For Ada_2020, the aspect may be specified explicitly for the
+         --  For Ada 2020, the aspect may be specified explicitly for the
          --  formal regardless of whether an ancestor obeys it.
 
          if Is_Atomic (Act_T)

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 4c3ca6c66e54df61c9fdf63db1fa472868dc72d9..0c42b53eebdcdeff6da790f3042774ddb042d9d5 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -4756,7 +4756,7 @@ package body Sem_Prag is
          then
             null;
 
-         --  For Ada_2020, pre/postconditions can appear on formal subprograms
+         --  For Ada 2020, pre/postconditions can appear on formal subprograms
 
          elsif Nkind (Subp_Decl) = N_Formal_Concrete_Subprogram_Declaration
             and then Ada_Version >= Ada_2020
@@ -7487,7 +7487,7 @@ package body Sem_Prag is
             --  Attribute belongs on the base type. If the view of the type is
             --  currently private, it also belongs on the underlying type.
 
-            --  In Ada_2020, the pragma can apply to a formal type, for which
+            --  In Ada 2020, the pragma can apply to a formal type, for which
             --  there may be no underlying type.
 
             if Prag_Id = Pragma_Atomic
@@ -30031,7 +30031,7 @@ package body Sem_Prag is
                elsif Present (Generic_Parent (Specification (Stmt))) then
                   return Stmt;
 
-               --  Ada_2020: contract on formal subprogram
+               --  Ada 2020: contract on formal subprogram
 
                elsif Is_Generic_Actual_Subprogram (Defining_Entity (Stmt))
                  and then Ada_Version >= Ada_2020