Cleaned up some more includes in ast2ram.

souffle-lang · Sep 23, 2020 · 164f342 · 164f342
1 parent 540f656
commit 164f342
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/src/ast2ram/AstToRamTranslator.cpp b/src/ast2ram/AstToRamTranslator.cpp
@@ -117,8 +117,8 @@
 #include "souffle/BinaryConstraintOps.h"
 #include "souffle/SymbolTable.h"
 #include "souffle/TypeAttribute.h"
-#include "souffle/utility/ContainerUtil.h"
 #include "souffle/utility/FunctionalUtil.h"
+#include "souffle/utility/MiscUtil.h"
 #include <algorithm>
 #include <cassert>
 #include <chrono>

diff --git a/src/ast2ram/AstToRamTranslator.h b/src/ast2ram/AstToRamTranslator.h
@@ -16,11 +16,8 @@
 
 #pragma once
 
+#include "souffle/RamTypes.h"
 #include "souffle/utility/ContainerUtil.h"
-#include "souffle/utility/FunctionalUtil.h"
-#include "souffle/utility/MiscUtil.h"
-#include "souffle/utility/StreamUtil.h"
-#include "souffle/utility/StringUtil.h"
 #include <cassert>
 #include <cstddef>
 #include <map>

diff --git a/src/ast2ram/ClauseTranslator.cpp b/src/ast2ram/ClauseTranslator.cpp
@@ -41,6 +41,7 @@
 #include "ram/TupleElement.h"
 #include "ram/UnpackRecord.h"
 #include "ram/Utils.h"
+#include "souffle/utility/StringUtil.h"
 #include <map>
 #include <vector>
 

diff --git a/src/ast2ram/Location.h b/src/ast2ram/Location.h
@@ -15,6 +15,7 @@
 #pragma once
 
 #include "ast2ram/AstToRamTranslator.h"
+#include "souffle/utility/MiscUtil.h"
 
 namespace souffle::ast2ram {
 

diff --git a/src/ast2ram/ValueIndex.cpp b/src/ast2ram/ValueIndex.cpp
@@ -20,6 +20,8 @@
 #include "ast2ram/AstToRamTranslator.h"
 #include "ast2ram/Location.h"
 #include "ram/Relation.h"
+#include "souffle/utility/FunctionalUtil.h"
+#include "souffle/utility/StreamUtil.h"
 #include <cassert>
 #include <set>
 
@@ -33,7 +35,7 @@ void AstToRamTranslator::ValueIndex::addVarReference(
 
 void AstToRamTranslator::ValueIndex::addVarReference(
         const ast::Variable& var, int ident, int pos, Own<ram::RelationReference> rel) {
-    addVarReference(var, AstToRamTranslator::Location({ident, pos, std::move(rel)}));
+    addVarReference(var, Location({ident, pos, std::move(rel)}));
 }
 
 bool AstToRamTranslator::ValueIndex::isDefined(const ast::Variable& var) const {
@@ -71,7 +73,7 @@ void AstToRamTranslator::ValueIndex::setRecordDefinition(
 
 void AstToRamTranslator::ValueIndex::setRecordDefinition(
         const ast::RecordInit& init, int ident, int pos, Own<ram::RelationReference> rel) {
-    setRecordDefinition(init, AstToRamTranslator::Location({ident, pos, std::move(rel)}));
+    setRecordDefinition(init, Location({ident, pos, std::move(rel)}));
 }
 
 const AstToRamTranslator::Location& AstToRamTranslator::ValueIndex::getDefinitionPoint(
@@ -107,4 +109,9 @@ bool AstToRamTranslator::ValueIndex::isSomethingDefinedOn(int level) const {
     return false;
 }
 
+void AstToRamTranslator::ValueIndex::print(std::ostream& out) const {
+    out << "Variables:\n\t";
+    out << join(var_references, "\n\t");
+}
+
 }  // namespace souffle::ast2ram
diff --git a/src/ast2ram/ValueIndex.h b/src/ast2ram/ValueIndex.h
@@ -90,15 +90,7 @@ class AstToRamTranslator::ValueIndex {
 
     bool isSomethingDefinedOn(int level) const;
 
-    void print(std::ostream& out) const {
-        out << "Variables:\n\t";
-        out << join(var_references, "\n\t");
-    }
-
-    friend std::ostream& operator<<(std::ostream& out, const ValueIndex& index) __attribute__((unused)) {
-        index.print(out);
-        return out;
-    }
+    void print(std::ostream& out) const;
 
 private:
     /** The index of variable accesses */