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

Implemented translation of negated body literals.

Browse Source
This commit is contained in:
Patrick Lühne 2016-11-23 04:59:04 +01:00
parent b7c661bddc
commit 225816538b
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/anthem/Body.h
View File

@ -17,33 +17,36 @@ namespace anthem
struct TermPrintVisitor struct TermPrintVisitor
{ {
void visit(const Clingo::Symbol &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::Symbol &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“symbol” terms currently unsupported in this context"); throwErrorAtLocation(term.location, "“symbol” terms currently unsupported in this context");
} }
void visit(const Clingo::AST::Variable &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::AST::Variable &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“variable” terms currently unsupported in this context"); throwErrorAtLocation(term.location, "“variable” terms currently unsupported in this context");
} }
void visit(const Clingo::AST::UnaryOperation &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::AST::UnaryOperation &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“unary operation” terms currently unsupported in this context"); throwErrorAtLocation(term.location, "“unary operation” terms currently unsupported in this context");
} }
void visit(const Clingo::AST::BinaryOperation &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::AST::BinaryOperation &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“binary operation” terms currently unsupported in this context"); throwErrorAtLocation(term.location, "“binary operation” terms currently unsupported in this context");
} }
void visit(const Clingo::AST::Interval &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::AST::Interval &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“interval” terms currently unsupported in this context"); throwErrorAtLocation(term.location, "“interval” terms currently unsupported in this context");
} }
void visit(const Clingo::AST::Function &function, 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)
throwErrorAtLocation(literal.location, "double-negated literals currently unsupported");
if (function.arguments.empty()) if (function.arguments.empty())
{ {
std::cout << function.name; std::cout << function.name;
@ -75,7 +78,12 @@ struct TermPrintVisitor
<< argument; << argument;
} }
std::cout << " and " << function.name << "("; std::cout << " and ";
if (literal.sign == Clingo::AST::Sign::Negation)
std::cout << "not ";
std::cout << function.name << "(";
for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++) for (auto i = function.arguments.cbegin(); i != function.arguments.cend(); i++)
{ {
@ -90,7 +98,7 @@ struct TermPrintVisitor
context.auxiliaryBodyLiteralID += function.arguments.size(); context.auxiliaryBodyLiteralID += function.arguments.size();
} }
void visit(const Clingo::AST::Pool &, const Clingo::AST::Term &term, Context &) void visit(const Clingo::AST::Pool &, const Clingo::AST::Literal &, const Clingo::AST::Term &term, Context &)
{ {
throwErrorAtLocation(term.location, "“pool” terms currently unsupported"); throwErrorAtLocation(term.location, "“pool” terms currently unsupported");
} }
@ -105,13 +113,15 @@ struct LiteralPrintVisitor
throwErrorAtLocation(literal.location, "“boolean” literals currently unsupported in this context"); throwErrorAtLocation(literal.location, "“boolean” literals currently unsupported in this context");
} }
void visit(const Clingo::AST::Term &term, const Clingo::AST::Literal &, Context &context) void visit(const Clingo::AST::Term &term, const Clingo::AST::Literal &literal, Context &context)
{ {
term.data.accept(TermPrintVisitor(), term, context); term.data.accept(TermPrintVisitor(), literal, term, context);
} }
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);
const char *operatorName = ""; const char *operatorName = "";
switch (comparison.comparison) switch (comparison.comparison)
@ -166,9 +176,6 @@ struct BodyLiteralPrintVisitor
{ {
void visit(const Clingo::AST::Literal &literal, const Clingo::AST::BodyLiteral &, Context &context) void visit(const Clingo::AST::Literal &literal, const Clingo::AST::BodyLiteral &, Context &context)
{ {
if (literal.sign != Clingo::AST::Sign::None)
throwErrorAtLocation(literal.location, "only positive literals currently supported");
literal.data.accept(LiteralPrintVisitor(), literal, context); literal.data.accept(LiteralPrintVisitor(), literal, context);
} }

5
include/anthem/StatementVisitor.h
View File

@ -59,6 +59,10 @@ struct StatementVisitor
} }
} }
if (rule.body.empty() && headTerms.empty())
std::cout << "true";
else
{
// Print translated body literals // Print translated body literals
for (auto i = rule.body.cbegin(); i != rule.body.cend(); i++) for (auto i = rule.body.cbegin(); i != rule.body.cend(); i++)
{ {
@ -72,6 +76,7 @@ struct StatementVisitor
bodyLiteral.data.accept(BodyLiteralPrintVisitor(), bodyLiteral, context); bodyLiteral.data.accept(BodyLiteralPrintVisitor(), bodyLiteral, context);
} }
}
std::cout << " -> "; std::cout << " -> ";