Minor cleanup to scc translator.

souffle-lang · Nov 13, 2020 · 3a56357 · 3a56357
1 parent d225693
commit 3a56357
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ast2ram/AstToRamTranslator.cpp b/src/ast2ram/AstToRamTranslator.cpp
@@ -341,7 +341,7 @@ void AstToRamTranslator::nameUnnamedVariables(ast::Clause* clause) {
     }
 }
 
-VecOwn<ram::Statement> AstToRamTranslator::translateSCC(size_t scc, size_t idx) {
+Own<ram::Sequence> AstToRamTranslator::translateSCC(size_t scc, size_t idx) {
     // make a new ram statement for the current SCC
     VecOwn<ram::Statement> current;
 
@@ -370,9 +370,10 @@ VecOwn<ram::Statement> AstToRamTranslator::translateSCC(size_t scc, size_t idx)
         makeRamStore(current, relation);
     }
 
+    // clear expired relations
     clearExpiredRelations(current, relationSchedule->schedule().at(idx).expired());
 
-    return current;
+    return mk<ram::Sequence>(std::move(current));
 }
 
 void AstToRamTranslator::clearExpiredRelations(
@@ -783,8 +784,7 @@ void AstToRamTranslator::translateProgram(const ast::TranslationUnit& translatio
     size_t indexOfScc = 0;
     for (const auto& scc : sccOrder.order()) {
         // create subroutine for this stratum
-        auto sccStatements = translateSCC(scc, indexOfScc);
-        ramSubs["stratum_" + std::to_string(indexOfScc)] = mk<ram::Sequence>(std::move(sccStatements));
+        ramSubs["stratum_" + std::to_string(indexOfScc)] = translateSCC(scc, indexOfScc);
         indexOfScc++;
     }
 

diff --git a/src/ast2ram/AstToRamTranslator.h b/src/ast2ram/AstToRamTranslator.h
@@ -176,7 +176,7 @@ class AstToRamTranslator {
     RamDomain getConstantRamRepresentation(const ast::Constant& constant);
 
     /** translate RAM code for a given SCC */
-    VecOwn<ram::Statement> translateSCC(size_t scc, size_t idx);
+    Own<ram::Sequence> translateSCC(size_t scc, size_t idx);
 
     /** create RAM relations for a given SCC */
     void createRamRelation(size_t scc);