tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Throw error on missing 'assign' in 'apply'. 

Refs #5911
This commit is contained in:
Michael Friedrich 2014-04-07 13:04:13 +02:00
parent ae1ce6e2c4
commit e97e1cf63f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/config/config_parser.yy
View File

@ -212,6 +212,7 @@ static ConfigType::Ptr m_Type;
static Dictionary::Ptr m_ModuleScope; static Dictionary::Ptr m_ModuleScope;
static bool m_Apply; static bool m_Apply;
static bool m_SeenAssign;
static AExpression::Ptr m_Assign; static AExpression::Ptr m_Assign;
static AExpression::Ptr m_Ignore; static AExpression::Ptr m_Ignore;
@ -575,6 +576,8 @@ lterm: identifier lbinary_op rterm
if (!m_Apply) if (!m_Apply)
BOOST_THROW_EXCEPTION(ConfigError("'assign' keyword not valid in this context.")); BOOST_THROW_EXCEPTION(ConfigError("'assign' keyword not valid in this context."));
m_SeenAssign = true;
m_Assign = make_shared<AExpression>(&AExpression::OpLogicalOr, m_Assign, static_cast<AExpression::Ptr>(*$3), DebugInfoRange(@1, @3)); m_Assign = make_shared<AExpression>(&AExpression::OpLogicalOr, m_Assign, static_cast<AExpression::Ptr>(*$3), DebugInfoRange(@1, @3));
delete $3; delete $3;
@ -807,6 +810,7 @@ target_type_specifier: /* empty */
apply: apply:
{ {
m_Apply = true; m_Apply = true;
m_SeenAssign = false;
m_Assign = make_shared<AExpression>(&AExpression::OpLiteral, false, DebugInfo()); m_Assign = make_shared<AExpression>(&AExpression::OpLiteral, false, DebugInfo());
m_Ignore = make_shared<AExpression>(&AExpression::OpLiteral, false, DebugInfo()); m_Ignore = make_shared<AExpression>(&AExpression::OpLiteral, false, DebugInfo());
} }
@ -851,6 +855,9 @@ apply:
exprl->MakeInline(); exprl->MakeInline();
// assign && !ignore // assign && !ignore
if (!m_SeenAssign)
BOOST_THROW_EXCEPTION(ConfigError("'apply' is missing 'assign'") << errinfo_debuginfo(DebugInfoRange(@2, @3)));
AExpression::Ptr rex = make_shared<AExpression>(&AExpression::OpLogicalNegate, m_Ignore, DebugInfoRange(@2, @5)); AExpression::Ptr rex = make_shared<AExpression>(&AExpression::OpLogicalNegate, m_Ignore, DebugInfoRange(@2, @5));
AExpression::Ptr filter = make_shared<AExpression>(&AExpression::OpLogicalAnd, m_Assign, rex, DebugInfoRange(@2, @5)); AExpression::Ptr filter = make_shared<AExpression>(&AExpression::OpLogicalAnd, m_Assign, rex, DebugInfoRange(@2, @5));