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

Changed output format of auxiliary variables and treated potential name collisions.

Browse Source
This commit is contained in:
Patrick Lühne 2016-11-24 13:42:36 +01:00
parent cf786e05b2
commit 66acbb8965
Signed by: patrick
GPG Key ID: 05F3611E97A70ABF
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
include/anthem/Utils.h
View File

@ -43,8 +43,48 @@ inline void throwErrorAtLocation(const Clingo::Location &clingoLocation, const c
////////////////////////////////////////////////////////////////////////////////////////////////////
constexpr const auto AuxiliaryHeadVariablePrefix = "AUX_H";
constexpr const auto AuxiliaryBodyVariablePrefix = "AUX_B";
inline bool isPrefix(const char *prefix, const char *string)
{
const auto prefixLength = std::strlen(prefix);
const auto stringLength = std::strlen(string);
if (stringLength < prefixLength)
return false;
return std::strncmp(prefix, string, prefixLength) == 0;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
constexpr const auto AuxiliaryHeadVariablePrefix = "H";
constexpr const auto AuxiliaryBodyVariablePrefix = "B";
constexpr const auto UserVariablePrefix = "_";
////////////////////////////////////////////////////////////////////////////////////////////////////
inline bool isReservedVariableName(const char *variableName)
{
if (!isPrefix(AuxiliaryBodyVariablePrefix, variableName)
&& !isPrefix(AuxiliaryHeadVariablePrefix, variableName))
{
return false;
}
assert(std::strlen(AuxiliaryBodyVariablePrefix) == std::strlen(AuxiliaryHeadVariablePrefix));
const auto prefixLength = std::strlen(AuxiliaryBodyVariablePrefix);
if (strlen(variableName) == prefixLength)
return false;
const char *suffix = variableName + prefixLength;
for (const auto *i = suffix; *i != '\0'; i++)
if (!std::isdigit(*i))
return false;
return true;
}
////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/anthem/output/ClingoOutput.cpp
View File

@ -1,5 +1,6 @@
#include <anthem/output/ClingoOutput.h>
#include <anthem/Utils.h>
#include <anthem/output/Formatting.h>
namespace anthem
@ -108,7 +109,12 @@ ColorStream &operator<<(ColorStream &stream, const Clingo::AST::Boolean &boolean
ColorStream &operator<<(ColorStream &stream, const Clingo::AST::Variable &variable)
{
return (stream << Variable(variable.name));
if (!isReservedVariableName(variable.name))
return (stream << Variable(variable.name));
const auto variableName = std::string(UserVariablePrefix) + variable.name;
return (stream << Variable(variableName.c_str()));
}
////////////////////////////////////////////////////////////////////////////////////////////////////