Merge remote branch 'origin/master' into edge

Author: automatic-merge

source/gnatdoc-comments-helpers.adb

@@ -496,6 +496,7 @@ package body GNATdoc.Comments.Helpers is
                | Ada_Enum_Literal_Decl
                | Ada_Exception_Decl
                | Ada_For_Loop_Var_Decl
+               | Ada_Formal_Type_Decl
                | Ada_Generic_Package_Instantiation
                | Ada_Generic_Package_Decl
                | Ada_Generic_Subp_Decl

testsuite/als_helper/generics-instantiations.adb

@@ -0,0 +1,12 @@
+--  Copyright header
+
+--  Description of the package body
+
+package body Generics.Instantiations is
+
+   procedure Dummy is
+   begin
+      null;
+   end Dummy;
+
+end Generics.Instantiations;

testsuite/als_helper/generics-instantiations.ads

@@ -0,0 +1,34 @@
+--  Copyright header
+
+--  Description of the package specification
+
+with Interfaces;
+
+package Generics.Instantiations is
+
+   type Derived_Type is new Ada.Finalization.Controlled with null record;
+
+   package Package_Instantiation is
+     new Generic_Package
+           (Private_Type              =>
+              Ada.Strings.Unbounded.Unbounded_String,
+            Derived_Type              => Derived_Type,
+            Discrete_Type             => Boolean,
+            Signed_Integer_Type       => Integer,
+            Modular_Type              => Interfaces.Unsigned_32,
+            Floating_Point_Type       => Float,
+            Ordinary_Fixed_Point_Type => Ordinary_Fixed_Point_Type,
+            Decimal_Fixed_Point_Type  => Decimal_Fixed_Point_Type,
+            Array_Type                => Array_Type,
+            Access_Type               => Access_Type,
+            Interface_Type            => Interface_Type);
+
+   function Function_Instantiation is new Generic_Function;
+
+   procedure Procedure_Instantiation is new Generic_Procedure;
+
+private
+
+   procedure Dummy;
+
+end Generics.Instantiations;

testsuite/als_helper/generics.adb

@@ -0,0 +1,66 @@
+--  Copyright header
+
+--  Description of the package body
+
+with Interfaces;
+
+package body Generics is
+
+   procedure Dummy is
+   begin
+      null;
+   end Dummy;
+
+   function Generic_Function return Integer is
+   begin
+      return 0;
+   end Generic_Function;
+
+   package body Generic_Package is
+      --  Description of the generic package body
+
+      Private_Object              : Private_Type;
+      Derived_Object              : Derived_Type;
+      Discrete_Object             : Discrete_Type;
+      Signed_Integer_Object       : Signed_Integer_Type;
+      Modular_Object              : Modular_Type;
+      Floating_Point_Object       : Floating_Point_Type;
+      Ordinary_Fixed_Point_Object : Ordinary_Fixed_Point_Type;
+      Decimal_Fixed_Point_Object  : Decimal_Fixed_Point_Type;
+      Array_Object                : Array_Type (1 .. 1);
+      Access_Object               : Access_Type;
+
+      procedure Interface_Dummy (Self : Interface_Type) is null;
+
+      procedure Dummy is
+      begin
+         null;
+      end Dummy;
+
+   end Generic_Package;
+
+   procedure Generic_Procedure is
+   begin
+      null;
+   end Generic_Procedure;
+
+   package Package_Instantiation is
+     new Generic_Package
+           (Private_Type              =>
+              Ada.Strings.Unbounded.Unbounded_String,
+            Derived_Type              => Derived_Type,
+            Discrete_Type             => Boolean,
+            Signed_Integer_Type       => Integer,
+            Modular_Type              => Interfaces.Unsigned_32,
+            Floating_Point_Type       => Float,
+            Ordinary_Fixed_Point_Type => Ordinary_Fixed_Point_Type,
+            Decimal_Fixed_Point_Type  => Decimal_Fixed_Point_Type,
+            Array_Type                => Array_Type,
+            Access_Type               => Access_Type,
+            Interface_Type            => Interface_Type);
+
+   function Function_Instantiation is new Generic_Function;
+
+   procedure Procedure_Instantiation is new Generic_Procedure;
+
+end Generics;

testsuite/als_helper/generics.ads

@@ -0,0 +1,75 @@
+--  Copyright header
+
+--  Description of the package specification
+
+with Ada.Finalization;
+with Ada.Strings.Unbounded;
+
+package Generics is
+
+   generic
+      type Private_Type is private;
+      --  Description of the formal private type
+
+      type Derived_Type is new Ada.Finalization.Controlled with private;
+      --  Description of the formal derived type
+
+      type Discrete_Type is (<>);
+      --  Description of the formal discrete type
+
+      type Signed_Integer_Type is range <>;
+      --  Description of the formal signed integer type
+
+      type Modular_Type is mod <>;
+      --  Description of the formal modular type
+
+      type Floating_Point_Type is digits <>;
+      --  Description of the formal floating point type
+
+      type Ordinary_Fixed_Point_Type is delta <>;
+      --  Description of the formal ordinary fixed point type
+
+      type Decimal_Fixed_Point_Type is delta <> digits <>;
+      --  Description of the formal decimal fixed point type
+
+      type Array_Type is array (Positive range <>) of Discrete_Type;
+      --  Description of the formal array type
+
+      type Access_Type is access all Private_Type;
+      --  Description of the formal access type
+
+      type Interface_Type is interface;
+      --  Description of the formal interface type
+
+   package Generic_Package is
+      --  Description of the generic package specification
+
+      procedure Dummy;
+
+   end Generic_Package;
+
+   generic
+   function Generic_Function return Integer;
+   --  Description of the generic function specification
+
+   generic
+   procedure Generic_Procedure;
+   --  Description of the generic procedure specification
+
+   type Derived_Type is new Ada.Finalization.Controlled with null record;
+
+   type Ordinary_Fixed_Point_Type is delta 0.001 range -1.0 .. 1.0;
+
+   type Decimal_Fixed_Point_Type is delta 0.001 digits 5;
+
+   type Array_Type is array (Positive range <>) of Boolean;
+
+   type Access_Type is access all Ada.Strings.Unbounded.Unbounded_String;
+
+   type Interface_Type is interface;
+
+private
+
+   procedure Dummy;
+
+end Generics;

testsuite/als_helper/locations.json

@@ -171,6 +171,83 @@
     {"file": "generics_package.adb", "line": 22, "column": 7},
     //  reference: `Generic_Procedure_Instantiation`
 
+    {"file": "generics.ads", "line": 11, "column": 12},
+    //  declaration: `Private_Type`
+    {"file": "generics.adb", "line": 22, "column": 37},
+    //  reference: `Private_Type`
+    {"file": "generics-instantiations.ads", "line": 13, "column": 13},
+    //  reference: `Private_Type`
+
+    {"file": "generics.ads", "line": 14, "column": 12},
+    //  declaration: `Derived_Type`
+    {"file": "generics.adb", "line": 23, "column": 37},
+    //  reference: `Derived_Type`
+    {"file": "generics-instantiations.ads", "line": 15, "column": 13},
+    //  reference: `Derived_Type`
+
+    {"file": "generics.ads", "line": 17, "column": 12},
+    //  declaration: `Discrete_Type`
+    {"file": "generics.adb", "line": 24, "column": 37},
+    //  reference: `Discrete_Type`
+    {"file": "generics-instantiations.ads", "line": 16, "column": 13},
+    //  reference: `Discrete_Type`
+
+    {"file": "generics.ads", "line": 20, "column": 12},
+    //  declaration: `Signed_Integer_Type`
+    {"file": "generics.adb", "line": 25, "column": 37},
+    //  reference: `Signed_Integer_Type`
+    {"file": "generics-instantiations.ads", "line": 17, "column": 13},
+    //  reference: `Signed_Integer_Type`
+
+    {"file": "generics.ads", "line": 23, "column": 12},
+    //  declaration: `Modular_Type`
+    {"file": "generics.adb", "line": 26, "column": 37},
+    //  reference: `Modular_Type`
+    {"file": "generics-instantiations.ads", "line": 18, "column": 13},
+    //  reference: `Modular_Type`
+
+    {"file": "generics.ads", "line": 26, "column": 12},
+    //  declaration: `Floating_Point_Type`
+    {"file": "generics.adb", "line": 27, "column": 37},
+    //  reference: `Floating_Point_Type`
+    {"file": "generics-instantiations.ads", "line": 19, "column": 13},
+    //  reference: `Floating_Point_Type`
+
+    {"file": "generics.ads", "line": 29, "column": 12},
+    //  declaration: `Ordinary_Fixed_Point_Type`
+    {"file": "generics.adb", "line": 28, "column": 37},
+    //  reference: `Ordinary_Fixed_Point_Type`
+    {"file": "generics-instantiations.ads", "line": 20, "column": 13},
+    //  reference: `Ordinary_Fixed_Point_Type`
+
+    {"file": "generics.ads", "line": 32, "column": 12},
+    //  declaration: `Decimal_Fixed_Point_Type`
+    {"file": "generics.adb", "line": 29, "column": 37},
+    //  reference: `Decimal_Fixed_Point_Type`
+    {"file": "generics-instantiations.ads", "line": 21, "column": 13},
+    //  reference: `Decimal_Fixed_Point_Type`
+
+    {"file": "generics.ads", "line": 35, "column": 12},
+    //  declaration: `Array_Type`
+    {"file": "generics.adb", "line": 30, "column": 37},
+    //  reference: `Array_Type`
+    {"file": "generics-instantiations.ads", "line": 22, "column": 13},
+    //  reference: `Array_Type`
+
+    {"file": "generics.ads", "line": 38, "column": 12},
+    //  declaration: `Access_Type`
+    {"file": "generics.adb", "line": 31, "column": 37},
+    //  reference: `Access_Type`
+    {"file": "generics-instantiations.ads", "line": 23, "column": 13},
+    //  reference: `Access_Type`
+
+    {"file": "generics.ads", "line": 41, "column": 12},
+    //  declaration: `Interface_Type`
+    {"file": "generics.adb", "line": 33, "column": 41},
+    //  reference: `Interface_Type`
+    {"file": "generics-instantiations.ads", "line": 24, "column": 13},
+    //  reference: `Interface_Type`
+
     //  Objects
 
     {"file": "objects.ads", "line": 4, "column": 4},