fix multiple bugs in ResolveAliases transform. (#2564)

fix #2435
fix #2486
fix #2552

Author: quentin

src/MainDriver.cpp

@@ -461,7 +461,8 @@ Own<ast::transform::PipelineTransformer> astTransformationPipeline(Global& glb)
     auto magicPipeline = mk<ast::transform::PipelineTransformer>(
             mk<ast::transform::ConditionalTransformer>(
                     glb.config().has("magic-transform"), mk<ast::transform::ExpandEqrelsTransformer>()),
-            mk<ast::transform::MagicSetTransformer>(), mk<ast::transform::ResolveAliasesTransformer>(),
+            mk<ast::transform::MagicSetTransformer>(), 
+            mk<ast::transform::ResolveAliasesTransformer>(),
             mk<ast::transform::RemoveRelationCopiesTransformer>(),
             mk<ast::transform::RemoveEmptyRelationsTransformer>(),
             mk<ast::transform::RemoveRedundantRelationsTransformer>(), clone(equivalencePipeline));
@@ -492,6 +493,10 @@ Own<ast::transform::PipelineTransformer> astTransformationPipeline(Global& glb)
             mk<ast::transform::GroundWitnessesTransformer>(),
             mk<ast::transform::UniqueAggregationVariablesTransformer>(),
             mk<ast::transform::MaterializeSingletonAggregationTransformer>(),
+              mk<ast::transform::PipelineTransformer>(
+                    // fix #2486
+                    mk<ast::transform::ResolveAliasesTransformer>(),
+                    mk<ast::transform::SimplifyAggregateTargetExpressionTransformer>()),
             mk<ast::transform::FixpointTransformer>(
                     mk<ast::transform::MaterializeAggregationQueriesTransformer>()),
             mk<ast::transform::RemoveRedundantSumsTransformer>(),
@@ -500,7 +505,8 @@ Own<ast::transform::PipelineTransformer> astTransformationPipeline(Global& glb)
             mk<ast::transform::RemoveBooleanConstraintsTransformer>(),
             mk<ast::transform::ResolveAliasesTransformer>(), mk<ast::transform::MinimiseProgramTransformer>(),
             mk<ast::transform::InlineUnmarkExcludedTransform>(),
-            mk<ast::transform::InlineRelationsTransformer>(), mk<ast::transform::GroundedTermsChecker>(),
+            mk<ast::transform::InlineRelationsTransformer>(),
+            mk<ast::transform::GroundedTermsChecker>(),
             mk<ast::transform::ResolveAliasesTransformer>(),
             mk<ast::transform::SimplifyConstantBinaryConstraintsTransformer>(),
             mk<ast::transform::RemoveBooleanConstraintsTransformer>(),

src/ast/tests/ast_transformers_test.cpp

@@ -103,8 +103,8 @@ TEST(Transformers, GroundTermPropagation2) {
     Own<Clause> res = ResolveAliasesTransformer::resolveAliases(*a);
     Own<Clause> cleaned = ResolveAliasesTransformer::removeTrivialEquality(*res);
 
-    EXPECT_EQ("p(b,b) :- \n   p(b,b),\n   b = b,\n   b = b,\n   b = b.", toString(*res));
-    EXPECT_EQ("p(b,b) :- \n   p(b,b).", toString(*cleaned));
+    EXPECT_EQ("p(x,x) :- \n   p(x,x),\n   x = x,\n   x = x,\n   x = x.", toString(*res));
+    EXPECT_EQ("p(x,x) :- \n   p(x,x).", toString(*cleaned));
 }
 
 TEST(Transformers, ResolveGroundedAliases) {
@@ -297,7 +297,7 @@ TEST(Transformers, CheckClausalEquivalence) {
             "C(r) :- \n   A(r,y),\n   A(r,x),\n   x != 3,\n   x < y,\n   !B(y),\n   y > 3,\n   B(y),\n   "
             "B(x).",
             toString(*cClauses[1]));
-    EXPECT_EQ("C(x) :- \n   A(x,a),\n   a != 3,\n   !B(a),\n   A(x,b),\n   b > 3,\n   B(b),\n   a < b.",
+    EXPECT_EQ("C(x) :- \n   A(x,a),\n   a != 3,\n   !B(a),\n   A(x,c),\n   c > 3,\n   B(c),\n   a < c.",
             toString(*cClauses[2]));
 
     // Check equivalence of these clauses