sem_ch9.adb, [...]: Minor reformatting and typo fixes.

2017-04-25  Gary Dismukes  <dismukes@adacore.com>

	* sem_ch9.adb, sem_ch10.adb, sem_util.adb: Minor reformatting and typo
	fixes.

From-SVN: r247137

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 3df9685..a9ded59 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-25  Gary Dismukes  <dismukes@adacore.com>
+
+       * sem_ch9.adb, sem_ch10.adb, sem_util.adb: Minor reformatting and typo
+       fixes.
+
 2017-04-25  Arnaud Charlet  <charlet@adacore.com>
 
        * rtsfind.ads (SPARK_Implicit_Load): New procedure for forced

diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index e413079..11e6a4a 100644 (file)
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -1137,12 +1137,12 @@ package body Sem_Ch10 is
          --  In GNATprove mode, force the loading of a Interrupt_Priority when
          --  processing compilation units with potentially "main" subprograms.
          --  This is required for the ceiling priority protocol checks, which
-         --  are trigerred by these subprograms.
+         --  are triggered by these subprograms.
 
          if GNATprove_Mode
-           and then Nkind_In (Unit_Node, N_Subprogram_Body,
+           and then Nkind_In (Unit_Node, N_Function_Instantiation,
                                          N_Procedure_Instantiation,
-                                         N_Function_Instantiation)
+                                         N_Subprogram_Body)
          then
             declare
                Spec : Node_Id;

diff --git a/gcc/ada/sem_ch9.adb b/gcc/ada/sem_ch9.adb
index a22e727..7233f2b 100644 (file)
--- a/gcc/ada/sem_ch9.adb
+++ b/gcc/ada/sem_ch9.adb
@@ -2254,7 +2254,7 @@ package body Sem_Ch9 is
       end if;
 
       --  In GNATprove mode, force the loading of a Interrupt_Priority, which
-      --  is required for the ceiling priority protocol checks trigerred by
+      --  is required for the ceiling priority protocol checks triggered by
       --  calls originating from protected subprograms and entries.
 
       if GNATprove_Mode then
@@ -3201,7 +3201,7 @@ package body Sem_Ch9 is
       end if;
 
       --  In GNATprove mode, force the loading of a Interrupt_Priority, which
-      --  is required for the ceiling priority protocol checks trigerred by
+      --  is required for the ceiling priority protocol checks triggered by
       --  calls originating from tasks.
 
       if GNATprove_Mode then

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 4203eac..0a09b16 100644 (file)
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -16227,11 +16227,11 @@ package body Sem_Util is
       New_Sloc  : Source_Ptr := No_Location;
       New_Scope : Entity_Id  := Empty) return Node_Id
    is
-      EWA_Level             : Nat := 0;
-      --  By default copying of defining identifiers is prohibited because this
-      --  would introduce an entirely new entity into the tree. The exception
-      --  to this general rule are declaration of constants and variables
-      --  located in Expression_With_Action nodes.
+      EWA_Level : Nat := 0;
+      --  By default, copying of defining identifiers is prohibited because
+      --  this would introduce an entirely new entity into the tree. The
+      --  exception to this general rule is declaration of constants and
+      --  variables located in Expression_With_Action nodes.
 
       EWA_Inner_Scope_Level : Nat := 0;
       --  Level of internal scope of defined in EWAs. Used to avoid creating
@@ -16302,7 +16302,7 @@ package body Sem_Util is
       --  not in the hash table, then it is returned unchanged.
 
       procedure Build_NCT_Hash_Tables;
-      --  Builds hash tables.
+      --  Builds hash tables
 
       function Copy_Elist_With_Replacement
         (Old_Elist : Elist_Id) return Elist_Id;
@@ -16322,7 +16322,7 @@ package body Sem_Util is
 
       function In_Map (E : Entity_Id) return Boolean;
       --  Return True if E is one of the old entities specified in the set of
-      --  mappings to be applied to entities in the tree (ie. Map).
+      --  mappings to be applied to entities in the tree (i.e. Map).
 
       procedure Visit_Elist (E : Elist_Id);
       --  Called during first phase to visit all elements of an Elist
@@ -16398,12 +16398,11 @@ package body Sem_Util is
                             Associated_Node_For_Itype (Ent);
 
                begin
-                  if Present (Anode) then
-
-                     --  Enter a link between the associated node of the old
-                     --  Itype and the new Itype, for updating later when node
-                     --  is copied.
+                  --  Enter the link between the associated node of the old
+                  --  Itype and the new Itype, for updating later when node
+                  --  is copied.
 
+                  if Present (Anode) then
                      NCT_Itype_Assoc.Set (Anode, Node (Elmt));
                   end if;
                end;
@@ -16444,7 +16443,7 @@ package body Sem_Util is
       -- Copy_Entity_With_Replacement --
       ----------------------------------
 
-      --  This routine exactly parallels its phase one analog Visit_Itype,
+      --  This routine exactly parallels its phase one analog Visit_Itype
 
       procedure Copy_Entity_With_Replacement (New_Entity : Entity_Id) is
       begin