Merge branch 'topic/fix_kp_s814_034' into 'master'

Fix and correct KP-S814-034 detector

Closes #381

See merge request eng/libadalang/langkit-query-language!326

Author: HugoGGuerrier

lkql_checker/share/lkql/kp/KP-S814-034.lkql

@@ -1,13 +1,22 @@
-# Flag array aggregates with an others choice if the array component type is a
-# record type that has a string subcomponent.
+import stdlib
 
 @check(message="possible occurrence of KP S814-034", impact="17.*,18.*,19.*")
 fun kp_s814_034(node) =
-    node is Aggregate
-    when node.p_expression_type() is t@TypeDecl
-     when t.p_is_array_type()
-      and t.p_comp_type().p_is_record_type()
-      and (from node select first OthersDesignator) != null
-      and [a for a in (from node select AggregateAssoc)
-           if a.f_r_expr.p_expression_type().p_root_type()
-               .p_canonical_fully_qualified_name() == "standard.string"]
+    |" Flag array aggregates with an others choice if the array component type is a
+    |" record type that has a string subcomponent.
+    node is Aggregate(p_is_subaggregate(): false, p_expression_type(): t)
+    when
+        # Check that the aggregate is not a nested array aggregate
+        not node.p_is_subaggregate() and
+        t.p_is_array_type() and
+        stdlib.any([
+            assoc.f_designators is AlternativesList(any children: OthersDesignator)
+            for assoc in node.f_assocs.children
+        ]) and
+
+        # Then, ensure the component type is a record and has a String component
+        t.p_comp_type().p_is_record_type() and
+        stdlib.any([
+            t.p_root_type().p_canonical_fully_qualified_name() == "standard.string"
+            for t in stdlib.component_types(t.p_comp_type())
+        ])

testsuite/tests/checks/KP-S814-034/p.adb

@@ -1,17 +1,35 @@
 procedure P is
-
    Max_Error_Length : constant := 8;
    subtype Str is String (1 .. Max_Error_Length);
 
+   S_Init : constant Str := "INIT    ";
+
    type Rec is record
       Text : Str;
    end record;
 
+   type D_Rec is new Rec with record
+      I : Integer;
+   end record;
+
+   R_Init : constant Rec := (others => S_Init);
+
    type Arr is array (1 .. 16) of Rec;
+   type D_Arr is array (1 .. 16) of D_Rec;
+   type M_Arr is array (1 .. 2, 1 .. 2) of Rec;
+
+   type Rec_Arr is record
+      A : Arr := (others => (others => S_Init));                   --  FLAG
+      M_A : M_Arr := (others => (others => R_Init));               --  FLAG
+      D_A : D_Arr := (others => (Text => S_Init, I => 2));         --  FLAG
+   end record;
 
    Table : constant Arr :=
      (3 => (Text => "INVALID "), others => (Text => "OTHERS  "));  --  FLAG
    Table2 : constant Arr :=
      (1 => (Text => "  VALID "), 2 => (Text => "OTHERS  "));       --  NOFLAG
-
-end;
+   Table3 : constant Arr :=
+     (1 => (others => "  VALID "), 2 => (others => "OTHERS  "));   --  NOFLAG
+begin
+   null;
+end P;

testsuite/tests/checks/KP-S814-034/test.out

@@ -1,4 +1,16 @@
-p.adb:13:6: rule violation: possible occurrence of KP S814-034
-13 |      (3 => (Text => "INVALID "), others => (Text => "OTHERS  "));  --  FLAG
+p.adb:22:18: rule violation: possible occurrence of KP S814-034
+22 |       A : Arr := (others => (others => S_Init));                   --  FLAG
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+p.adb:23:22: rule violation: possible occurrence of KP S814-034
+23 |       M_A : M_Arr := (others => (others => R_Init));               --  FLAG
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+p.adb:24:22: rule violation: possible occurrence of KP S814-034
+24 |       D_A : D_Arr := (others => (Text => S_Init, I => 2));         --  FLAG
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+p.adb:28:6: rule violation: possible occurrence of KP S814-034
+28 |      (3 => (Text => "INVALID "), others => (Text => "OTHERS  "));  --  FLAG
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^