From: Gary Dismukes <dismukes@adacore.com>
Date: Wed, 20 May 2020 17:44:34 +0000 (-0400)
Subject: [Ada] Minor reformatting and typo fix
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=98ceb79632938c5dfa74dbf4c84854c0bba5e75a;p=gcc.git

[Ada] Minor reformatting and typo fix

gcc/ada/

	* sem_attr.adb: Remove hyphens in comments, plus minor code
	reformatting.
	* sem_ch13.adb: Fix typo (that => than).
	* sem_util.adb: Add hyphen in comment ("class-wide").
---

diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index fbaaa656a2d..1d4ef0bfb7a 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -5513,15 +5513,15 @@ package body Sem_Attr is
                Pref_Id := Entity (P);
 
                --  Either both the prefix and the annotated spec must be
-               --  generic functions, or they both must be non-generic
+               --  generic functions, or they both must be nongeneric
                --  functions, or the prefix must be generic and the spec
-               --  must be non-generic (i.e. it must denote an instance).
+               --  must be nongeneric (i.e. it must denote an instance).
 
                if (Ekind_In (Pref_Id, E_Function, E_Generic_Function)
-                   and then Ekind (Pref_Id) = Ekind (Spec_Id))
-                    or else
-                  (Ekind (Pref_Id) = E_Generic_Function
-                   and then Ekind (Spec_Id) = E_Function)
+                    and then Ekind (Pref_Id) = Ekind (Spec_Id))
+                 or else
+                   (Ekind (Pref_Id) = E_Generic_Function
+                     and then Ekind (Spec_Id) = E_Function)
                then
                   if Denote_Same_Function (Pref_Id, Spec_Id) then
 
@@ -8079,7 +8079,7 @@ package body Sem_Attr is
 
       --  First foldable possibility is a scalar or array type (RM 4.9(7))
       --  that is not generic (generic types are eliminated by RM 4.9(25)).
-      --  Note we allow non-static non-generic types at this stage as further
+      --  Note we allow nonstatic nongeneric types at this stage as further
       --  described below.
 
       if Is_Type (P_Entity)
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 808c77af0e8..3fb9f61da9d 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -2296,7 +2296,7 @@ package body Sem_Ch13 is
                         --  Only formals of the subprogram itself can appear
                         --  in Relaxed_Initialization aspect expression, not
                         --  formals of the enclosing generic unit. (This is
-                        --  different that in Precondition or Depends aspects,
+                        --  different than in Precondition or Depends aspects,
                         --  where both kinds of formals are allowed.)
 
                         Install_Formals (E);
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 7ec52b30c79..f7a7c1fb431 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -1517,7 +1517,7 @@ package body Sem_Util is
       --  corresponding class-wide condition was analyzed.
 
       --  The body of the original condition may contain references to
-      --  the formals of Spec_Id. In the body of the classwide clone,
+      --  the formals of Spec_Id. In the body of the class-wide clone,
       --  these must be replaced with the corresponding formals of
       --  the clone.