From 7a0b5b684a49cfef30d40bbbfd596778b17cbd70 Mon Sep 17 00:00:00 2001
From: Abdul Zreika <azre6702@uni.sydney.edu.au>
Date: Fri, 13 Nov 2020 14:55:24 +1100
Subject: [PATCH] Moved out provenance clause subroutine adder into own method.

---
 src/ast2ram/AstToRamTranslator.cpp | 43 +++++++++++++++---------------
 src/ast2ram/AstToRamTranslator.h   |  3 +++
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/ast2ram/AstToRamTranslator.cpp b/src/ast2ram/AstToRamTranslator.cpp
index 9b6801c560f..af6d7d649dd 100644
--- a/src/ast2ram/AstToRamTranslator.cpp
+++ b/src/ast2ram/AstToRamTranslator.cpp
@@ -1012,6 +1012,26 @@ void AstToRamTranslator::createRamRelation(size_t scc) {
     }
 }
 
+void AstToRamTranslator::addProvenanceClauseSubroutines(const ast::Program* program) {
+    visitDepthFirst(*program, [&](const ast::Clause& clause) {
+        std::stringstream relName;
+        relName << clause.getHead()->getQualifiedName();
+
+        // do not add subroutines for info relations or facts
+        if (relName.str().find("@info") != std::string::npos || clause.getBodyLiterals().empty()) {
+            return;
+        }
+
+        std::string subroutineLabel =
+                relName.str() + "_" + std::to_string(getClauseNum(program, &clause)) + "_subproof";
+        ramSubs[subroutineLabel] = makeSubproofSubroutine(clause);
+
+        std::string negationSubroutineLabel =
+                relName.str() + "_" + std::to_string(getClauseNum(program, &clause)) + "_negation_subproof";
+        ramSubs[negationSubroutineLabel] = makeNegationSubproofSubroutine(clause);
+    });
+}
+
 /** translates the given datalog program into an equivalent RAM program  */
 void AstToRamTranslator::translateProgram(const ast::TranslationUnit& translationUnit) {
     // keep track of relevant analyses
@@ -1063,10 +1083,8 @@ void AstToRamTranslator::translateProgram(const ast::TranslationUnit& translatio
         createRamRelation(scc);
     }
 
-    // maintain the index of the SCC within the topological order
-    size_t indexOfScc = 0;
-
     // iterate over each SCC according to the topological order
+    size_t indexOfScc = 0;
     for (const auto& scc : sccOrder.order()) {
         // create subroutine for this stratum
         ramSubs["stratum_" + std::to_string(indexOfScc)] = translateSCC(scc, indexOfScc);
@@ -1091,24 +1109,7 @@ void AstToRamTranslator::translateProgram(const ast::TranslationUnit& translatio
 
     // add subroutines for each clause
     if (Global::config().has("provenance")) {
-        visitDepthFirst(*program, [&](const ast::Clause& clause) {
-            std::stringstream relName;
-            relName << clause.getHead()->getQualifiedName();
-
-            // do not add subroutines for info relations or facts
-            if (relName.str().find("@info") != std::string::npos || clause.getBodyLiterals().empty()) {
-                return;
-            }
-
-            std::string subroutineLabel =
-                    relName.str() + "_" + std::to_string(getClauseNum(program, &clause)) + "_subproof";
-            ramSubs[subroutineLabel] = makeSubproofSubroutine(clause);
-
-            std::string negationSubroutineLabel = relName.str() + "_" +
-                                                  std::to_string(getClauseNum(program, &clause)) +
-                                                  "_negation_subproof";
-            ramSubs[negationSubroutineLabel] = makeNegationSubproofSubroutine(clause);
-        });
+        addProvenanceClauseSubroutines(program);
     }
 }
 
diff --git a/src/ast2ram/AstToRamTranslator.h b/src/ast2ram/AstToRamTranslator.h
index 3942e500e01..c56a238021c 100644
--- a/src/ast2ram/AstToRamTranslator.h
+++ b/src/ast2ram/AstToRamTranslator.h
@@ -208,6 +208,9 @@ class AstToRamTranslator {
 
     /** add a statement to load a relation */
     void makeRamLoad(VecOwn<ram::Statement>& curStmts, const ast::Relation* relation);
+
+    /** add provenance clause subroutines */
+    void addProvenanceClauseSubroutines(const ast::Program* program);
 };
 
 }  // namespace souffle::ast2ram