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

Implemented syntax highlighting for the body part.

This commit is contained in:
Patrick Lühne 2016-11-24 03:31:28 +01:00
parent 47d7058f5a
commit e2a450daa6
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
1 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
include/anthem/Body.h
View File

@ -5,6 +5,8 @@
#include <anthem/Context.h> #include <anthem/Context.h>
#include <anthem/Utils.h> #include <anthem/Utils.h>
#include <anthem/output/ClingoOutput.h>
#include <anthem/output/Formatting.h>
namespace anthem namespace anthem
{ {
@ -42,58 +44,67 @@ struct TermPrintVisitor
throwErrorAtLocation(term.location, "“interval” terms currently unsupported in this context", context); throwErrorAtLocation(term.location, "“interval” terms currently unsupported in this context", context);
} }
// TODO: check correctness
void visit(const Clingo::AST::Function &function, const Clingo::AST::Literal &literal, const Clingo::AST::Term &term, Context &context) void visit(const Clingo::AST::Function &function, const Clingo::AST::Literal &literal, const Clingo::AST::Term &term, Context &context)
{ {
if (literal.sign == Clingo::AST::Sign::DoubleNegation) if (literal.sign == Clingo::AST::Sign::DoubleNegation)
throwErrorAtLocation(literal.location, "double-negated literals currently unsupported", context); throwErrorAtLocation(literal.location, "double-negated literals currently unsupported", context);
auto &outputStream = context.logger.outputStream();
if (function.arguments.empty()) if (function.arguments.empty())
{ {
std::cout << function.name; outputStream << output::Function(function.name);
return; return;
} }
std::cout << "exists "; outputStream << output::Keyword("exists") << " ";
for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++) for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++)
{ {
if (i != function.arguments.cbegin()) if (i != function.arguments.cbegin())
std::cout << ", "; outputStream << ", ";
std::cout << AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + (i - function.arguments.cbegin())); const auto variableName = std::string(AuxiliaryBodyVariablePrefix) + std::to_string(i - function.arguments.cbegin());
outputStream << output::Variable(variableName.c_str());
} }
std::cout << " ("; outputStream << " (";
for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++) for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++)
{ {
const auto &argument = *i; const auto &argument = *i;
if (i != function.arguments.cbegin()) if (i != function.arguments.cbegin())
std::cout << " and "; outputStream << " " << Clingo::AST::BinaryOperator::And << " ";
std::cout const auto variableName = std::string(AuxiliaryBodyVariablePrefix) + std::to_string(context.auxiliaryBodyLiteralID + (i - function.arguments.cbegin()));
<< AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + (i - function.arguments.cbegin()))
<< " in " outputStream
<< output::Variable(variableName.c_str())
<< " " << output::Keyword("in") << " "
<< argument; << argument;
} }
std::cout << " and "; outputStream << " " << Clingo::AST::BinaryOperator::And << " ";
if (literal.sign == Clingo::AST::Sign::Negation) if (literal.sign == Clingo::AST::Sign::Negation)
std::cout << "not "; std::cout << Clingo::AST::Sign::Negation << " ";
std::cout << function.name << "("; outputStream << output::Function(function.name) << "(";
for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++) for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++)
{ {
if (i != function.arguments.cbegin()) if (i != function.arguments.cbegin())
std::cout << ", "; outputStream << ", ";
std::cout << AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + (i - function.arguments.cbegin())); const auto variableName = std::string(AuxiliaryBodyVariablePrefix) + std::to_string(context.auxiliaryBodyLiteralID + (i - function.arguments.cbegin()));
outputStream << output::Variable(variableName.c_str());
} }
std::cout << "))"; outputStream << "))";
context.auxiliaryBodyLiteralID += function.arguments.size(); context.auxiliaryBodyLiteralID += function.arguments.size();
} }
@ -118,6 +129,7 @@ struct LiteralPrintVisitor
term.data.accept(TermPrintVisitor(), literal, term, context); term.data.accept(TermPrintVisitor(), literal, term, context);
} }
// TODO: refactor
void visit(const Clingo::AST::Comparison &comparison, const Clingo::AST::Literal &literal, Context &context) void visit(const Clingo::AST::Comparison &comparison, const Clingo::AST::Literal &literal, Context &context)
{ {
assert(literal.sign == Clingo::AST::Sign::None); assert(literal.sign == Clingo::AST::Sign::None);
@ -146,19 +158,22 @@ struct LiteralPrintVisitor
break; break;
} }
std::cout const auto variableName1 = std::string(AuxiliaryBodyVariablePrefix) + std::to_string(context.auxiliaryBodyLiteralID);
<< "exists " << AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID) const auto variableName2 = std::string(AuxiliaryBodyVariablePrefix) + std::to_string(context.auxiliaryBodyLiteralID + 1);
<< ", " << AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + 1)
context.logger.outputStream()
<< output::Keyword("exists") << " " << output::Variable(variableName1.c_str())
<< ", " << output::Variable(variableName2.c_str())
<< " (" << " ("
<< AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID) << output::Variable(variableName1.c_str())
<< " in " << comparison.left << " " << output::Keyword("in") << " " << comparison.left
<< " and " << " " << Clingo::AST::BinaryOperator::And << " "
<< AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + 1) << output::Variable(variableName2.c_str())
<< " in " << comparison.right << " " << output::Keyword("in") << " " << comparison.right
<< " and " << " " << Clingo::AST::BinaryOperator::And << " "
<< AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID) << output::Variable(variableName1.c_str())
<< operatorName << " " << output::Operator(operatorName) << " "
<< AuxiliaryBodyVariablePrefix << (context.auxiliaryBodyLiteralID + 1) << output::Variable(variableName2.c_str())
<< ")"; << ")";
context.auxiliaryBodyLiteralID += 2; context.auxiliaryBodyLiteralID += 2;