From c392a001491bd8603556bd922d073a96b6df8724 Mon Sep 17 00:00:00 2001 From: Gary Dismukes Date: Mon, 2 Mar 2020 19:13:33 -0500 Subject: [PATCH] [Ada] Minor reformatting and some typo fixes 2020-06-10 Gary Dismukes gcc/ada/ * einfo.ads: Minor reformatting of a comment. * exp_aggr.adb: Minor reformatting and a grammar correction. * exp_attr.adb: Minor reformatting and a typo fix in some comments. * sem_ch12.adb: Fix three typos in comments. --- gcc/ada/einfo.ads | 8 ++++---- gcc/ada/exp_aggr.adb | 4 ++-- gcc/ada/exp_attr.adb | 10 +++++----- gcc/ada/sem_ch12.adb | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index 277ca989261..44cbe68dd79 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -4180,10 +4180,10 @@ package Einfo is -- for the function case. -- Returns_By_Ref (Flag90) --- Defined in subprogram type entities and functions. Set if a --- function (or an access to function type) returns a result by --- reference, either because its return type is a by-reference-type or --- because said function explicitly uses the secondary stack. +-- Defined in subprogram type entities and functions. Set if a function +-- (or an access-to-function type) returns a result by reference, either +-- because its return type is a by-reference-type or because the function +-- explicitly uses the secondary stack. -- Reverse_Bit_Order (Flag164) [base type only] -- Defined in all record type entities. Set if entity has a Bit_Order diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index dd69297037d..3a74d0679f0 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -316,8 +316,8 @@ package body Exp_Aggr is function Max_Aggregate_Size (Typ : Entity_Id; Default_Size : Nat := 5000) return Nat; - -- Return the max size for a static aggregate for the given Typ. - -- Return Default_Size if no other special criteria triggers. + -- Return the max size for a static aggregate of the given Typ. + -- Return Default_Size if no other special criteria trigger. function Packed_Array_Aggregate_Handled (N : Node_Id) return Boolean; -- Given an array aggregate, this function handles the case of a packed diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb index e907b8c2fd7..aa049fcc9f9 100644 --- a/gcc/ada/exp_attr.adb +++ b/gcc/ada/exp_attr.adb @@ -4855,13 +4855,13 @@ package body Exp_Attr is Rewrite (N, Make_If_Expression (Loc, New_List ( - -- Generate a check for zero sized things like a null record with + -- Generate a check for zero-sized things like a null record with -- size zero or an array with zero length since they have no -- opportunity of overlapping. - -- Without this check a zero-sized object can trigger a false - -- runtime result if its compared against another object - -- in its declarative region due to the zero-sized object having + -- Without this check, a zero-sized object can trigger a false + -- runtime result if it's compared against another object in + -- its declarative region, due to the zero-sized object having -- the same address. Make_Or_Else (Loc, @@ -4882,7 +4882,7 @@ package body Exp_Attr is New_Occurrence_Of (Standard_False, Loc), - -- Non-size zero overlap check + -- Non-zero-size overlap check Make_If_Expression (Loc, New_List ( Cond, diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb index b29c00bafc1..80a8246b3a6 100644 --- a/gcc/ada/sem_ch12.adb +++ b/gcc/ada/sem_ch12.adb @@ -1753,7 +1753,7 @@ package body Sem_Ch12 is -- Warn when an actual is a fixed-point with user- -- defined promitives. The warning is superfluous - -- if the fornal is private, because there can be + -- if the formal is private, because there can be -- no arithmetic operations in the generic so there -- no danger of confusion. @@ -12394,12 +12394,12 @@ package body Sem_Ch12 is -- Ada 2020: Verify that shared variable control aspects (RM C.6) -- that may be specified for the formal are obeyed by the actual. - -- If the fornal is a derived type the aspect specifications must match. + -- If the formal is a derived type the aspect specifications must match. -- NOTE: AI12-0282 implies that matching of aspects is required between -- formal and actual in all cases, but this is too restrictive. -- In particular it violates a language design rule: a limited private -- indefinite formal can be matched by any actual. The current code - -- reflects an older and more permissve version of RM C.6 (12/5). + -- reflects an older and more permissive version of RM C.6 (12/5). procedure Check_Shared_Variable_Control_Aspects is begin -- 2.30.2