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

Avoiding empty arguments in n-ary expressions.

Browse Source
This commit is contained in:
Patrick Lühne 2016-06-13 14:04:12 +02:00
parent 2c3481d027
commit fdbcb261df
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/plasp/pddl/expressions/NAry.h
View File

@ -34,7 +34,7 @@ class NAry: public ExpressionCRTP<Derived>
private: private:
void addArgument(const Expression *argument); void addArgument(const Expression *argument);
void addArgument(ExpressionPointer &&argument); void addArgument(ExpressionPointer &&argument);
std::vector<const Expression *> m_arguments; std::vector<const Expression *> m_arguments;
Expressions m_argumentStorage; Expressions m_argumentStorage;
}; };
@ -83,6 +83,9 @@ std::unique_ptr<Derived> NAry<Derived>::parse(Context &context,
template<class Derived> template<class Derived>
void NAry<Derived>::addArgument(const Expression *argument) void NAry<Derived>::addArgument(const Expression *argument)
{ {
if (!argument)
return;
m_arguments.emplace_back(argument); m_arguments.emplace_back(argument);
} }
@ -91,6 +94,9 @@ void NAry<Derived>::addArgument(const Expression *argument)
template<class Derived> template<class Derived>
void NAry<Derived>::addArgument(ExpressionPointer &&argument) void NAry<Derived>::addArgument(ExpressionPointer &&argument)
{ {
if (!argument)
return;
m_argumentStorage.emplace_back(std::move(argument)); m_argumentStorage.emplace_back(std::move(argument));
m_arguments.emplace_back(m_argumentStorage.back().get()); m_arguments.emplace_back(m_argumentStorage.back().get());
} }