From c3a2dc654c8e9474dbf0de2da168cd7816eae813 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Sat, 11 Apr 2020 13:04:31 +0200 Subject: [PATCH] [Ada] Fix comment of Get_Iterable_Type_Primitive 2020-06-17 Piotr Trojanek gcc/ada/ * sem_util.ads, sem_util.adb (Get_Iterable_Type_Primitive): Fix comment and enforce it with an assertion in the body. --- gcc/ada/sem_util.adb | 10 ++++++++++ gcc/ada/sem_util.ads | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb index 5f151078591..62b526d08f4 100644 --- a/gcc/ada/sem_util.adb +++ b/gcc/ada/sem_util.adb @@ -10175,6 +10175,16 @@ package body Sem_Util is (Typ : Entity_Id; Nam : Name_Id) return Entity_Id is + pragma Assert + (Is_Type (Typ) + and then + Nam_In (Nam, Name_Element, + Name_First, + Name_Has_Element, + Name_Last, + Name_Next, + Name_Previous)); + Funcs : constant Node_Id := Find_Value_Of_Aspect (Typ, Aspect_Iterable); Assoc : Node_Id; diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads index caefa05aca0..9f2ad5aa7a6 100644 --- a/gcc/ada/sem_util.ads +++ b/gcc/ada/sem_util.ads @@ -1126,8 +1126,8 @@ package Sem_Util is function Get_Iterable_Type_Primitive (Typ : Entity_Id; Nam : Name_Id) return Entity_Id; - -- Retrieve one of the primitives First, Next, Has_Element, Element from - -- the value of the Iterable aspect of a type. + -- Retrieve one of the primitives First, Last, Next, Previous, Has_Element, + -- Element from the value of the Iterable aspect of a type. procedure Get_Library_Unit_Name_String (Decl_Node : Node_Id); -- Retrieve the fully expanded name of the library unit declared by -- 2.30.2