Fix some clang tidy warnings

src/ast/Constraint.h

@@ -28,7 +28,7 @@ class Constraint : public Literal {
 public:
     using Literal::Literal;
 
-    Constraint(NodeKind kind, SrcLocation loc = {}) : Literal(kind, loc) {
+    Constraint(NodeKind kind, SrcLocation loc = {}) : Literal(kind, std::move(loc)) {
         assert(kind >= NK_Constraint && kind < NK_LastConstraint);
     }
 

src/ast/Functor.h

@@ -29,7 +29,7 @@ class Functor : public Term {
 protected:
     using Term::Term;
 
-    Functor(NodeKind kind, SrcLocation loc = {}) : Term(kind, loc) {
+    Functor(NodeKind kind, SrcLocation loc = {}) : Term(kind, std::move(loc)) {
         assert(kind > NK_FirstFunctor && kind < NK_LastFunctor);
     }
 

src/ast/Lattice.cpp

@@ -42,7 +42,7 @@ void Lattice::setQualifiedName(QualifiedName name) {
     this->name = std::move(name);
 }
 
-const std::map<LatticeOperator, const ast::Argument*> Lattice::getOperators() const {
+std::map<LatticeOperator, const ast::Argument*> Lattice::getOperators() const {
     std::map<LatticeOperator, const ast::Argument*> ops;
     for (const auto& [op, arg] : operators) {
         ops.emplace(std::make_pair(op, arg.get()));

src/ast/Lattice.h

@@ -47,7 +47,7 @@ class Lattice : public Node {
     /** Set type name */
     void setQualifiedName(QualifiedName name);
 
-    const std::map<LatticeOperator, const ast::Argument*> getOperators() const;
+    std::map<LatticeOperator, const ast::Argument*> getOperators() const;
 
     bool hasGlb() const;
     bool hasLub() const;

src/ast/Literal.h

@@ -31,7 +31,7 @@ class Literal : public Node {
 public:
     using Node::Node;
 
-    explicit Literal(NodeKind kind, SrcLocation loc = {}) : Node(kind, loc) {
+    explicit Literal(NodeKind kind, SrcLocation loc = {}) : Node(kind, std::move(loc)) {
         assert(kind >= NK_Literal && kind < NK_LastLiteral);
     }
 

src/ast/UnnamedVariable.cpp

@@ -11,7 +11,7 @@
 
 namespace souffle::ast {
 
-UnnamedVariable::UnnamedVariable(SrcLocation loc) : Argument(NK_UnnamedVariable, loc) {}
+UnnamedVariable::UnnamedVariable(SrcLocation loc) : Argument(NK_UnnamedVariable, std::move(loc)) {}
 
 void UnnamedVariable::print(std::ostream& os) const {
     os << "_";

src/ast/UserDefinedAggregator.cpp

@@ -19,8 +19,8 @@
 namespace souffle::ast {
 UserDefinedAggregator::UserDefinedAggregator(
         std::string name, Own<Argument> init, Own<Argument> expr, VecOwn<Literal> body, SrcLocation loc)
-        : Aggregator(NK_UserDefinedAggregator, std::move(expr), std::move(body), std::move(loc)), name(name),
-          initValue(std::move(init)) {}
+        : Aggregator(NK_UserDefinedAggregator, std::move(expr), std::move(body), std::move(loc)),
+          name(std::move(name)), initValue(std::move(init)) {}
 
 void UserDefinedAggregator::apply(const NodeMapper& map) {
     Aggregator::apply(map);

src/ast/analysis/Aggregate.cpp

@@ -105,7 +105,7 @@ std::set<std::string> getWitnessVariables(
     M update;
     aggregatorlessClause->apply(update);
     auto groundingAtom = mk<Atom>(QualifiedName::fromString("+grounding_atom"));
-    for (std::string variableName : update.getAggregatorVariables()) {
+    for (const std::string& variableName : update.getAggregatorVariables()) {
         groundingAtom->addArgument(mk<Variable>(variableName));
     }
     aggregatorlessClause->addToBody(std::move(groundingAtom));
@@ -163,7 +163,7 @@ std::set<std::string> getVariablesOutsideAggregate(const Clause& clause, const A
     return variablesOutsideAggregate;
 }
 
-std::string findUniqueVariableName(const Clause& clause, std::string base) {
+std::string findUniqueVariableName(const Clause& clause, const std::string& base) {
     std::set<std::string> variablesInClause;
     visit(clause, [&](const Variable& v) { variablesInClause.insert(v.getName()); });
     int varNum = 0;
@@ -174,7 +174,7 @@ std::string findUniqueVariableName(const Clause& clause, std::string base) {
     return candidate;
 }
 
-std::string findUniqueRelationName(const Program& program, std::string base) {
+std::string findUniqueRelationName(const Program& program, const std::string& base) {
     int counter = 0;
     auto candidate = base;
     while (program.getRelation(QualifiedName::fromString(candidate)) != nullptr) {
@@ -331,7 +331,7 @@ std::set<std::string> getInjectedVariables(
     tweakedClause->apply(update);
     // the update will now tell us which variables we need to ground!
     auto groundingAtom = mk<Atom>(QualifiedName::fromString("+grounding_atom"));
-    for (std::string variableName : update.getAggregatorVariables()) {
+    for (const std::string& variableName : update.getAggregatorVariables()) {
         groundingAtom->addArgument(mk<Variable>(variableName));
     }
     // add the newly created grounding atom to the body

src/ast/analysis/Aggregate.h

@@ -50,12 +50,12 @@ std::set<std::string> getVariablesOutsideAggregate(const Clause& clause, const A
  *  Find a new relation name. I use this when I create new relations either for
  *  aggregate bodies or singleton aggregates.
  **/
-std::string findUniqueRelationName(const Program& program, std::string base);
+std::string findUniqueRelationName(const Program& program, const std::string& base);
 /**
  * Find a variable name using base to form a string like base1
  * Use this when you need to limit the scope of a variable to the inside of an aggregate.
  **/
-std::string findUniqueVariableName(const Clause& clause, std::string base);
+std::string findUniqueVariableName(const Clause& clause, const std::string& base);
 /**
  *  Given an aggregate and a clause, we find all the variables that have been
  *  injected into the aggregate.

src/ast/analysis/IOType.h

@@ -60,8 +60,8 @@ class IOTypeAnalysis : public Analysis {
         auto iter = limitSize.find(relation);
         if (iter != limitSize.end()) {
             return (*iter).second;
-        } else
-            return 0;
+        }
+        return 0;
     }
 
     bool isIO(const Relation* relation) const {

src/ast/analysis/typesystem/TypeSystem.h

@@ -311,8 +311,8 @@ struct RecordType : public Type {
 
 protected:
     RecordType(const TypeEnvironment& environment, const QualifiedName& name,
-            const std::vector<const Type*> fields = {})
-            : Type(TK_RecordType, environment, name), fields(fields) {}
+            std::vector<const Type*> fields = {})
+            : Type(TK_RecordType, environment, name), fields(std::move(fields)) {}
 
 private:
     friend class TypeEnvironment;

src/ast2ram/utility/ValueIndex.cpp

@@ -42,7 +42,7 @@ void ValueIndex::addVarReference(std::string varName, const Location& l) {
 }
 
 void ValueIndex::addVarReference(std::string varName, std::size_t ident, std::size_t pos) {
-    addVarReference(varName, Location({ident, pos}));
+    addVarReference(std::move(varName), Location({ident, pos}));
 }
 
 bool ValueIndex::isDefined(const std::string& varName) const {

src/include/souffle/RecordTable.h

@@ -26,7 +26,7 @@ namespace souffle {
 /** The interface of any Record Table. */
 class RecordTable {
 public:
-    virtual ~RecordTable() {}
+    virtual ~RecordTable() = default;
 
     virtual void setNumLanes(const std::size_t NumLanes) = 0;
 

src/include/souffle/SouffleInterface.h

@@ -172,7 +172,7 @@ class Relation {
         /**
          * Move constructor.
          *
-         * The new iterator now has ownerhsip of the iterator base.
+         * The new iterator now has ownership of the iterator base.
          *
          * @param arg lvalue reference to an iterator object
          */
@@ -215,7 +215,7 @@ class Relation {
             return *this;
         }
 
-        iterator& operator=(iterator&& o) {
+        iterator& operator=(iterator&& o) noexcept {
             iter.swap(o.iter);
             return *this;
         }
@@ -845,9 +845,8 @@ class SouffleProgram {
         auto it = relationMap.find(name);
         if (it != relationMap.end()) {
             return (*it).second;
-        } else {
-            return nullptr;
         }
+        return nullptr;
     };
 
     /**
@@ -1137,9 +1136,8 @@ class ProgramFactory {
         ProgramFactory* factory = find(name);
         if (factory != nullptr) {
             return factory->newInstance();
-        } else {
-            return nullptr;
         }
+        return nullptr;
     }
 };
 }  // namespace souffle

src/include/souffle/SymbolTable.h

@@ -26,7 +26,7 @@ namespace souffle {
 /** Interface of a generic SymbolTable iterator. */
 class SymbolTableIteratorInterface {
 public:
-    virtual ~SymbolTableIteratorInterface() {}
+    virtual ~SymbolTableIteratorInterface() = default;
 
     virtual const std::pair<const std::string, const std::size_t>& get() const = 0;
 
@@ -44,7 +44,7 @@ class SymbolTableIteratorInterface {
  */
 class SymbolTable {
 public:
-    virtual ~SymbolTable() {}
+    virtual ~SymbolTable() = default;
 
     /**
      * @brief Iterator on a symbol table.
@@ -61,7 +61,7 @@ class SymbolTable {
 
         Iterator(const Iterator& it) : impl(it.impl->copy()) {}
 
-        Iterator(Iterator&& it) : impl(std::move(it.impl)) {}
+        Iterator(Iterator&& it) noexcept : impl(std::move(it.impl)) {}
 
         reference operator*() const {
             return impl->get();

src/include/souffle/datastructure/BTree.h

@@ -207,7 +207,7 @@ class btree {
             }
 
             // copy child nodes recursively
-            auto* ires = (inner_node*)res;
+            auto* ires = static_cast<inner_node*>(res);
             for (size_type i = 0; i <= this->numElements; ++i) {
                 ires->children[i] = this->getChild(i)->clone();
                 ires->children[i]->parent = res;
@@ -634,7 +634,7 @@ class btree {
             }
 
             // move bigger keys one forward
-            for (int i = static_cast<int>(this->numElements) - 1; i >= (int)pos; --i) {
+            for (int i = static_cast<int>(this->numElements) - 1; i >= static_cast<int>(pos); --i) {
                 keys[i + 1] = keys[i];
                 getChildren()[i + 2] = getChildren()[i + 1];
                 ++getChildren()[i + 2]->position;
@@ -660,7 +660,7 @@ class btree {
          */
         void printTree(std::ostream& out, const std::string& prefix) const {
             // print the header
-            out << prefix << "@" << this << "[" << ((int)(this->position)) << "] - "
+            out << prefix << "@" << this << "[" << static_cast<int>(this->position) << "] - "
                 << (this->inner ? "i" : "") << "node : " << this->numElements << "/" << maxKeys << " [";
 
             // print the keys
@@ -806,7 +806,7 @@ class btree {
                         std::cout << "Parent reference invalid!\n";
                         std::cout << "   Node:     " << this << "\n";
                         std::cout << "   Parent:   " << this->parent << "\n";
-                        std::cout << "   Position: " << ((int)this->position) << "\n";
+                        std::cout << "   Position: " << static_cast<int>(this->position) << "\n";
                         valid = false;
                     }
 
@@ -816,7 +816,7 @@ class btree {
                         std::cout << "Left parent key not lower bound!\n";
                         std::cout << "   Node:     " << this << "\n";
                         std::cout << "   Parent:   " << this->parent << "\n";
-                        std::cout << "   Position: " << ((int)this->position) << "\n";
+                        std::cout << "   Position: " << static_cast<int>(this->position) << "\n";
                         std::cout << "   Key:   " << (this->parent->keys[this->position]) << "\n";
                         std::cout << "   Lower: " << (keys[0]) << "\n";
                         valid = false;
@@ -829,7 +829,7 @@ class btree {
                         std::cout << "Right parent key not lower bound!\n";
                         std::cout << "   Node:     " << this << "\n";
                         std::cout << "   Parent:   " << this->parent << "\n";
-                        std::cout << "   Position: " << ((int)this->position) << "\n";
+                        std::cout << "   Position: " << static_cast<int>(this->position) << "\n";
                         std::cout << "   Key:   " << (this->parent->keys[this->position]) << "\n";
                         std::cout << "   Upper: " << (keys[0]) << "\n";
                         valid = false;
@@ -982,7 +982,7 @@ class btree {
 
         // prints a textual representation of this iterator to the given stream (mainly for debugging)
         void print(std::ostream& out = std::cout) const {
-            out << cur << "[" << (int)pos << "]";
+            out << cur << "[" << static_cast<int>(pos) << "]";
         }
     };
 
@@ -1075,7 +1075,7 @@ class btree {
     }
 
     // a move constructor
-    btree(btree&& other)
+    btree(btree&& other) noexcept
             : comp(other.comp), weak_comp(other.weak_comp), root(other.root), leftmost(other.leftmost) {
         other.root = nullptr;
         other.leftmost = nullptr;
@@ -1360,7 +1360,7 @@ class btree {
                 }
 
                 // insert element in right fragment
-                if (((size_type)idx) > cur->numElements) {
+                if (static_cast<size_type>(idx) > cur->numElements) {
                     // release current lock
                     cur->lock.end_write();
 
@@ -1858,8 +1858,8 @@ class btree {
         out << "  Size of leaf node:  " << sizeof(leaf_node) << "\n";
         out << "  Size of Key:        " << sizeof(Key) << "\n";
         out << "  max keys / node:  " << node::maxKeys << "\n";
-        out << "  avg keys / node:  " << (size() / (double)nodes) << "\n";
-        out << "  avg filling rate: " << ((size() / (double)nodes) / node::maxKeys) << "\n";
+        out << "  avg keys / node:  " << (size() / static_cast<double>(nodes)) << "\n";
+        out << "  avg filling rate: " << ((size() / static_cast<double>(nodes)) / node::maxKeys) << "\n";
         out << " ---------------------------------\n";
         out << "  insert-hint (hits/misses/total): " << hint_stats.inserts.getHits() << "/"
             << hint_stats.inserts.getMisses() << "/" << hint_stats.inserts.getAccesses() << "\n";
@@ -2061,7 +2061,7 @@ class btree_set : public souffle::detail::btree<Key, Comparator, Allocator, bloc
     btree_set(const btree_set& other) : super(other) {}
 
     // A move constructor.
-    btree_set(btree_set&& other) : super(std::move(other)) {}
+    btree_set(btree_set&& other) noexcept : super(std::move(other)) {}
 
 private:
     // A constructor required by the bulk-load facility.
@@ -2123,7 +2123,7 @@ class btree_multiset : public souffle::detail::btree<Key, Comparator, Allocator,
     btree_multiset(const btree_multiset& other) : super(other) {}
 
     // A move constructor.
-    btree_multiset(btree_multiset&& other) : super(std::move(other)) {}
+    btree_multiset(btree_multiset&& other) noexcept : super(std::move(other)) {}
 
 private:
     // A constructor required by the bulk-load facility.