From 421125fee6dae9b74ea0782d9c652d15cf92b472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Mon, 13 Jun 2016 03:31:22 +0200 Subject: [PATCH] Escaping PDDL identifiers for use with ASP. --- src/plasp/pddl/TranslatorASP.cpp | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/plasp/pddl/TranslatorASP.cpp b/src/plasp/pddl/TranslatorASP.cpp index 491f083..6062a75 100644 --- a/src/plasp/pddl/TranslatorASP.cpp +++ b/src/plasp/pddl/TranslatorASP.cpp @@ -185,15 +185,19 @@ void TranslatorASP::translateTypes() const { m_ostream << std::endl; - m_ostream << "type(" << type->name() << ")." << std::endl; + const auto typeName = utils::escapeASP(type->name()); + + m_ostream << "type(" << typeName << ")." << std::endl; const auto &parentTypes = type->parentTypes(); std::for_each(parentTypes.cbegin(), parentTypes.cend(), [&](const auto &parentType) { - m_ostream << "inherits(type(" << type->name() << "), type(" << parentType->name() << "))." << std::endl; - m_ostream << "hasType(X, type(" << parentType->name() << ")) :- hasType(X, type(" << type->name() << "))." << std::endl; + const auto parentTypeName = utils::escapeASP(parentType->name()); + + m_ostream << "inherits(type(" << typeName << "), type(" << parentTypeName << "))." << std::endl; + m_ostream << "hasType(X, type(" << parentTypeName << ")) :- hasType(X, type(" << typeName << "))." << std::endl; }); }); } @@ -211,14 +215,16 @@ void TranslatorASP::translateConstants() const { m_ostream << std::endl; - m_ostream << "constant(" << constant->name() << ")." << std::endl; + const auto constantName = utils::escapeASP(constant->name()); + + m_ostream << "constant(" << constantName << ")." << std::endl; const auto *type = constant->type(); if (type == nullptr) return; - m_ostream << "hasType(constant(" << constant->name() << "), type(" << type->name() << "))." << std::endl; + m_ostream << "hasType(constant(" << constantName << "), type(" << utils::escapeASP(type->name()) << "))." << std::endl; }); } @@ -235,7 +241,7 @@ void TranslatorASP::translatePredicates() const { m_ostream << std::endl; - m_ostream << "predicate(" << predicate->name(); + m_ostream << "predicate(" << utils::escapeASP(predicate->name()); this->translateVariablesHead(predicate->arguments()); @@ -260,7 +266,7 @@ void TranslatorASP::translateActions() const const auto printActionName = [&](const auto &action) { - m_ostream << "action(" << action.name(); + m_ostream << "action(" << utils::escapeASP(action.name()); this->translateVariablesHead(action.parameters()); @@ -416,7 +422,7 @@ void TranslatorASP::translateLiteral(const Expression &literal) const void TranslatorASP::translatePredicate(const expressions::Predicate &predicate) const { - m_ostream << "predicate(" << predicate.name(); + m_ostream << "predicate(" << utils::escapeASP(predicate.name()); const auto &arguments = predicate.arguments(); @@ -437,7 +443,7 @@ void TranslatorASP::translatePredicate(const expressions::Predicate &predicate) { const auto &constant = dynamic_cast(**i); - m_ostream << "constant(" << constant.name() << ")"; + m_ostream << "constant(" << utils::escapeASP(constant.name()) << ")"; } else if ((*i)->expressionType() == Expression::Type::Variable) { @@ -496,14 +502,16 @@ void TranslatorASP::translateObjects() const { m_ostream << std::endl; - m_ostream << "constant(" << object->name() << ")." << std::endl; + const auto objectName = utils::escapeASP(object->name()); + + m_ostream << "constant(" << objectName << ")." << std::endl; const auto *type = object->type(); if (type == nullptr) return; - m_ostream << "hasType(constant(" << object->name() << "), type(" << type->name() << "))." << std::endl; + m_ostream << "hasType(constant(" << objectName << "), type(" << utils::escapeASP(type->name()) << "))." << std::endl; }); }