Moved value translator instantation into itself.

souffle-lang · Oct 16, 2020 · 48ccaca · 48ccaca
1 parent 16ea32d
commit 48ccaca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/ast2ram/AstToRamTranslator.cpp b/src/ast2ram/AstToRamTranslator.cpp
@@ -221,7 +221,7 @@ std::string AstToRamTranslator::getNewRelationName(const ast::Relation* rel) {
 
 Own<ram::Expression> AstToRamTranslator::translateValue(const ast::Argument* arg, const ValueIndex& index) {
     if (arg == nullptr) return nullptr;
-    return ValueTranslator(*this, index, getSymbolTable())(*arg);
+    return ValueTranslator::translate(*this, index, getSymbolTable(), *arg);
 }
 
 SymbolTable& AstToRamTranslator::getSymbolTable() {

diff --git a/src/ast2ram/ValueTranslator.cpp b/src/ast2ram/ValueTranslator.cpp
@@ -37,6 +37,11 @@
 
 namespace souffle::ast2ram {
 
+Own<ram::Expression> ValueTranslator::translate(AstToRamTranslator& translator, const ValueIndex& index,
+        SymbolTable& symTab, const ast::Argument& arg) {
+    return ValueTranslator(translator, index, symTab)(arg);
+}
+
 Own<ram::Expression> ValueTranslator::visitVariable(const ast::Variable& var) {
     assert(index.isDefined(var) && "variable not grounded");
     return translator.makeRamTupleElement(index.getDefinitionPoint(var));

diff --git a/src/ast2ram/ValueTranslator.h b/src/ast2ram/ValueTranslator.h
@@ -48,6 +48,9 @@ class ValueTranslator : public ast::Visitor<Own<ram::Expression>> {
     ValueTranslator(AstToRamTranslator& translator, const ValueIndex& index, SymbolTable& symTab)
             : translator(translator), index(index), symTab(symTab) {}
 
+    static Own<ram::Expression> translate(AstToRamTranslator& translator, const ValueIndex& index,
+            SymbolTable& symTab, const ast::Argument& arg);
+
     Own<ram::Expression> visitVariable(const ast::Variable& var) override;
     Own<ram::Expression> visitUnnamedVariable(const ast::UnnamedVariable& var) override;
     Own<ram::Expression> visitNumericConstant(const ast::NumericConstant& c) override;