From patchwork Thu Sep 9 09:57:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Ada] Minor code cleanup, introduce Aggregate_Kind From: Arnaud Charlet X-Patchwork-Id: 64273 Message-Id: <20100909095712.GA1889@adacore.com> To: gcc-patches@gcc.gnu.org Cc: Robert Dewar Date: Thu, 9 Sep 2010 11:57:12 +0200 This patch introduces a new well-defined Ekind subtype called Aggregate_Kind, with an associated predicate Is_Aggregate_Type. This type is then used in sem_type in appropriate places. No test needed since this is just a cleanup with no functional effect Tested on x86_64-pc-linux-gnu, committed on trunk 2010-09-09 Robert Dewar * einfo.adb (Is_Aggregate_Type): New function. * einfo.ads (Aggregate_Kind): New enumeration subtype (Is_Aggregate_Type): New function. * sem_type.adb (Is_Array_Class_Record_Type): Removed, replaced by Is_Aggregate_Typea. Index: sem_type.adb =================================================================== --- sem_type.adb (revision 164059) +++ sem_type.adb (working copy) @@ -184,18 +184,6 @@ package body Sem_Type is -- Interp_Has_Abstract_Op. Determine whether an overloaded node has an -- abstract interpretation which yields type Typ. - function Is_Array_Class_Record_Type (E : Entity_Id) return Boolean; - -- This function tests if entity E is in Array_Kind, or Class_Wide_Kind, - -- or is E_Record_Type or E_Record_Subtype, and returns True for these - -- cases, and False for all others. Note that other record entity kinds - -- such as E_Record_Type_With_Private return False. - -- - -- This is a bit of an odd category, maybe it is wrong or a better name - -- could be found for the class of entities being tested. The history - -- is that this used to be done with an explicit range test for the range - -- E_Array_Type .. E_Record_Subtype, which was itself suspicious and is - -- now prohibited by the -gnatyE style check ??? - procedure New_Interps (N : Node_Id); -- Initialize collection of interpretations for the given node, which is -- either an overloaded entity, or an operation whose arguments have @@ -912,7 +900,7 @@ package body Sem_Type is -- An aggregate is compatible with an array or record type elsif T2 = Any_Composite - and then Is_Array_Class_Record_Type (T1) + and then Is_Aggregate_Type (T1) then return True; @@ -2632,6 +2620,9 @@ package body Sem_Type is else Par := Etype (Par); end if; + + -- For all other cases return False, not an Ancestor + else return False; end if; @@ -2639,18 +2630,6 @@ package body Sem_Type is end if; end Is_Ancestor; - -------------------------------- - -- Is_Array_Class_Record_Type -- - -------------------------------- - - function Is_Array_Class_Record_Type (E : Entity_Id) return Boolean is - begin - return Is_Array_Type (E) - or else Is_Class_Wide_Type (E) - or else Ekind (E) = E_Record_Type - or else Ekind (E) = E_Record_Subtype; - end Is_Array_Class_Record_Type; - --------------------------- -- Is_Invisible_Operator -- --------------------------- @@ -3069,12 +3048,12 @@ package body Sem_Type is return T1; elsif T2 = Any_Composite - and then Is_Array_Class_Record_Type (T1) + and then Is_Aggregate_Type (T1) then return T1; elsif T1 = Any_Composite - and then Is_Array_Class_Record_Type (T2) + and then Is_Aggregate_Type (T2) then return T2; Index: einfo.adb =================================================================== --- einfo.adb (revision 164000) +++ einfo.adb (working copy) @@ -2731,6 +2731,11 @@ package body Einfo is return Ekind (Id) in Access_Subprogram_Kind; end Is_Access_Subprogram_Type; + function Is_Aggregate_Type (Id : E) return B is + begin + return Ekind (Id) in Aggregate_Kind; + end Is_Aggregate_Type; + function Is_Array_Type (Id : E) return B is begin return Ekind (Id) in Array_Kind; Index: einfo.ads =================================================================== --- einfo.ads (revision 164000) +++ einfo.ads (working copy) @@ -4209,6 +4209,17 @@ package Einfo is E_Access_Protected_Subprogram_Type .. E_Anonymous_Access_Protected_Subprogram_Type; + subtype Aggregate_Kind is Entity_Kind range + E_Array_Type .. + -- E_Array_Subtype + -- E_String_Type + -- E_String_Subtype + -- E_String_Literal_Subtype + -- E_Class_Wide_Type + -- E_Class_Wide_Subtype + -- E_Record_Type + E_Record_Subtype; + subtype Array_Kind is Entity_Kind range E_Array_Type .. -- E_Array_Subtype @@ -6115,6 +6126,7 @@ package Einfo is function Is_Access_Type (Id : E) return B; function Is_Access_Protected_Subprogram_Type (Id : E) return B; function Is_Access_Subprogram_Type (Id : E) return B; + function Is_Aggregate_Type (Id : E) return B; function Is_Array_Type (Id : E) return B; function Is_Assignable (Id : E) return B; function Is_Class_Wide_Type (Id : E) return B; @@ -7125,6 +7137,7 @@ package Einfo is pragma Inline (Is_Access_Type); pragma Inline (Is_Access_Protected_Subprogram_Type); pragma Inline (Is_Access_Subprogram_Type); + pragma Inline (Is_Aggregate_Type); pragma Inline (Is_Aliased); pragma Inline (Is_Array_Type); pragma Inline (Is_Assignable);