Merge branch 'topic/VC20-026' into 'master'

Topic/vc20 026

See merge request eng/ide/gnatdoc!32

Author: godunko

Makefile

@@ -15,7 +15,7 @@ check_extractor:
 	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json overriding_indicator.ads | diff -u --strip-trailing-cr overriding_indicator.out -)
 	(cd testsuite/extractor && ../../.objs/test_extractor pattern.json documentation_pattern.ads | diff -u --strip-trailing-cr documentation_pattern.out -)
 	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json exceptions.ads | diff -u --strip-trailing-cr exceptions.out -)
-	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json records.ads | diff -u --strip-trailing-cr records.out -)
+	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json records.ads | diff -u --strip-trailing-cr records.ads.out -)
 	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json tasks.ads | diff -u --strip-trailing-cr tasks.out -)
 	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json protecteds.ads | diff -u --strip-trailing-cr protecteds.ads.out -)
 	(cd testsuite/extractor && ../../.objs/test_extractor gnat.json protecteds.adb | diff -u --strip-trailing-cr protecteds.adb.out -)

source/gnatdoc-comments-builders-records.adb

@@ -60,12 +60,17 @@ package body GNATdoc.Comments.Builders.Records is
             when Ada_Ada_Node_List | Ada_Variant_List =>
                return Into;
 
-            when Ada_Alternatives_List | Ada_Others_Designator =>
-               return Into;
+            when Ada_Alternatives_List =>
+               return Over;
+
+            when Ada_Identifier =>
+               --  Discriminant name in the variant part
+
+               return Over;
+
+            when Ada_Null_Component_Decl =>
+               --  null component is not included into documentation
 
-            when Ada_Null_Component_Decl | Ada_Identifier | Ada_Dotted_Name
-               | Ada_Int_Literal
-               =>
                return Over;
 
             when Ada_Known_Discriminant_Part | Ada_Discriminant_Spec_List =>
@@ -90,7 +95,7 @@ package body GNATdoc.Comments.Builders.Records is
                return Over;
 
             when others =>
-               Put_Line (Image (Node));
+               Put_Line (Standard_Error, Image (Node));
 
                raise Program_Error with Ada_Node_Kind_Type'Image (Node.Kind);
          end case;

testsuite/extractor/records.ads

@@ -100,4 +100,25 @@ package Records is
    end record;
    --  Comments for both fields must be extracted from the comments around.
 
+   --------------
+   -- VC20-026 --
+   --------------
+
+   type Foo_1 (X : Integer) is record
+      case X is
+         when -6 =>
+            A : Integer;
+         when -5 | -4 =>
+            B : Integer;
+         when -3 .. -1 =>
+            C : Integer;
+         when Natural =>
+            D : Integer;
+         when others =>
+            E : Integer;
+      end case;
+   end record;
+   --  This is example of the record type with discriminant of integer type and
+   --  variant part that depends from few kind of values.
+
 end Records;

testsuite/extractor/records.out renamed to testsuite/extractor/records.ads.out

@@ -1,4 +1,4 @@
-<CompilationUnit records.ads:2:1-103:13>
+<CompilationUnit records.ads:2:1-124:13>
 <AdaNodeList records.ads:2:1-4:23>
 <WithClause records.ads:2:1-2:30>
 <LimitedAbsent records.ads:2:1-2:1>
@@ -12,18 +12,18 @@
 <PrivateAbsent records.ads:2:30-2:30>
 <NameList records.ads:4:6-4:22>
 <Id "All_Enumerations" records.ads:4:6-4:22>
-<LibraryItem records.ads:6:1-103:13>
+<LibraryItem records.ads:6:1-124:13>
 <PrivateAbsent records.ads:4:23-4:23>
-<PackageDecl ["Records"] records.ads:6:1-103:13>
+<PackageDecl ["Records"] records.ads:6:1-124:13>
 **************************
 \/ RAW <<HEADER>> ()  0 0 0 0
 \/ RAW <<INTERMEDIATE UPPER>> ()  0 0 0 0
 \/ DESCRIPTION  ()  0 0 0 0
 **************************
 <DefiningName records.ads:6:9-6:16>
 <Id "Records" records.ads:6:9-6:16>
-<PublicPart records.ads:6:19-103:1>
-<AdaNodeList records.ads:8:4-100:15>
+<PublicPart records.ads:6:19-124:1>
+<AdaNodeList records.ads:8:4-120:15>
 <ConcreteTypeDecl ["Record_Type_1"] records.ads:8:4-10:15>
 **************************
 \/ FIELD a (A)  8 8 9 8
@@ -183,6 +183,37 @@ end record;
 \/ DESCRIPTION  ()  0 0 0 0
 Comments for both fields must be extracted from the comments around.
 **************************
-<EndName records.ads:103:5-103:12>
-<Id "Records" records.ads:103:5-103:12>
-<PragmaNodeList records.ads:103:13-103:13>
+<ConcreteTypeDecl ["Foo_1"] records.ads:107:4-120:15>
+**************************
+\/ FIELD x (X)  107 107 108 107
+\/ FIELD a (A)  110 110 111 110
+\/ FIELD b (B)  112 112 113 112
+\/ FIELD c (C)  114 114 115 114
+\/ FIELD d (D)  116 116 117 116
+\/ FIELD e (E)  118 118 119 119
+\/ RAW <<LEADING>> ()  0 0 0 0
+\/ RAW <<TRAILING>> ()  0 0 0 0
+This is example of the record type with discriminant of integer type and
+variant part that depends from few kind of values.
+\/ SNIPPET ada ()  0 0 0 0
+type Foo_1 (X : Integer) is record
+   case X is
+      when -6 =>
+         A : Integer;
+      when -5 | -4 =>
+         B : Integer;
+      when -3 .. -1 =>
+         C : Integer;
+      when Natural =>
+         D : Integer;
+      when others =>
+         E : Integer;
+   end case;
+end record;
+\/ DESCRIPTION  ()  0 0 0 0
+This is example of the record type with discriminant of integer type and
+variant part that depends from few kind of values.
+**************************
+<EndName records.ads:124:5-124:12>
+<Id "Records" records.ads:124:5-124:12>
+<PragmaNodeList records.ads:124:13-124:13>