Skip to content

Commit 79cfa3c

Browse files
committed
Merge branch 'topic/tasking' into 'master'
Topic/tasking See merge request eng/ide/gnatdoc!33
2 parents 37d2532 + 82b73c5 commit 79cfa3c

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

source/gnatdoc-comments-helpers.adb

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ package body GNATdoc.Comments.Helpers is
273273

274274
begin
275275
if Decl.Kind in Ada_Abstract_Subp_Decl
276+
| Ada_Entry_Decl
276277
| Ada_Exception_Decl
277278
| Ada_Expr_Function
278279
| Ada_Generic_Package_Decl
@@ -282,8 +283,11 @@ package body GNATdoc.Comments.Helpers is
282283
| Ada_Object_Decl
283284
| Ada_Package_Decl
284285
| Ada_Package_Renaming_Decl
286+
| Ada_Protected_Type_Decl
287+
| Ada_Single_Protected_Decl
285288
| Ada_Subp_Decl
286289
| Ada_Subtype_Decl
290+
| Ada_Task_Type_Decl
287291
or (Decl.Kind in Ada_Type_Decl
288292
and then Decl.As_Type_Decl.F_Type_Def.Kind
289293
in Ada_Access_To_Subp_Def
@@ -299,9 +303,25 @@ package body GNATdoc.Comments.Helpers is
299303
then
300304
Decl_To_Extract := Decl;
301305

302-
elsif Decl.Kind = Ada_Param_Spec
303-
and then Decl.P_Parent_Basic_Decl.Kind in Ada_Subp_Decl
306+
elsif Decl.Kind = Ada_Single_Task_Type_Decl then
307+
Decl_To_Extract := Decl.P_Parent_Basic_Decl;
308+
309+
elsif Decl.Kind in Ada_Param_Spec | Ada_Entry_Index_Spec
310+
and then Decl.P_Parent_Basic_Decl.Kind
311+
in Ada_Subp_Decl | Ada_Entry_Decl | Ada_Entry_Body
304312
then
313+
-- Parameters of the subprograms and entries, family index of
314+
-- entries.
315+
316+
Decl_To_Extract := Decl.P_Parent_Basic_Decl;
317+
Name_To_Extract := Name.As_Defining_Name;
318+
319+
elsif Decl.Kind in Ada_Discriminant_Spec | Ada_Component_Decl
320+
and then Decl.P_Parent_Basic_Decl.Kind
321+
in Ada_Protected_Type_Decl | Ada_Single_Protected_Decl
322+
then
323+
-- Discriminants and components of the protected types/objects.
324+
305325
Decl_To_Extract := Decl.P_Parent_Basic_Decl;
306326
Name_To_Extract := Name.As_Defining_Name;
307327

0 commit comments

Comments
 (0)