Merge branch 'topic/aggregates' into 'master'

Fix non qualified aggregate rule Closes #52 See merge request eng/libadalang/langkit-query-language!162
AdaCore · Jan 15, 2024 · e5e3d44 · e5e3d44
2 parents 79c99cf + 93cceb9
commit e5e3d44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -58,7 +58,7 @@ lkql_jit: lkql
 
 lkql_native_jit: lkql
 	$(MAVEN) -f lkql/build/java/ install
-	$(MAVEN) -f lkql_jit/ clean install -P native
+	$(MAVEN) -f lkql_jit/ clean install -P native,dev
 
 .PHONY: lkql_checker
 

diff --git a/lkql_checker/share/lkql/non_qualified_aggregates.lkql b/lkql_checker/share/lkql/non_qualified_aggregates.lkql
@@ -9,5 +9,5 @@
 fun non_qualified_aggregates(node) =
     node is Aggregate(p_expression_type() is not AnonymousTypeDecl,
                       p_is_subaggregate() is false,
-                      all parent is not (QualExpr or Aggregate(
+                      all parent is not (QualExpr or AspectClause or Aggregate(
                           p_expression_type() is not AnonymousTypeDecl)))
diff --git a/testsuite/tests/checks/non_qualified_aggregates/aggr.ads b/testsuite/tests/checks/non_qualified_aggregates/aggr.ads
@@ -36,4 +36,8 @@ package Aggr is
    tc : constant Weather := (Date'(26, August, 1974) with 15);  --  FLAG
    td : Weather := Weather'((Date'(26, August, 1974) with 15)); --  NOFLAG
 
+   --  Check that the aggregate inside enum repr clauses cannot be flagged
+   type En is (Var1, Var2);
+   for En use (Var1 => 12, Var2 => 15); --  NOFLAG
+
 end Aggr;