From cdfdd8f4ca9846a28c5e58af705883c2934c4512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Thu, 24 Nov 2016 15:38:55 +0100 Subject: [PATCH] Added unit test to check whether escaped user variable names are correctly escaped. --- include/anthem/StatementVisitor.h | 2 +- tests/TestTranslation.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/anthem/StatementVisitor.h b/include/anthem/StatementVisitor.h index 255bde5..aa7b51e 100644 --- a/include/anthem/StatementVisitor.h +++ b/include/anthem/StatementVisitor.h @@ -44,7 +44,7 @@ struct StatementVisitor const auto &headTerm = **i; if (i != context.headTerms.cbegin()) - outputStream << ", "; + outputStream << " " << Clingo::AST::BinaryOperator::And << " "; const auto variableName = std::string(AuxiliaryHeadVariablePrefix) + std::to_string(i - context.headTerms.cbegin() + 1); diff --git a/tests/TestTranslation.cpp b/tests/TestTranslation.cpp index 740e35c..03909f8 100644 --- a/tests/TestTranslation.cpp +++ b/tests/TestTranslation.cpp @@ -45,7 +45,7 @@ TEST_CASE("[translation] Rules are translated correctly", "[translation]") input << "p(N, 1, 2) :- N = 1..5."; anthem::translate("input", input, context); - REQUIRE(output.str() == "V1 in N, V2 in 1, V3 in 2 and exists X1, X2 (X1 in N and X2 in (1..5) and X1 = X2) -> p(V1, V2, V3)\n"); + REQUIRE(output.str() == "V1 in N and V2 in 1 and V3 in 2 and exists X1, X2 (X1 in N and X2 in (1..5) and X1 = X2) -> p(V1, V2, V3)\n"); } SECTION("disjunctive head") @@ -54,6 +54,14 @@ TEST_CASE("[translation] Rules are translated correctly", "[translation]") input << "q(3, N); p(N, 1, 2) :- N = 1..5."; anthem::translate("input", input, context); - REQUIRE(output.str() == "V1 in N, V2 in 1, V3 in 2, V4 in 3, V5 in N and exists X1, X2 (X1 in N and X2 in (1..5) and X1 = X2) -> p(V1, V2, V3) or q(V4, V5)\n"); + REQUIRE(output.str() == "V1 in N and V2 in 1 and V3 in 2 and V4 in 3 and V5 in N and exists X1, X2 (X1 in N and X2 in (1..5) and X1 = X2) -> p(V1, V2, V3) or q(V4, V5)\n"); + } + + SECTION("escaping conflicting variable names") + { + input << "p(X1, V1) :- q(X1), q(V1)."; + anthem::translate("input", input, context); + + REQUIRE(output.str() == "V1 in _X1 and V2 in _V1 and exists X1 (X1 in _X1 and q(X1)) and exists X2 (X2 in _V1 and q(X2)) -> p(V1, V2)\n"); } }