patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Throwing exceptions for unsupported features instead of silently accepting them.

Browse Source
This commit is contained in:
Patrick Lühne
2017-06-24 20:27:01 +02:00
parent 2b0b6570ea
commit ca02b8ce62
19 changed files with 86 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
include/plasp/pddl/translation/Effect.h
View File

@@ -24,12 +24,6 @@ namespace pddl
template<typename PrintObjectName>
inline void translateEffect(colorlog::ColorStream &outputStream, const ::pddl::normalizedAST::Effect &effect, const std::string &objectType, PrintObjectName printObjectName)
{
const auto handleUnsupported =
[](const auto &)
{
throw TranslatorException("only “and” expressions and (negated) predicates supported as action effects currently");
};
const auto handlePredicate =
[&](const ::pddl::normalizedAST::PredicatePointer &predicate, bool isPositive = true)
{
@@ -45,21 +39,10 @@ inline void translateEffect(colorlog::ColorStream &outputStream, const ::pddl::n
outputStream << ").";
};
const auto handleAtomicFormula =
[&](const ::pddl::normalizedAST::AtomicFormula &atomicFormula)
const auto handleDerivedPredicate =
[&](const ::pddl::normalizedAST::DerivedPredicatePointer &, bool = true)
{
atomicFormula.match(handlePredicate, handleUnsupported);
};
const auto handleNot =
[&](const ::pddl::normalizedAST::NotPointer<::pddl::normalizedAST::Effect> &not_)
{
if (!not_->argument.is<::pddl::normalizedAST::AtomicFormula>() || !not_->argument.get<::pddl::normalizedAST::AtomicFormula>().is<::pddl::normalizedAST::PredicatePointer>())
handleUnsupported(not_);
const auto &predicate = not_->argument.get<::pddl::normalizedAST::AtomicFormula>().get<::pddl::normalizedAST::PredicatePointer>();
handlePredicate(predicate, false);
throw TranslatorException("derived predicates not yet supported by translator");
};
const auto handleAnd =
@@ -69,7 +52,36 @@ inline void translateEffect(colorlog::ColorStream &outputStream, const ::pddl::n
translateEffect(outputStream, argument, objectType, printObjectName);
};
effect.match(handleAtomicFormula, handleNot, handleAnd, handleUnsupported);
const auto handleAtomicFormula =
[&](const ::pddl::normalizedAST::AtomicFormula &atomicFormula)
{
atomicFormula.match(handlePredicate, handleDerivedPredicate);
};
const auto handleForAll =
[&](const ::pddl::normalizedAST::ForAllPointer<::pddl::normalizedAST::Effect> &)
{
throw TranslatorException("“when” expressions not yet supported by translator");
};
const auto handleNot =
[&](const ::pddl::normalizedAST::NotPointer<::pddl::normalizedAST::Effect> &not_)
{
if (!not_->argument.is<::pddl::normalizedAST::AtomicFormula>() || !not_->argument.get<::pddl::normalizedAST::AtomicFormula>().is<::pddl::normalizedAST::PredicatePointer>())
throw TranslatorException("only “and” expressions and (negated) predicates supported as action effects currently");
const auto &predicate = not_->argument.get<::pddl::normalizedAST::AtomicFormula>().get<::pddl::normalizedAST::PredicatePointer>();
handlePredicate(predicate, false);
};
const auto handleWhen =
[&](const ::pddl::normalizedAST::WhenPointer<::pddl::normalizedAST::Precondition, ::pddl::normalizedAST::ConditionalEffect> &)
{
throw TranslatorException("“when” expressions not yet supported by translator");
};
effect.match(handleAtomicFormula, handleAnd, handleForAll, handleNot, handleWhen);
}
////////////////////////////////////////////////////////////////////////////////////////////////////

8
include/plasp/pddl/translation/Predicate.h
View File

@@ -53,13 +53,7 @@ inline void translatePredicate(colorlog::ColorStream &outputStream, const ::pddl
outputStream << *variable;
};
const auto handleUnsupported =
[&](const auto &)
{
throw TranslatorException("only variables and constants supported in predicates currently");
};
argument.match(handleConstant, handleVariable, handleUnsupported);
argument.match(handleConstant, handleVariable);
}
outputStream << ")";