Merge branch 'souffle-lang:master' into compoundconj

souffle-lang · Dec 19, 2023 · bba07d6 · bba07d6
2 parents 5d3bc52 + f766700
commit bba07d6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/ast/UserDefinedAggregator.cpp b/src/ast/UserDefinedAggregator.cpp
@@ -34,10 +34,9 @@ Node::NodeVec UserDefinedAggregator::getChildren() const {
 }
 
 void UserDefinedAggregator::print(std::ostream& os) const {
-    os << "@" << name;
-    os << " init: " << *initValue;
+    os << "@@" << name << " " << *initValue;
     if (targetExpression) {
-        os << " " << *targetExpression;
+        os << ", " << *targetExpression;
     }
     os << " : { " << join(body) << " }";
 }

diff --git a/src/ram/Aggregate.h b/src/ram/Aggregate.h
@@ -63,6 +63,7 @@ class Aggregate : public RelationOperation, public AbstractAggregate {
         RelationOperation::apply(map);
         condition = map(std::move(condition));
         expression = map(std::move(expression));
+        function->apply(map);
     }
 
     static bool classof(const Node* n) {

diff --git a/src/ram/Aggregator.h b/src/ram/Aggregator.h
@@ -45,6 +45,8 @@ class Aggregator {
         return {};
     }
 
+    virtual void apply(const NodeMapper&) {}
+
     /**
      * @brief Create a cloning (i.e. deep copy) of this node
      */

diff --git a/src/ram/IndexAggregate.h b/src/ram/IndexAggregate.h
@@ -66,6 +66,7 @@ class IndexAggregate : public IndexOperation, public AbstractAggregate {
         IndexOperation::apply(map);
         condition = map(std::move(condition));
         expression = map(std::move(expression));
+        function->apply(map);
     }
 
     static bool classof(const Node* n) {

diff --git a/src/ram/UserDefinedAggregator.h b/src/ram/UserDefinedAggregator.h
@@ -77,6 +77,10 @@ class UserDefinedAggregator : public Aggregator {
         os << name << " INIT " << *initValue << " ";
     }
 
+    void apply(const NodeMapper& map) override {
+        initValue = map(std::move(initValue));
+    }
+
 protected:
     /** Aggregation function */
     const std::string name;
@@ -92,4 +96,4 @@ class UserDefinedAggregator : public Aggregator {
     /** Stateful */
     const bool stateful;
 };
-}  // namespace souffle::ram
+}  // namespace souffle::ram