Format and clean up

src/ast/FunctionalConstraint.h

@@ -1,6 +1,6 @@
 /*
  * Souffle - A Datalog Compiler
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved
+ * Copyright (c) 2020 The Souffle Developers. All rights reserved
  * Licensed under the Universal Permissive License v 1.0 as shown at:
  * - https://opensource.org/licenses/UPL
  * - <souffle root>/licenses/SOUFFLE-UPL.txt
@@ -105,18 +105,18 @@ class FunctionalConstraint : public Constraint {
         return true;
     }
 
-    bool equivalentConstraint (const FunctionalConstraint& other) const {
+    bool equivalentConstraint(const FunctionalConstraint& other) const {
         if (this->getArity() != other.getArity()) {
             return false;
         }
         std::set<std::string> keyNames;
-        for (const auto& key : keys){
+        for (const auto& key : keys) {
             keyNames.insert(key->getName());
         }
-        for (const auto& key : other.keys){
+        for (const auto& key : other.keys) {
             if (keyNames.find(key->getName()) == keyNames.end()) {
                 return false;
-            }   
+            }
         }
         return true;
     }

src/ast/Relation.h

@@ -18,9 +18,9 @@
 
 #include "RelationTag.h"
 #include "ast/Attribute.h"
+#include "ast/FunctionalConstraint.h"
 #include "ast/Node.h"
 #include "ast/QualifiedName.h"
-#include "ast/FunctionalConstraint.h"
 #include "ast/utility/NodeMapper.h"
 #include "parser/SrcLocation.h"
 #include "souffle/utility/ContainerUtil.h"

src/ast2ram/ClauseTranslator.h

@@ -65,7 +65,8 @@ class ClauseTranslator {
     // value index to keep track of references in the loop nest
     Own<ValueIndex> valueIndex = mk<ValueIndex>();
 
-    virtual Own<ram::Operation> createProjection(const ast::Clause& clause, const ast::Clause& originalClause) const;
+    virtual Own<ram::Operation> createProjection(
+            const ast::Clause& clause, const ast::Clause& originalClause) const;
     virtual Own<ram::Condition> createCondition(const ast::Clause& originalClause) const;
 
 private:

src/ast2ram/ProvenanceClauseTranslator.cpp

@@ -38,7 +38,7 @@ Own<ram::Condition> ProvenanceClauseTranslator::createCondition(
 }
 
 Own<ram::Operation> ProvenanceClauseTranslator::createProjection(
-        const ast::Clause& clause, const ast::Clause& /* originalClause */) const{
+        const ast::Clause& clause, const ast::Clause& /* originalClause */) const {
     VecOwn<ram::Expression> values;
 
     // get all values in the body

src/ast2ram/ProvenanceClauseTranslator.h

@@ -37,7 +37,8 @@ class ProvenanceClauseTranslator : public ClauseTranslator {
             : ClauseTranslator(context, symbolTable) {}
 
 protected:
-    Own<ram::Operation> createProjection(const ast::Clause& clause, const ast::Clause& originalClause) const override;
+    Own<ram::Operation> createProjection(
+            const ast::Clause& clause, const ast::Clause& originalClause) const override;
     Own<ram::Condition> createCondition(const ast::Clause& originalClause) const override;
 };
 }  // namespace souffle::ast2ram

src/interpreter/Engine.cpp

@@ -1052,10 +1052,10 @@ RamDomain Engine::execute(const Node* node, Context& ctxt) {
             return result;
         ESAC(Filter)
 
-#define GUARDED_PROJECT(Structure, Arity, ...)                           \
-    CASE(GuardedProject, Structure, Arity)                              \
+#define GUARDED_PROJECT(Structure, Arity, ...)                   \
+    CASE(GuardedProject, Structure, Arity)                       \
         auto& rel = *static_cast<RelType*>(node->getRelation()); \
-        return evalGuardedProject(rel, shadow, ctxt);                   \
+        return evalGuardedProject(rel, shadow, ctxt);            \
     ESAC(GuardedProject)
 
         FOR_EACH(GUARDED_PROJECT)