patrick/anthem
1
0
Fork 0
Code Issues 15 Releases 21 Activity

Refactoring to prepare for implementing completion.

Browse Source
This commit is contained in:
Patrick Lühne
2017-04-05 18:15:42 +02:00
parent 5940fc4a3b
commit 838a68e230
5 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/anthem/Translation.cpp
View File

@@ -39,26 +39,12 @@ void translate(const char *fileName, std::istream &stream, Context &context)
auto fileContent = std::string(std::istreambuf_iterator<char>(stream), {});
bool isFirstStatement = true;
std::vector<ast::Formula> formulas;
const auto translateStatement =
[&context, &isFirstStatement](const Clingo::AST::Statement &statement)
[&formulas, &context](const Clingo::AST::Statement &statement)
{
auto formulas = statement.data.accept(StatementVisitor(), statement, context);
if (!isFirstStatement)
context.logger.outputStream() << std::endl;
for (auto &formula : formulas)
{
if (context.simplify)
simplify(formula);
context.logger.outputStream() << formula << std::endl;
}
if (!formulas.empty())
isFirstStatement = false;
statement.data.accept(StatementVisitor(), statement, formulas, context);
};
const auto logger =
@@ -68,6 +54,16 @@ void translate(const char *fileName, std::istream &stream, Context &context)
};
Clingo::parse_program(fileContent.c_str(), translateStatement, logger);
for (auto i = formulas.begin(); i != formulas.end(); i++)
{
auto &formula = *i;
if (context.simplify)
simplify(formula);
context.logger.outputStream() << formula << std::endl;
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////