diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy index f84d4d5e5..611dae185 100644 --- a/lib/config/config_parser.yy +++ b/lib/config/config_parser.yy @@ -456,6 +456,7 @@ object: { context->m_ObjectAssign.push(true); context->m_SeenAssign.push(false); + context->m_SeenIgnore.push(false); context->m_Assign.push(NULL); context->m_Ignore.push(NULL); } @@ -473,6 +474,9 @@ object: bool seen_assign = context->m_SeenAssign.top(); context->m_SeenAssign.pop(); + bool seen_ignore = context->m_SeenIgnore.top(); + context->m_SeenIgnore.pop(); + Expression *ignore = context->m_Ignore.top(); context->m_Ignore.pop(); @@ -491,6 +495,9 @@ object: filter = new LogicalAndExpression(assign, rex, DebugInfoRange(@2, @5)); } else filter = assign; + } else if (seen_ignore) { + if (!ObjectRule::IsValidSourceType(type)) + BOOST_THROW_EXCEPTION(ScriptError("object rule 'ignore' cannot be used for type '" + type + "'", DebugInfoRange(@2, @4))); } $$ = new ObjectExpression(abstract, type, $4, filter, context->GetZone(), $5, $6, DebugInfoRange(@2, @5)); @@ -600,6 +607,8 @@ lterm: type if ((context->m_Apply.empty() || !context->m_Apply.top()) && (context->m_ObjectAssign.empty() || !context->m_ObjectAssign.top())) BOOST_THROW_EXCEPTION(ScriptError("'ignore' keyword not valid in this context.", @$)); + context->m_SeenIgnore.top() = true; + if (context->m_Ignore.top()) context->m_Ignore.top() = new LogicalOrExpression(context->m_Ignore.top(), $3, @$); else @@ -1041,6 +1050,7 @@ apply: { context->m_Apply.push(true); context->m_SeenAssign.push(false); + context->m_SeenIgnore.push(false); context->m_Assign.push(NULL); context->m_Ignore.push(NULL); context->m_FKVar.push(""); diff --git a/lib/config/configcompiler.hpp b/lib/config/configcompiler.hpp index b1f7697a8..e3b692c23 100644 --- a/lib/config/configcompiler.hpp +++ b/lib/config/configcompiler.hpp @@ -130,6 +130,7 @@ public: std::stack m_Apply; std::stack m_ObjectAssign; std::stack m_SeenAssign; + std::stack m_SeenIgnore; std::stack m_Assign; std::stack m_Ignore; std::stack m_FKVar;