From 81b33b5d04971766005af5fb1dda9934279b7191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Th=C3=A9venoux?= <thevenoux@adacore.com>
Date: Thu, 23 May 2024 14:21:06 +0200
Subject: [PATCH] Add support for deep delta aggregates

As described here:
https://github.com/AdaCore/ada-spark-rfcs/blob/sttaft/ada-spark-rfcs/topic/rfc-deep-delta-aggregates.md.
---
 ada/nodes.lkt                                 |  205 +++-
 ada/parser.lkt                                |   23 +-
 .../aggregates_ada2020/test.out               |    4 +-
 .../deep_delta_aggregates/arr.adb             |   26 +
 .../deep_delta_aggregates/base.adb            |   95 ++
 .../deep_delta_aggregates/multidim.adb        |   17 +
 .../deep_delta_aggregates/test.adb            |   31 +
 .../deep_delta_aggregates/test.out            | 1016 +++++++++++++++++
 .../deep_delta_aggregates/test.yaml           |    2 +
 .../deep_delta_aggregates/test_array.adb      |   29 +
 .../name_resolution/delta_aggregate/arr.adb   |   18 +
 .../name_resolution/delta_aggregate/test.out  |   70 +-
 .../name_resolution/delta_aggregate/test.yaml |    2 +-
 .../name_resolution/target_name/test.out      |    2 +-
 .../parser/deep_delta_array_aggregate/input   |    1 +
 .../deep_delta_array_aggregate/test.out       |   50 +
 .../deep_delta_array_aggregate/test.yaml      |    2 +
 17 files changed, 1581 insertions(+), 12 deletions(-)
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/arr.adb
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/base.adb
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/multidim.adb
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/test.adb
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/test.out
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/test.yaml
 create mode 100644 testsuite/tests/name_resolution/deep_delta_aggregates/test_array.adb
 create mode 100644 testsuite/tests/name_resolution/delta_aggregate/arr.adb
 create mode 100644 testsuite/tests/parser/deep_delta_array_aggregate/input
 create mode 100644 testsuite/tests/parser/deep_delta_array_aggregate/test.out
 create mode 100644 testsuite/tests/parser/deep_delta_array_aggregate/test.yaml

diff --git a/ada/nodes.lkt b/ada/nodes.lkt
index f6b153ca3..7c7f5d008 100644
--- a/ada/nodes.lkt
+++ b/ada/nodes.lkt
@@ -2975,6 +2975,7 @@ class AggregateAssoc: BasicAssoc {
         elif agg.parent.as[AspectAssoc]?.id.name_is(s"Contract_Cases") then self.contract_cases_assoc_equation()
         elif agg is BracketAggregate and td?.has_aspect(s"Aggregate") then self.container_aggregate_equation(td)
         elif agg.parent is AspectClause | AspectAssoc | PragmaArgumentAssoc then %true
+        elif agg is DeltaAggregate then self.delta_aggregate_assoc_equation()
         elif atd.is_null then self.record_assoc_equation()
         else self.array_assoc_equation(atd, mra)
     }
@@ -2993,6 +2994,90 @@ class AggregateAssoc: BasicAssoc {
         )
     }
 
+    |" Equation for the case where this is an aggregate assoc for a delta
+    |" aggregate. This is an Ada 2022 feature (:rmlink:`4.3.4`). This equation
+    |" also supports the so called "deep" delta aggregates, a GNAT
+    |" experimental feature.
+    @with_dynvars(env, origin, entry_point)
+    fun delta_aggregate_assoc_equation(): Equation = {
+        val agg = self.base_aggregate();
+        val agg_type = agg.type_val().as[BaseTypeDecl];
+
+        # Determine whether this is a delta array aggregate rather than a deep
+        # delta aggregate by checking whether any alternative designates a
+        # position in an array.
+        val positional_assoc = agg_type.is_array() and not self.names().any(
+            # leftmost_name returns null if n starts with
+            # ArraySubcomponentChoiceName (which denotes a deep aggregate).
+            (n) => n.as[Name]?.leftmost_name().is_null
+        );
+
+        val agg_components = (not agg_type.is_array()).do(
+            (_) => node.unpack_formals(agg.all_components())
+        );
+
+        # If this is a record delta aggregate, try to match the components
+        # corresponding to these names in order to correctly set the
+        # environments from which they should be resolved.
+        val matches = self.names().map(
+            (n) => if n is Name then
+                # Get the leftmost name to match a component with if any
+                n.as[Name].leftmost_name().do(
+                    (id) => agg_components.find(
+                        (c) => c.name.matches(id)
+                    )
+                )
+            # If not a Name, there can be no component match (can be a BinOp
+            # denoting a range in an array for example.)
+            else null[Expr].as_entity
+        );
+
+        self.names().logic_all(
+            (n, i) => {
+                # Resolve the name from the matched component if any
+                bind env = matches[i].do(
+                    (l) => l.children_env(),
+                    default_val=env
+                );
+
+                n.as[Expr].as_entity.sub_equation()
+            } and (
+                # Check that all alternatives resolve to the same type
+                if i > 0 then
+                    %predicate(BaseTypeDecl.matching_type,
+                               n.as[Expr].type_var(),
+                               self.names()[0].as[Expr].type_var(),
+                               error_location=node)
+                else %true
+            ) and (
+                # We cannot set the expected type of the alternative in case the
+                # aggregate is a record aggregate or a deep one (both record and
+                # array) because the expected type of the alternative can be any
+                # one of the record components (including those from parents).
+                # Only simple array aggregate associations's alternatives can
+                # have an expected type (i.e., the alternative designates a
+                # position or a range).
+                if positional_assoc then
+                    %eq(n.as[Expr].expected_type_var(),
+                        agg_type.index_type(0))
+                    and n.as[Expr].matches_expected_type()
+                else %true
+            )
+        ) and (
+            # Set the expected type of the expression only once since all the
+            # alternatives should have the same type.
+            if positional_assoc then
+                %eq(self.expr().expected_type_var(), agg_type.comp_type())
+            else
+                %eq(self.expr().expected_type_var(),
+                    self.names()[0].as[Expr].type_var())
+        ) and (
+            # Build the equation for the expression
+            self.expr().sub_equation() and self.expr().matches_expected_type()
+        )
+    }
+
+
     |" Equation for the case where this is an aggregate assoc for a record
     |" type.
     @with_dynvars(env, origin, entry_point)
@@ -11999,6 +12084,34 @@ class Name: Expr {
         else node
     }
 
+    |" Returns the leftmost name following the name chain.
+    |" For example, given::
+    |"
+    |"     A (B) (C) (D)  -- Case 1: CallExpr
+    |"     (A) (B)        -- Case 2: ArraySubcomponentChoiceName
+    |"     A.B.C (D).E    -- Case 3: DottedName
+    |"     A              -- Case 4: Identifier
+    |"     A'First        -- Case 5: AttributeRef
+    |"
+    |" ``self.leftmost_name`` will return:
+    |"
+    |"   - A for Case 1,
+    |"   - null for Case 2,
+    |"   - A for Case 3,
+    |"   - A for Case 4,
+    |"   - A for Case 5.
+    |"
+    |" This property has been introduced to resolve deep delta aggregates so it
+    |" may not be useful in other context as is. Do not make it exported.
+    fun leftmost_name(): Name = match node {
+        case ce: CallExpr => ce.name.leftmost_name()
+        case ascn: ArraySubcomponentChoiceName =>
+            ascn.name?.leftmost_name()
+        case dn: DottedName => dn.prefix.leftmost_name()
+        case ar: AttributeRef => ar.prefix.leftmost_name()
+        case _ => node
+    }
+
     |" Construct the xref equation for the chain of parent nested names.
     @with_dynvars(env, origin, entry_point)
     fun parent_name_equation(typ: Entity[BaseTypeDecl], root: Name): Equation = {
@@ -13255,7 +13368,18 @@ class CallExpr: Name {
             }
         ), default_val=%false
     )
-    else self.all_args_xref_equation(root) and (
+    else {
+        # If we are resolving this CallExpr from a DeltaAggregate, env is the
+        # one of the aggregate type, so we need to bind env to self's env to
+        # resolve the CallExpr params (array indicies).
+        bind env = if entry_point.as[AggregateAssoc]?.as_entity
+            .base_aggregate() is DeltaAggregate
+        then
+            self.children_env()
+        else env;
+
+        self.all_args_xref_equation(root)
+    } and (
         # For each potential entity match, we want to express the
         # following constraints:
         {
@@ -14265,6 +14389,85 @@ class DottedName: Name {
         self.prefix.is_constant() or self.suffix.is_constant()
 }
 
+
+|" Name for an array subcomponent choice of a deep delta aggregate.
+class ArraySubcomponentChoiceName: Name {
+    # This node can basically be seen as a CallExpr where `name` can be a null
+    # node.
+
+    # The name field can be null when the ArraySubcomponentChoiceName is of the
+    # form "(suffix)" (where suffix is a list of expression: "expr{, expr}"
+    # representing the indexes of a mono- or multi-dimentional array, or a
+    # range). When the node is of the form of "name (suffix)", name can only be
+    # another ArraySubcomponentChoiceName or a DottedName.
+    @parse_field @nullable name: Name
+    @parse_field suffix: AdaNode
+
+    fun suffix_exprs(): Array[Entity[Expr]] =
+        self.suffix.as![AssocList].map(
+            (a) => a.as![ParamAssoc].expr()
+        )
+
+    |" Return the corresponding delta aggregate's ancestor expression type.
+    @memoized
+    fun delta_aggregate_ancestor_expr_type(): Entity[BaseTypeDecl] =
+        node.parents(with_self=false).find(
+            (p) => p is DeltaAggregate
+        ).as[DeltaAggregate].ancestor_expr.as_bare_entity.expression_type()
+
+    fun ref_var(): LogicVar =
+        node.as_bare_entity.delta_aggregate_ancestor_expr_type().name.ref_var()
+
+    fun name_symbol(): Symbol =
+        node.name.do(
+            (n) => n.name_symbol()
+        )
+
+    fun xref_equation(): Equation =
+        # Resolve name if any
+        self.name.do(
+            (n) => n.sub_equation(), default_val=%true
+        ) and (
+            self.suffix_exprs().logic_all(
+            # Resolve all suffix's indexes/range independently
+            (a, i) => a.sub_equation()
+            and %eq(a.expected_type_var(),
+                    node.delta_aggregate_ancestor_expr_type().index_type(i))
+            and a.matches_expected_type()
+        )) and (
+            # Self's type is bound to the component type of Self's name
+            # designated type if any (if name is null, the type is given by the
+            # delta aggregate itself).
+            if self.name is DottedName
+            then %eq(self.name.type_var(), self.type_var(),
+                     conv_prop=BaseTypeDecl.comp_type)
+            else %eq(self.type_var(),
+                     self.name.do(
+                         (n) => n.name_designated_type().comp_type(),
+                         default_val=
+                         node.delta_aggregate_ancestor_expr_type().comp_type()
+                     )
+                )
+        )
+
+    fun designated_type_impl(): Entity[BaseTypeDecl] =
+        self.name.do(
+            (n) => n.designated_type_impl(),
+            default_val=node.delta_aggregate_ancestor_expr_type().comp_type()
+        )
+
+    fun designated_env(): LexicalEnv =
+        self.name.do(
+            (n) => n.name_designated_type().defining_env(),
+            default_val={
+                bind include_ud_indexing = false;
+
+                node.delta_aggregate_ancestor_expr_type().defining_env()
+            }
+        )
+}
+
+
 |" self name in ``end ...;`` syntactic constructs.
 class EndName: Name {
     @parse_field name: Name
diff --git a/ada/parser.lkt b/ada/parser.lkt
index 0a4703908..feb319e5f 100644
--- a/ada/parser.lkt
+++ b/ada/parser.lkt
@@ -963,7 +963,13 @@ grammar ada_grammar {
         | DeltaAggregate(
             "("
             expr
-            "with" "delta" / AssocList+(aggregate_assoc, ",") ")"
+            "with" "delta"
+            /
+            # TODO: We use a ?pick parser below only to satisfy unparsing
+            # because this is actually not optional in the case of delta
+            # aggregates. See langkit#816.
+            AssocList+(AggregateAssoc(?pick(delta_choice_list "=>") expr), ",")
+            ")"
         )
         | Aggregate(
             "("
@@ -1158,6 +1164,12 @@ grammar ada_grammar {
         )
         | name |> when(Name.is_range_attribute)
     )
+    array_subcomponent_choice <- or(
+        | DottedName(array_subcomponent_choice "." direct_name)
+        | ArraySubcomponentChoiceName(array_subcomponent_choice
+                                      "(" call_suffix ")")
+        | ArraySubcomponentChoiceName(null(Name) "(" call_suffix ")")
+    )
     choice <- or(
         | discrete_range
         | discrete_subtype_indication
@@ -1165,6 +1177,15 @@ grammar ada_grammar {
         | others_designator
     )
     choice_list <- AlternativesList+(choice, "|")
+    delta_choice_list <- AlternativesList+(
+        or(
+            | array_subcomponent_choice
+            | discrete_range
+            | expr
+            | others_designator
+        ),
+        "|"
+    )
     rel_op <- or(Op.NotIn("not" "in") | Op.In("in"))
     membership_choice <- or(
         | discrete_range
diff --git a/testsuite/tests/name_resolution/aggregates_ada2020/test.out b/testsuite/tests/name_resolution/aggregates_ada2020/test.out
index 6f29fd252..cc526324f 100644
--- a/testsuite/tests/name_resolution/aggregates_ada2020/test.out
+++ b/testsuite/tests/name_resolution/aggregates_ada2020/test.out
@@ -75,7 +75,7 @@ Expr: <Id "P" test_brack_aggr.adb:15:19-15:20>
   expected type: None
 Expr: <Id "Y" test_brack_aggr.adb:15:32-15:33>
   references:    <DefiningName "Y" test_brack_aggr.adb:10:10-10:11>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <Int test_brack_aggr.adb:15:37-15:39>
   references:    None
@@ -98,7 +98,7 @@ Expr: <Id "P" test_brack_aggr.adb:18:19-18:20>
   expected type: None
 Expr: <Id "Y" test_brack_aggr.adb:18:32-18:33>
   references:    <DefiningName "Y" test_brack_aggr.adb:10:10-10:11>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <Int test_brack_aggr.adb:18:37-18:39>
   references:    None
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/arr.adb b/testsuite/tests/name_resolution/deep_delta_aggregates/arr.adb
new file mode 100644
index 000000000..81996e1ad
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/arr.adb
@@ -0,0 +1,26 @@
+procedure Arr is
+
+   type R is record
+      F, G, H : Integer;
+   end record;
+
+   type My_Arr is array (Positive range <>) of R;
+
+   procedure Test (X : in out My_Arr; I, J, K, L : Positive);
+
+   procedure Test (X : in out My_Arr; I, J, K, L : Positive) is
+   begin
+      X := (X with delta
+           (I).F => 1,
+           (J).G => 2,
+           (K).F => 3,
+           (L).H => 4);
+      pragma Test_Statement;
+
+      X := ((if True then X else X) with delta (I).F => 4);
+      pragma Test_Statement;
+   end Test;
+
+begin
+   null;
+end Arr;
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/base.adb b/testsuite/tests/name_resolution/deep_delta_aggregates/base.adb
new file mode 100644
index 000000000..12355018f
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/base.adb
@@ -0,0 +1,95 @@
+procedure Base with SPARK_Mode is
+
+   --  Handling of simple aggregates with only record components
+
+   procedure Test_Record with Global => null is
+      type R1 is record
+         F1, F2, F3 : Integer;
+      end record;
+      type R2 is record
+         G1, G2, G3 : R1;
+      end record;
+
+      X : R2 := (others => (others => 1));
+      Y : R2 := (X with delta G1.F1 => 2, G2.F2 => 3, G3 => (others => 4));
+      pragma Test_Statement;
+   begin
+      null;
+   end Test_Record;
+
+   --  General case
+
+   procedure Test_Array (I, J, C : Integer) with
+     Global => null,
+     Pre => I in 1 .. C and J in 1 .. C
+   is
+      type R1 is record
+         F1, F2, F3 : Integer;
+      end record;
+      type R2 is record
+         G1 : R1;
+         G2, G3 : Integer;
+      end record;
+      type R2_Arr is array (Integer range 1 .. C) of R2;
+      type R3 is record
+         H1 : R2_Arr;
+         H2 : Integer;
+      end record;
+
+      X : R3 := (H1 => (others => (G1 => (others => 1), others => 1)), H2 => 1);
+      Y : R3 := (X with delta
+                   H1 (I).G1 => (others => 2),
+                   H1 (J).G1.F2 => 3,
+                   H2 => 4);
+      pragma Test_Statement;
+   begin
+      null;
+   end Test_Array;
+
+   --  Test with a nested array access
+
+   procedure Test_Nested_Array (C : Integer) with
+     Global => null
+   is
+      type R1 is record
+         F1, F2, F3 : Integer;
+      end record;
+      type R1_Arr is array (Integer range 1 .. 10) of R1;
+      type R2 is record
+         G1 : R1_Arr;
+         G2, G3 : Integer;
+      end record;
+      type R2_Arr is array (Integer range 1 .. C) of R2;
+      type R3 is record
+         H1 : R2_Arr;
+         H2 : Integer;
+      end record;
+
+      --  Test with possibly overlapping components
+
+      procedure Test (I, J, K, L, M, N, P, Q : Integer) with
+        Global => C,
+        Pre => I in 1 .. C and J in 1 .. C and L in 1 .. C and N in 1 .. C
+        and K in 1 .. 10 and M in 1 .. 10 and P in 1 .. 10 and Q in 1 .. C
+      is
+         X : R3 :=
+           (H1 => (others => (G1 => (others => (others => 1)), others => 1)),
+            H2 => 1);
+         Y : R3 := (X with delta
+                      H1 (I).G1 => (others => (others => 2)),
+                      H1 (J).G1 (K) => (others => 3),
+                      H1 (L).G1 (M).F1 => 4,
+                      H1 (N).G1 (P).F2 => 5,
+                      H1 (Q).G2 => 6,
+                      H2 => 7);
+         pragma Test_Statement;
+      begin
+         null;
+      end Test;
+   begin
+      null;
+   end Test_Nested_Array;
+
+begin
+   null;
+end Base;
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/multidim.adb b/testsuite/tests/name_resolution/deep_delta_aggregates/multidim.adb
new file mode 100644
index 000000000..b2772c591
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/multidim.adb
@@ -0,0 +1,17 @@
+procedure Multidim with SPARK_Mode is
+   type Segment is array (1 .. 2) of Integer;
+   S : Segment;
+
+   type Point is record
+      X, Y : Segment;
+   end record;
+
+   type Triangle is array (1 .. 3) of Point;
+   T : Triangle;
+
+   type Multi is array (1 .. 3, Boolean) of Triangle;
+   M : Multi;
+begin
+   M := (M with delta (1, True) (1).Y (2) => 1);
+   pragma Test_Statement;
+end Multidim;
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/test.adb b/testsuite/tests/name_resolution/deep_delta_aggregates/test.adb
new file mode 100644
index 000000000..d8ced6b0e
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/test.adb
@@ -0,0 +1,31 @@
+pragma Extensions_Allowed (All_Extensions);
+
+procedure Test is
+   type R is record
+      F, G, H : Integer;
+   end record;
+
+   type My_Arr is array (Positive range <>) of R;
+
+   type S is record
+      A : My_Arr (1 .. 2);
+      B : Integer;
+   end record;
+
+   A : My_Arr := ((1, 2, 3), (4, 5, 6));
+
+   B : S := (A => A, B => 1);
+
+begin
+   A := (A with delta (1) => (0,0,0));
+   pragma Test_Statement;
+
+   A := (A with delta (A (1).F) => (1,1,1));
+   pragma Test_Statement;
+
+   B := (B with delta A (1).F => 1);
+   pragma Test_Statement;
+
+   B := (B with delta A (B.B).F => 1);
+   pragma Test_Statement;
+end;
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/test.out b/testsuite/tests/name_resolution/deep_delta_aggregates/test.out
new file mode 100644
index 000000000..919c7657e
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/test.out
@@ -0,0 +1,1016 @@
+Analyzing base.adb
+##################
+
+Resolving xrefs for node <ObjectDecl ["Y"] base.adb:14:7-14:76>
+***************************************************************
+
+Expr: <Id "R2" base.adb:14:11-14:13>
+  references:    <DefiningName "R2" base.adb:9:12-9:14>
+  type:          None
+  expected type: None
+Expr: <DeltaAggregate base.adb:14:17-14:75>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:9:7-11:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:9:7-11:18>
+Expr: <Id "X" base.adb:14:18-14:19>
+  references:    <DefiningName "X" base.adb:13:7-13:8>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:9:7-11:18>
+  expected type: None
+Expr: <DottedName base.adb:14:31-14:36>
+  references:    <DefiningName "F1" base.adb:7:10-7:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Id "G1" base.adb:14:31-14:33>
+  references:    <DefiningName "G1" base.adb:10:10-10:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+Expr: <Id "F1" base.adb:14:34-14:36>
+  references:    <DefiningName "F1" base.adb:7:10-7:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:14:40-14:41>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName base.adb:14:43-14:48>
+  references:    <DefiningName "F2" base.adb:7:14-7:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Id "G2" base.adb:14:43-14:45>
+  references:    <DefiningName "G2" base.adb:10:14-10:16>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+Expr: <Id "F2" base.adb:14:46-14:48>
+  references:    <DefiningName "F2" base.adb:7:14-7:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:14:52-14:53>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G3" base.adb:14:55-14:57>
+  references:    <DefiningName "G3" base.adb:10:18-10:20>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+  expected type: None
+Expr: <Aggregate base.adb:14:61-14:74>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:6:7-8:18>
+Expr: <Int base.adb:14:72-14:73>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <ObjectDecl ["Y"] base.adb:40:7-43:29>
+***************************************************************
+
+Expr: <Id "R3" base.adb:40:11-40:13>
+  references:    <DefiningName "R3" base.adb:34:12-34:14>
+  type:          None
+  expected type: None
+Expr: <DeltaAggregate base.adb:40:17-43:28>
+  type:          <ConcreteTypeDecl ["R3"] base.adb:34:7-37:18>
+  expected type: <ConcreteTypeDecl ["R3"] base.adb:34:7-37:18>
+Expr: <Id "X" base.adb:40:18-40:19>
+  references:    <DefiningName "X" base.adb:39:7-39:8>
+  type:          <ConcreteTypeDecl ["R3"] base.adb:34:7-37:18>
+  expected type: None
+Expr: <DottedName base.adb:41:20-41:29>
+  references:    <DefiningName "G1" base.adb:30:10-30:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+  expected type: None
+Expr: <CallExpr base.adb:41:20-41:26>
+  references:    <DefiningName "H1" base.adb:35:10-35:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:29:7-32:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:29:7-32:18>
+Expr: <Id "H1" base.adb:41:20-41:22>
+  references:    <DefiningName "H1" base.adb:35:10-35:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:33:7-33:57>
+  expected type: None
+Expr: <Id "I" base.adb:41:24-41:25>
+  references:    <DefiningName "I" base.adb:22:26-22:27>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:41:27-41:29>
+  references:    <DefiningName "G1" base.adb:30:10-30:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+  expected type: None
+Expr: <Aggregate base.adb:41:33-41:46>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+Expr: <Int base.adb:41:44-41:45>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName base.adb:42:20-42:32>
+  references:    <DefiningName "F2" base.adb:27:14-27:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName base.adb:42:20-42:29>
+  references:    <DefiningName "G1" base.adb:30:10-30:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+Expr: <CallExpr base.adb:42:20-42:26>
+  references:    <DefiningName "H1" base.adb:35:10-35:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:29:7-32:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:29:7-32:18>
+Expr: <Id "H1" base.adb:42:20-42:22>
+  references:    <DefiningName "H1" base.adb:35:10-35:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:33:7-33:57>
+  expected type: None
+Expr: <Id "J" base.adb:42:24-42:25>
+  references:    <DefiningName "J" base.adb:22:29-22:30>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:42:27-42:29>
+  references:    <DefiningName "G1" base.adb:30:10-30:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:26:7-28:18>
+Expr: <Id "F2" base.adb:42:30-42:32>
+  references:    <DefiningName "F2" base.adb:27:14-27:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:42:36-42:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "H2" base.adb:43:20-43:22>
+  references:    <DefiningName "H2" base.adb:36:10-36:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:43:26-43:27>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <ObjectDecl ["Y"] base.adb:78:10-84:32>
+****************************************************************
+
+Expr: <Id "R3" base.adb:78:14-78:16>
+  references:    <DefiningName "R3" base.adb:63:12-63:14>
+  type:          None
+  expected type: None
+Expr: <DeltaAggregate base.adb:78:20-84:31>
+  type:          <ConcreteTypeDecl ["R3"] base.adb:63:7-66:18>
+  expected type: <ConcreteTypeDecl ["R3"] base.adb:63:7-66:18>
+Expr: <Id "X" base.adb:78:21-78:22>
+  references:    <DefiningName "X" base.adb:75:10-75:11>
+  type:          <ConcreteTypeDecl ["R3"] base.adb:63:7-66:18>
+  expected type: None
+Expr: <DottedName base.adb:79:23-79:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <CallExpr base.adb:79:23-79:29>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+Expr: <Id "H1" base.adb:79:23-79:25>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:62:7-62:57>
+  expected type: None
+Expr: <Id "I" base.adb:79:27-79:28>
+  references:    <DefiningName "I" base.adb:70:23-70:24>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:79:30-79:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <Aggregate base.adb:79:36-79:61>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+Expr: <Aggregate base.adb:79:47-79:60>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+Expr: <Int base.adb:79:58-79:59>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <CallExpr base.adb:80:23-80:36>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+  expected type: None
+Expr: <DottedName base.adb:80:23-80:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <CallExpr base.adb:80:23-80:29>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+Expr: <Id "H1" base.adb:80:23-80:25>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:62:7-62:57>
+  expected type: None
+Expr: <Id "J" base.adb:80:27-80:28>
+  references:    <DefiningName "J" base.adb:70:26-70:27>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:80:30-80:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <Id "K" base.adb:80:34-80:35>
+  references:    <DefiningName "K" base.adb:70:29-70:30>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Aggregate base.adb:80:40-80:53>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+Expr: <Int base.adb:80:51-80:52>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName base.adb:81:23-81:39>
+  references:    <DefiningName "F1" base.adb:55:10-55:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <CallExpr base.adb:81:23-81:36>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+Expr: <DottedName base.adb:81:23-81:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <CallExpr base.adb:81:23-81:29>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+Expr: <Id "H1" base.adb:81:23-81:25>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:62:7-62:57>
+  expected type: None
+Expr: <Id "L" base.adb:81:27-81:28>
+  references:    <DefiningName "L" base.adb:70:32-70:33>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:81:30-81:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <Id "M" base.adb:81:34-81:35>
+  references:    <DefiningName "M" base.adb:70:35-70:36>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "F1" base.adb:81:37-81:39>
+  references:    <DefiningName "F1" base.adb:55:10-55:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:81:43-81:44>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName base.adb:82:23-82:39>
+  references:    <DefiningName "F2" base.adb:55:14-55:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <CallExpr base.adb:82:23-82:36>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+  expected type: <ConcreteTypeDecl ["R1"] base.adb:54:7-56:18>
+Expr: <DottedName base.adb:82:23-82:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <CallExpr base.adb:82:23-82:29>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+Expr: <Id "H1" base.adb:82:23-82:25>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:62:7-62:57>
+  expected type: None
+Expr: <Id "N" base.adb:82:27-82:28>
+  references:    <DefiningName "N" base.adb:70:38-70:39>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G1" base.adb:82:30-82:32>
+  references:    <DefiningName "G1" base.adb:59:10-59:12>
+  type:          <ConcreteTypeDecl ["R1_Arr"] base.adb:57:7-57:58>
+  expected type: None
+Expr: <Id "P" base.adb:82:34-82:35>
+  references:    <DefiningName "P" base.adb:70:41-70:42>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "F2" base.adb:82:37-82:39>
+  references:    <DefiningName "F2" base.adb:55:14-55:16>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:82:43-82:44>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName base.adb:83:23-83:32>
+  references:    <DefiningName "G2" base.adb:60:10-60:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <CallExpr base.adb:83:23-83:29>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+  expected type: <ConcreteTypeDecl ["R2"] base.adb:58:7-61:18>
+Expr: <Id "H1" base.adb:83:23-83:25>
+  references:    <DefiningName "H1" base.adb:64:10-64:12>
+  type:          <ConcreteTypeDecl ["R2_Arr"] base.adb:62:7-62:57>
+  expected type: None
+Expr: <Id "Q" base.adb:83:27-83:28>
+  references:    <DefiningName "Q" base.adb:70:44-70:45>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "G2" base.adb:83:30-83:32>
+  references:    <DefiningName "G2" base.adb:60:10-60:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:83:36-83:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "H2" base.adb:84:23-84:25>
+  references:    <DefiningName "H2" base.adb:65:10-65:12>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int base.adb:84:29-84:30>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+
+Analyzing arr.adb
+#################
+
+Resolving xrefs for node <AssignStmt arr.adb:13:7-17:24>
+********************************************************
+
+Expr: <Id "X" arr.adb:13:7-13:8>
+  references:    <DefiningName "X" arr.adb:11:20-11:21>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <DeltaAggregate arr.adb:13:12-17:23>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+Expr: <Id "X" arr.adb:13:13-13:14>
+  references:    <DefiningName "X" arr.adb:11:20-11:21>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <DottedName arr.adb:14:12-14:17>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName arr.adb:14:12-14:15>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+Expr: <Id "I" arr.adb:14:13-14:14>
+  references:    <DefiningName "I" arr.adb:11:39-11:40>
+  type:          <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" arr.adb:14:16-14:17>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int arr.adb:14:21-14:22>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName arr.adb:15:12-15:17>
+  references:    <DefiningName "G" arr.adb:4:10-4:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName arr.adb:15:12-15:15>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+Expr: <Id "J" arr.adb:15:13-15:14>
+  references:    <DefiningName "J" arr.adb:11:42-11:43>
+  type:          <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "G" arr.adb:15:16-15:17>
+  references:    <DefiningName "G" arr.adb:4:10-4:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int arr.adb:15:21-15:22>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName arr.adb:16:12-16:17>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName arr.adb:16:12-16:15>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+Expr: <Id "K" arr.adb:16:13-16:14>
+  references:    <DefiningName "K" arr.adb:11:45-11:46>
+  type:          <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" arr.adb:16:16-16:17>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int arr.adb:16:21-16:22>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName arr.adb:17:12-17:17>
+  references:    <DefiningName "H" arr.adb:4:13-4:14>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName arr.adb:17:12-17:15>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+Expr: <Id "L" arr.adb:17:13-17:14>
+  references:    <DefiningName "L" arr.adb:11:48-11:49>
+  type:          <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "H" arr.adb:17:16-17:17>
+  references:    <DefiningName "H" arr.adb:4:13-4:14>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int arr.adb:17:21-17:22>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt arr.adb:20:7-20:60>
+********************************************************
+
+Expr: <Id "X" arr.adb:20:7-20:8>
+  references:    <DefiningName "X" arr.adb:11:20-11:21>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <DeltaAggregate arr.adb:20:12-20:59>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+Expr: <ParenExpr arr.adb:20:13-20:36>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <IfExpr arr.adb:20:14-20:35>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <Id "True" arr.adb:20:17-20:21>
+  references:    <DefiningName "True" __standard:3:27-3:31>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <Id "X" arr.adb:20:27-20:28>
+  references:    <DefiningName "X" arr.adb:11:20-11:21>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <Id "X" arr.adb:20:34-20:35>
+  references:    <DefiningName "X" arr.adb:11:20-11:21>
+  type:          <ConcreteTypeDecl ["My_Arr"] arr.adb:7:4-7:50>
+  expected type: None
+Expr: <DottedName arr.adb:20:48-20:53>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName arr.adb:20:48-20:51>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["R"] arr.adb:3:4-5:15>
+Expr: <Id "I" arr.adb:20:49-20:50>
+  references:    <DefiningName "I" arr.adb:11:39-11:40>
+  type:          <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" arr.adb:20:52-20:53>
+  references:    <DefiningName "F" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int arr.adb:20:57-20:58>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+
+Analyzing test_array.adb
+########################
+
+Resolving xrefs for node <AssignStmt test_array.adb:15:4-15:38>
+***************************************************************
+
+Expr: <Id "S" test_array.adb:15:4-15:5>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <DeltaAggregate test_array.adb:15:9-15:37>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+Expr: <Id "S" test_array.adb:15:10-15:11>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:15:23-15:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: None
+Expr: <Int test_array.adb:15:24-15:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Aggregate test_array.adb:15:30-15:36>
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Int test_array.adb:15:31-15:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test_array.adb:15:34-15:35>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test_array.adb:18:4-18:35>
+***************************************************************
+
+Expr: <Id "S" test_array.adb:18:4-18:5>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <DeltaAggregate test_array.adb:18:9-18:34>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+Expr: <Id "S" test_array.adb:18:10-18:11>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <DottedName test_array.adb:18:23-18:28>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:18:23-18:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Int test_array.adb:18:24-18:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "X" test_array.adb:18:27-18:28>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int test_array.adb:18:32-18:33>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test_array.adb:21:4-21:65>
+***************************************************************
+
+Expr: <Id "S" test_array.adb:21:4-21:5>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <DeltaAggregate test_array.adb:21:9-21:64>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+Expr: <Id "S" test_array.adb:21:10-21:11>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <DottedName test_array.adb:21:23-21:28>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:21:23-21:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Int test_array.adb:21:24-21:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "X" test_array.adb:21:27-21:28>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName test_array.adb:21:31-21:36>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:21:31-21:34>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Int test_array.adb:21:32-21:33>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" test_array.adb:21:35-21:36>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName test_array.adb:21:40-21:46>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <CallExpr test_array.adb:21:40-21:44>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Id "S" test_array.adb:21:40-21:41>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <Int test_array.adb:21:42-21:43>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "X" test_array.adb:21:45-21:46>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <DottedName test_array.adb:21:48-21:53>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:21:48-21:51>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Int test_array.adb:21:49-21:50>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" test_array.adb:21:52-21:53>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName test_array.adb:21:57-21:63>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <CallExpr test_array.adb:21:57-21:61>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <Id "S" test_array.adb:21:57-21:58>
+  references:    <DefiningName "S" test_array.adb:7:4-7:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <Int test_array.adb:21:59-21:60>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" test_array.adb:21:62-21:63>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test_array.adb:24:4-24:46>
+***************************************************************
+
+Expr: <Id "T" test_array.adb:24:4-24:5>
+  references:    <DefiningName "T" test_array.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Triangle"] test_array.adb:9:4-9:47>
+  expected type: None
+Expr: <DeltaAggregate test_array.adb:24:9-24:45>
+  type:          <ConcreteTypeDecl ["Triangle"] test_array.adb:9:4-9:47>
+  expected type: <ConcreteTypeDecl ["Triangle"] test_array.adb:9:4-9:47>
+Expr: <Id "T" test_array.adb:24:10-24:11>
+  references:    <DefiningName "T" test_array.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Triangle"] test_array.adb:9:4-9:47>
+  expected type: None
+Expr: <DottedName test_array.adb:24:23-24:31>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:24:23-24:29>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <ArraySubcomponentChoiceName test_array.adb:24:23-24:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <Int test_array.adb:24:24-24:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test_array.adb:24:27-24:28>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" test_array.adb:24:30-24:31>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName test_array.adb:24:35-24:44>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <CallExpr test_array.adb:24:35-24:42>
+  references:    <DefiningName "T" test_array.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <CallExpr test_array.adb:24:35-24:39>
+  references:    <DefiningName "T" test_array.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <Id "T" test_array.adb:24:35-24:36>
+  references:    <DefiningName "T" test_array.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Triangle"] test_array.adb:9:4-9:47>
+  expected type: None
+Expr: <Int test_array.adb:24:37-24:38>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test_array.adb:24:40-24:41>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "X" test_array.adb:24:43-24:44>
+  references:    <DefiningName "X" test_array.adb:3:7-3:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test_array.adb:27:4-27:41>
+***************************************************************
+
+Expr: <Id "C" test_array.adb:27:4-27:5>
+  references:    <DefiningName "C" test_array.adb:13:4-13:5>
+  type:          <ConcreteTypeDecl ["Cube"] test_array.adb:12:4-12:51>
+  expected type: None
+Expr: <DeltaAggregate test_array.adb:27:9-27:40>
+  type:          <ConcreteTypeDecl ["Cube"] test_array.adb:12:4-12:51>
+  expected type: <ConcreteTypeDecl ["Cube"] test_array.adb:12:4-12:51>
+Expr: <Id "C" test_array.adb:27:10-27:11>
+  references:    <DefiningName "C" test_array.adb:13:4-13:5>
+  type:          <ConcreteTypeDecl ["Cube"] test_array.adb:12:4-12:51>
+  expected type: None
+Expr: <DottedName test_array.adb:27:23-27:34>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test_array.adb:27:23-27:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+  expected type: <ConcreteTypeDecl ["Point"] test_array.adb:2:4-4:15>
+Expr: <ArraySubcomponentChoiceName test_array.adb:27:23-27:29>
+  references:    None
+  type:          <ConcreteTypeDecl ["Segment"] test_array.adb:6:4-6:44>
+  expected type: None
+Expr: <Int test_array.adb:27:24-27:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test_array.adb:27:27-27:28>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test_array.adb:27:30-27:31>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" test_array.adb:27:33-27:34>
+  references:    <DefiningName "Y" test_array.adb:3:10-3:11>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int test_array.adb:27:38-27:39>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+
+Analyzing multidim.adb
+######################
+
+Resolving xrefs for node <AssignStmt multidim.adb:15:4-15:49>
+*************************************************************
+
+Expr: <Id "M" multidim.adb:15:4-15:5>
+  references:    <DefiningName "M" multidim.adb:13:4-13:5>
+  type:          <ConcreteTypeDecl ["Multi"] multidim.adb:12:4-12:54>
+  expected type: None
+Expr: <DeltaAggregate multidim.adb:15:9-15:48>
+  type:          <ConcreteTypeDecl ["Multi"] multidim.adb:12:4-12:54>
+  expected type: <ConcreteTypeDecl ["Multi"] multidim.adb:12:4-12:54>
+Expr: <Id "M" multidim.adb:15:10-15:11>
+  references:    <DefiningName "M" multidim.adb:13:4-13:5>
+  type:          <ConcreteTypeDecl ["Multi"] multidim.adb:12:4-12:54>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName multidim.adb:15:23-15:42>
+  references:    None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <DottedName multidim.adb:15:23-15:38>
+  references:    <DefiningName "Y" multidim.adb:6:10-6:11>
+  type:          <ConcreteTypeDecl ["Segment"] multidim.adb:2:4-2:46>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName multidim.adb:15:23-15:36>
+  references:    None
+  type:          <ConcreteTypeDecl ["Point"] multidim.adb:5:4-7:15>
+  expected type: <ConcreteTypeDecl ["Point"] multidim.adb:5:4-7:15>
+Expr: <ArraySubcomponentChoiceName multidim.adb:15:23-15:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["Triangle"] multidim.adb:9:4-9:45>
+  expected type: None
+Expr: <Int multidim.adb:15:24-15:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "True" multidim.adb:15:27-15:31>
+  references:    <DefiningName "True" __standard:3:27-3:31>
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+  expected type: <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
+Expr: <Int multidim.adb:15:34-15:35>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "Y" multidim.adb:15:37-15:38>
+  references:    <DefiningName "Y" multidim.adb:6:10-6:11>
+  type:          <ConcreteTypeDecl ["Segment"] multidim.adb:2:4-2:46>
+  expected type: None
+Expr: <Int multidim.adb:15:40-15:41>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int multidim.adb:15:46-15:47>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+
+Analyzing test.adb
+##################
+
+Resolving xrefs for node <AssignStmt test.adb:20:4-20:39>
+*********************************************************
+
+Expr: <Id "A" test.adb:20:4-20:5>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <DeltaAggregate test.adb:20:9-20:38>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+Expr: <Id "A" test.adb:20:10-20:11>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test.adb:20:23-20:26>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: None
+Expr: <Int test.adb:20:24-20:25>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Aggregate test.adb:20:30-20:37>
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+Expr: <Int test.adb:20:31-20:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test.adb:20:33-20:34>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test.adb:20:35-20:36>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test.adb:23:4-23:45>
+*********************************************************
+
+Expr: <Id "A" test.adb:23:4-23:5>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <DeltaAggregate test.adb:23:9-23:44>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+Expr: <Id "A" test.adb:23:10-23:11>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <ArraySubcomponentChoiceName test.adb:23:23-23:32>
+  references:    None
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: None
+Expr: <DottedName test.adb:23:24-23:31>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <CallExpr test.adb:23:24-23:29>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+Expr: <Id "A" test.adb:23:24-23:25>
+  references:    <DefiningName "A" test.adb:15:4-15:5>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <Int test.adb:23:27-23:28>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" test.adb:23:30-23:31>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Aggregate test.adb:23:36-23:43>
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+Expr: <Int test.adb:23:37-23:38>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test.adb:23:39-23:40>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Int test.adb:23:41-23:42>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test.adb:26:4-26:37>
+*********************************************************
+
+Expr: <Id "B" test.adb:26:4-26:5>
+  references:    <DefiningName "B" test.adb:17:4-17:5>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: None
+Expr: <DeltaAggregate test.adb:26:9-26:36>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+Expr: <Id "B" test.adb:26:10-26:11>
+  references:    <DefiningName "B" test.adb:17:4-17:5>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: None
+Expr: <DottedName test.adb:26:23-26:30>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <CallExpr test.adb:26:23-26:28>
+  references:    <DefiningName "A" test.adb:11:7-11:8>
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+Expr: <Id "A" test.adb:26:23-26:24>
+  references:    <DefiningName "A" test.adb:11:7-11:8>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <Int test.adb:26:26-26:27>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" test.adb:26:29-26:30>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int test.adb:26:34-26:35>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+Resolving xrefs for node <AssignStmt test.adb:29:4-29:39>
+*********************************************************
+
+Expr: <Id "B" test.adb:29:4-29:5>
+  references:    <DefiningName "B" test.adb:17:4-17:5>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: None
+Expr: <DeltaAggregate test.adb:29:9-29:38>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+Expr: <Id "B" test.adb:29:10-29:11>
+  references:    <DefiningName "B" test.adb:17:4-17:5>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: None
+Expr: <DottedName test.adb:29:23-29:32>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <CallExpr test.adb:29:23-29:30>
+  references:    <DefiningName "A" test.adb:11:7-11:8>
+  type:          <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+  expected type: <ConcreteTypeDecl ["R"] test.adb:4:4-6:15>
+Expr: <Id "A" test.adb:29:23-29:24>
+  references:    <DefiningName "A" test.adb:11:7-11:8>
+  type:          <ConcreteTypeDecl ["My_Arr"] test.adb:8:4-8:50>
+  expected type: None
+Expr: <DottedName test.adb:29:26-29:29>
+  references:    <DefiningName "B" test.adb:12:7-12:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "B" test.adb:29:26-29:27>
+  references:    <DefiningName "B" test.adb:17:4-17:5>
+  type:          <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+  expected type: <ConcreteTypeDecl ["S"] test.adb:10:4-13:15>
+Expr: <Id "B" test.adb:29:28-29:29>
+  references:    <DefiningName "B" test.adb:12:7-12:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <SubtypeDecl ["Positive"] __standard:6:3-6:57>
+Expr: <Id "F" test.adb:29:31-29:32>
+  references:    <DefiningName "F" test.adb:5:7-5:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: None
+Expr: <Int test.adb:29:36-29:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Int_Type_"] __standard:116:3-116:45>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+
+
+Done.
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/test.yaml b/testsuite/tests/name_resolution/deep_delta_aggregates/test.yaml
new file mode 100644
index 000000000..f96d6dbe0
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/test.yaml
@@ -0,0 +1,2 @@
+driver: name-resolution
+input_sources: [base.adb, arr.adb, test_array.adb, multidim.adb, test.adb]
diff --git a/testsuite/tests/name_resolution/deep_delta_aggregates/test_array.adb b/testsuite/tests/name_resolution/deep_delta_aggregates/test_array.adb
new file mode 100644
index 000000000..bf2d41543
--- /dev/null
+++ b/testsuite/tests/name_resolution/deep_delta_aggregates/test_array.adb
@@ -0,0 +1,29 @@
+procedure Test_Array with SPARK_Mode is
+   type Point is record
+      X, Y : Integer;
+   end record;
+
+   type Segment is array (1 .. 2) of Point;
+   S : Segment;
+
+   type Triangle is array (1 .. 3) of Segment;
+   T : Triangle;
+
+   type Cube is array (1 .. 3, 1 .. 4) of Segment;
+   C : Cube;
+begin
+   S := (S with delta (1) => (1, 2));
+   pragma Test_Statement;
+
+   S := (S with delta (1).X => 1);
+   pragma Test_Statement;
+
+   S := (S with delta (1).X | (2).Y => S(2).X, (1).Y => S(2).Y);
+   pragma Test_Statement;
+
+   T := (T with delta (2)(1).Y => T(1)(2).X);
+   pragma Test_Statement;
+
+   C := (C with delta (1, 2)(3).Y => 1);
+   pragma Test_Statement;
+end Test_Array;
diff --git a/testsuite/tests/name_resolution/delta_aggregate/arr.adb b/testsuite/tests/name_resolution/delta_aggregate/arr.adb
new file mode 100644
index 000000000..8bd3c519a
--- /dev/null
+++ b/testsuite/tests/name_resolution/delta_aggregate/arr.adb
@@ -0,0 +1,18 @@
+procedure Arr is
+
+   type Int_Rec is record
+      I : Integer;
+   end record;
+
+   type Vector is array(Integer  range <>) of Float;
+
+   I : Integer := 1;
+   R : Int_Rec := (I => 4);
+   Vec : Vector := (1.0, 2.0, 3.0);
+begin
+   Vec := (Vec with delta I => 3.0);
+   pragma Test_Statement;
+
+   Vec := (Vec with delta R.I => 3.0);
+   pragma Test_Statement;
+end Arr;
diff --git a/testsuite/tests/name_resolution/delta_aggregate/test.out b/testsuite/tests/name_resolution/delta_aggregate/test.out
index f081dd729..6d8c68524 100644
--- a/testsuite/tests/name_resolution/delta_aggregate/test.out
+++ b/testsuite/tests/name_resolution/delta_aggregate/test.out
@@ -38,7 +38,7 @@ Expr: <Id "V" foo.adb:22:21-22:22>
   expected type: None
 Expr: <Id "B" foo.adb:22:34-22:35>
   references:    <DefiningName "B" foo.adb:7:23-7:24>
-  type:          None
+  type:          <ConcreteTypeDecl ["Boolean"] __standard:3:3-3:33>
   expected type: None
 Expr: <DottedName foo.adb:22:39-22:42>
   references:    <DefiningName "B" foo.adb:7:23-7:24>
@@ -68,7 +68,7 @@ Expr: <Id "V" foo.adb:23:21-23:22>
   expected type: None
 Expr: <Id "I" foo.adb:23:34-23:35>
   references:    <DefiningName "I" foo.adb:8:23-8:24>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <DottedName foo.adb:23:39-23:42>
   references:    <DefiningName "I" foo.adb:8:23-8:24>
@@ -130,7 +130,7 @@ Expr: <Id "Old" foo.adb:30:24-30:27>
   expected type: None
 Expr: <Id "Day" foo.adb:30:39-30:42>
   references:    <DefiningName "Day" foo.adb:13:7-13:10>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <Int foo.adb:30:46-30:48>
   references:    None
@@ -273,7 +273,7 @@ Expr: <Id "Old" foo.adb:44:24-44:27>
   expected type: None
 Expr: <Id "Day" foo.adb:44:39-44:42>
   references:    <DefiningName "Day" foo.adb:13:7-13:10>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <Int foo.adb:44:46-44:48>
   references:    None
@@ -327,7 +327,7 @@ Expr: <Id "Old" foo.adb:48:24-48:27>
   expected type: None
 Expr: <Id "Day" foo.adb:48:39-48:42>
   references:    <DefiningName "Day" foo.adb:13:7-13:10>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <Int foo.adb:48:46-48:48>
   references:    None
@@ -335,7 +335,7 @@ Expr: <Int foo.adb:48:46-48:48>
   expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
 Expr: <Id "Histo" foo.adb:48:50-48:55>
   references:    <DefiningName "Histo" foo.adb:40:10-40:15>
-  type:          None
+  type:          <ConcreteTypeDecl ["String"] __standard:105:3-105:57>
   expected type: None
 Expr: <Str ""RIC"" foo.adb:48:59-48:64>
   references:    None
@@ -343,4 +343,62 @@ Expr: <Str ""RIC"" foo.adb:48:59-48:64>
   expected type: <ConcreteTypeDecl ["String"] __standard:105:3-105:57>
 
 
+Analyzing arr.adb
+#################
+
+Resolving xrefs for node <AssignStmt arr.adb:13:4-13:37>
+********************************************************
+
+Expr: <Id "Vec" arr.adb:13:4-13:7>
+  references:    <DefiningName "Vec" arr.adb:11:4-11:7>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: None
+Expr: <DeltaAggregate arr.adb:13:11-13:36>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+Expr: <Id "Vec" arr.adb:13:12-13:15>
+  references:    <DefiningName "Vec" arr.adb:11:4-11:7>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: None
+Expr: <Id "I" arr.adb:13:27-13:28>
+  references:    <DefiningName "I" arr.adb:9:4-9:5>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Real arr.adb:13:32-13:35>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+
+Resolving xrefs for node <AssignStmt arr.adb:16:4-16:39>
+********************************************************
+
+Expr: <Id "Vec" arr.adb:16:4-16:7>
+  references:    <DefiningName "Vec" arr.adb:11:4-11:7>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: None
+Expr: <DeltaAggregate arr.adb:16:11-16:38>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+Expr: <Id "Vec" arr.adb:16:12-16:15>
+  references:    <DefiningName "Vec" arr.adb:11:4-11:7>
+  type:          <ConcreteTypeDecl ["Vector"] arr.adb:7:4-7:53>
+  expected type: None
+Expr: <DottedName arr.adb:16:27-16:30>
+  references:    <DefiningName "I" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Id "R" arr.adb:16:27-16:28>
+  references:    <DefiningName "R" arr.adb:10:4-10:5>
+  type:          <ConcreteTypeDecl ["Int_Rec"] arr.adb:3:4-5:15>
+  expected type: <ConcreteTypeDecl ["Int_Rec"] arr.adb:3:4-5:15>
+Expr: <Id "I" arr.adb:16:29-16:30>
+  references:    <DefiningName "I" arr.adb:4:7-4:8>
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+  expected type: <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
+Expr: <Real arr.adb:16:34-16:37>
+  references:    None
+  type:          <ConcreteTypeDecl ["Universal_Real_Type_"] __standard:117:3-117:42>
+  expected type: <ConcreteTypeDecl ["Float"] __standard:14:3-15:51>
+
+
 Done.
diff --git a/testsuite/tests/name_resolution/delta_aggregate/test.yaml b/testsuite/tests/name_resolution/delta_aggregate/test.yaml
index a0a196441..7c9147a22 100644
--- a/testsuite/tests/name_resolution/delta_aggregate/test.yaml
+++ b/testsuite/tests/name_resolution/delta_aggregate/test.yaml
@@ -1,2 +1,2 @@
 driver: name-resolution
-input_sources: [foo.adb]
+input_sources: [foo.adb, arr.adb]
diff --git a/testsuite/tests/name_resolution/target_name/test.out b/testsuite/tests/name_resolution/target_name/test.out
index 7a8d3c9bf..63034c29b 100644
--- a/testsuite/tests/name_resolution/target_name/test.out
+++ b/testsuite/tests/name_resolution/target_name/test.out
@@ -113,7 +113,7 @@ Expr: <TargetName test_agg.adb:12:14-12:15>
   expected type: None
 Expr: <Id "Count" test_agg.adb:12:27-12:32>
   references:    <DefiningName "Count" test_agg.adb:3:7-3:12>
-  type:          None
+  type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
   expected type: None
 Expr: <BinOp test_agg.adb:12:36-12:47>
   type:          <ConcreteTypeDecl ["Integer"] __standard:4:3-4:54>
diff --git a/testsuite/tests/parser/deep_delta_array_aggregate/input b/testsuite/tests/parser/deep_delta_array_aggregate/input
new file mode 100644
index 000000000..e2f1bfead
--- /dev/null
+++ b/testsuite/tests/parser/deep_delta_array_aggregate/input
@@ -0,0 +1 @@
+(T with delta (2)(1).Y => T(1)(2).X)
diff --git a/testsuite/tests/parser/deep_delta_array_aggregate/test.out b/testsuite/tests/parser/deep_delta_array_aggregate/test.out
new file mode 100644
index 000000000..5bf575fe2
--- /dev/null
+++ b/testsuite/tests/parser/deep_delta_array_aggregate/test.out
@@ -0,0 +1,50 @@
+DeltaAggregate[1:1-1:37]
+|f_ancestor_expr:
+|  Id[1:2-1:3]: T
+|f_assocs:
+|  AssocList[1:15-1:36]
+|  |  AggregateAssoc[1:15-1:36]
+|  |  |f_designators:
+|  |  |  AlternativesList[1:15-1:23]
+|  |  |  |  DottedName[1:15-1:23]
+|  |  |  |  |f_prefix:
+|  |  |  |  |  ArraySubcomponentChoiceName[1:15-1:21]
+|  |  |  |  |  |f_name:
+|  |  |  |  |  |  ArraySubcomponentChoiceName[1:15-1:18]
+|  |  |  |  |  |  |f_name: <null>
+|  |  |  |  |  |  |f_suffix:
+|  |  |  |  |  |  |  AssocList[1:16-1:17]
+|  |  |  |  |  |  |  |  ParamAssoc[1:16-1:17]
+|  |  |  |  |  |  |  |  |f_designator: <null>
+|  |  |  |  |  |  |  |  |f_r_expr:
+|  |  |  |  |  |  |  |  |  Int[1:16-1:17]: 2
+|  |  |  |  |  |f_suffix:
+|  |  |  |  |  |  AssocList[1:19-1:20]
+|  |  |  |  |  |  |  ParamAssoc[1:19-1:20]
+|  |  |  |  |  |  |  |f_designator: <null>
+|  |  |  |  |  |  |  |f_r_expr:
+|  |  |  |  |  |  |  |  Int[1:19-1:20]: 1
+|  |  |  |  |f_suffix:
+|  |  |  |  |  Id[1:22-1:23]: Y
+|  |  |f_r_expr:
+|  |  |  DottedName[1:27-1:36]
+|  |  |  |f_prefix:
+|  |  |  |  CallExpr[1:27-1:34]
+|  |  |  |  |f_name:
+|  |  |  |  |  CallExpr[1:27-1:31]
+|  |  |  |  |  |f_name:
+|  |  |  |  |  |  Id[1:27-1:28]: T
+|  |  |  |  |  |f_suffix:
+|  |  |  |  |  |  AssocList[1:29-1:30]
+|  |  |  |  |  |  |  ParamAssoc[1:29-1:30]
+|  |  |  |  |  |  |  |f_designator: <null>
+|  |  |  |  |  |  |  |f_r_expr:
+|  |  |  |  |  |  |  |  Int[1:29-1:30]: 1
+|  |  |  |  |f_suffix:
+|  |  |  |  |  AssocList[1:32-1:33]
+|  |  |  |  |  |  ParamAssoc[1:32-1:33]
+|  |  |  |  |  |  |f_designator: <null>
+|  |  |  |  |  |  |f_r_expr:
+|  |  |  |  |  |  |  Int[1:32-1:33]: 2
+|  |  |  |f_suffix:
+|  |  |  |  Id[1:35-1:36]: X
diff --git a/testsuite/tests/parser/deep_delta_array_aggregate/test.yaml b/testsuite/tests/parser/deep_delta_array_aggregate/test.yaml
new file mode 100644
index 000000000..d8ab7a160
--- /dev/null
+++ b/testsuite/tests/parser/deep_delta_array_aggregate/test.yaml
@@ -0,0 +1,2 @@
+driver: parser
+rule: aggregate