tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-31 01:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure +=, -=, *= and /= behave like they did before.

Browse Source 
Refs #5846
This commit is contained in:
Gunnar Beutner 2014-03-23 17:26:31 +01:00
parent aacc699dd4
commit d23078d6c4
3 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/config/aexpression.cpp
View File

@ -102,8 +102,8 @@ void AExpression::FindDebugInfoPath(const std::vector<String>& path, DebugInfo&
void AExpression::MakeInline(void)
{
ASSERT(m_Operator == &AExpression::OpDict);
m_Operand2 = true;
if (m_Operator == &AExpression::OpDict)
m_Operand2 = true;
}
Value AExpression::EvaluateOperand1(const Dictionary::Ptr& locals) const
@ -295,28 +295,62 @@ Value AExpression::OpSet(const Dictionary::Ptr& locals) const
Value AExpression::OpSetPlus(const Dictionary::Ptr& locals) const
{
Value result = locals->Get(m_Operand1) + EvaluateOperand2(locals);
Value left = locals->Get(m_Operand1);
AExpression::Ptr exp_right = m_Operand2;
Dictionary::Ptr xlocals = locals;
if (exp_right->m_Operator == &AExpression::OpDict)
xlocals = left;
Value result = left + EvaluateOperand2(xlocals);
locals->Set(m_Operand1, result);
return result;
}
Value AExpression::OpSetMinus(const Dictionary::Ptr& locals) const
{
Value result = locals->Get(m_Operand1) - EvaluateOperand2(locals);
Value left = locals->Get(m_Operand1);
AExpression::Ptr exp_right = m_Operand2;
Dictionary::Ptr xlocals = locals;
if (exp_right->m_Operator == &AExpression::OpDict)
xlocals = left;
Value result = left - EvaluateOperand2(xlocals);
locals->Set(m_Operand1, result);
return result;
}
Value AExpression::OpSetMultiply(const Dictionary::Ptr& locals) const
{
Value result = locals->Get(m_Operand1) * EvaluateOperand2(locals);
Value left = locals->Get(m_Operand1);
AExpression::Ptr exp_right = m_Operand2;
Dictionary::Ptr xlocals = locals;
if (exp_right->m_Operator == &AExpression::OpDict)
xlocals = left;
Value result = left * EvaluateOperand2(xlocals);
locals->Set(m_Operand1, result);
return result;
}
Value AExpression::OpSetDivide(const Dictionary::Ptr& locals) const
{
Value result = locals->Get(m_Operand1) / EvaluateOperand2(locals);
Value left = locals->Get(m_Operand1);
AExpression::Ptr exp_right = m_Operand2;
Dictionary::Ptr xlocals = locals;
if (exp_right->m_Operator == &AExpression::OpDict)
xlocals = left;
Value result = left / EvaluateOperand2(xlocals);
locals->Set(m_Operand1, result);
return result;
}
Value AExpression::OpIndexer(const Dictionary::Ptr& locals) const
{
Dictionary::Ptr dict = locals->Get(m_Operand1);
return dict->Get(m_Operand2);
}

1
lib/config/aexpression.h
View File

@ -76,6 +76,7 @@ public:
Value OpSetMinus(const Dictionary::Ptr& locals) const;
Value OpSetMultiply(const Dictionary::Ptr& locals) const;
Value OpSetDivide(const Dictionary::Ptr& locals) const;
Value OpIndexer(const Dictionary::Ptr& locals) const;
private:
OpCallback m_Operator;

16
lib/config/config_parser.yy
View File

@ -542,7 +542,11 @@ lterm_items_inner: /* empty */
lterm: T_IDENTIFIER lbinary_op rterm
{
$$ = new Value(make_shared<AExpression>($2, $1, static_cast<AExpression::Ptr>(*$3), DebugInfoRange(@1, @3)));
AExpression::Ptr aexpr = static_cast<AExpression::Ptr>(*$3);
if ($2 == &AExpression::OpSetPlus || $2 == &AExpression::OpSetMinus || $2 == &AExpression::OpSetMultiply || $2 == &AExpression::OpSetDivide)
aexpr->MakeInline();
$$ = new Value(make_shared<AExpression>($2, $1, aexpr, DebugInfoRange(@1, @3)));
delete $3;
}
| identifier '[' T_STRING ']' lbinary_op rterm
@ -555,7 +559,9 @@ lterm: T_IDENTIFIER lbinary_op rterm
subexprl->Add(subexpr);
AExpression::Ptr expr = make_shared<AExpression>(&AExpression::OpDict, subexprl, DebugInfoRange(@1, @6));
if ($5 == &AExpression::OpSetPlus || $5 == &AExpression::OpSetMinus || $5 == &AExpression::OpSetMultiply || $5 == &AExpression::OpSetDivide)
expr->MakeInline();
$$ = new Value(make_shared<AExpression>(&AExpression::OpSetPlus, $1, expr, DebugInfoRange(@1, @6)));
free($1);
}
@ -660,6 +666,12 @@ rterm: T_STRING
$$ = new Value(make_shared<AExpression>(&AExpression::OpNegate, static_cast<AExpression::Ptr>(*$2), DebugInfoRange(@1, @2)));
delete $2;
}
| identifier '[' T_STRING ']'
{
$$ = new Value(make_shared<AExpression>(&AExpression::OpIndexer, $1, $3, DebugInfoRange(@1, @4)));
free($1);
free($3);
}
| '[' rterm_items ']'
{
$$ = new Value(make_shared<AExpression>(&AExpression::OpArray, Array::Ptr($2), DebugInfoRange(@1, @3)));