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

Implement comparison operators for the Array class 

fixes #12426
This commit is contained in:
Gunnar Beutner 2016-08-14 17:21:47 +02:00
parent fda032c0c4
commit 6af9e61e9b
1 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/base/value-operators.cpp
View File

@ -580,7 +580,28 @@ bool icinga::operator<(const Value& lhs, const Value& rhs)
return static_cast<double>(lhs) < static_cast<double>(rhs);
else if ((lhs.IsObjectType<DateTime>() || lhs.IsEmpty()) && (rhs.IsObjectType<DateTime>() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
return Convert::ToDateTimeValue(lhs) < Convert::ToDateTimeValue(rhs);
else
else if (lhs.IsObjectType<Array>() && rhs.IsObjectType<Array>()) {
Array::Ptr larr = lhs;
Array::Ptr rarr = rhs;
ObjectLock llock(larr);
ObjectLock rlock(rarr);
Array::SizeType llen = larr->GetLength();
Array::SizeType rlen = rarr->GetLength();
for (Array::SizeType i = 0; i < std::max(llen, rlen); i++) {
Value lval = (i >= llen) ? Empty : larr->Get(i);
Value rval = (i >= rlen) ? Empty : rarr->Get(i);
if (lval < rval)
return true;
else if (lval > rval)
return false;
}
return false;
} else
BOOST_THROW_EXCEPTION(std::invalid_argument("Operator < cannot be applied to values of type '" + lhs.GetTypeName() + "' and '" + rhs.GetTypeName() + "'"));
}
@ -612,7 +633,28 @@ bool icinga::operator>(const Value& lhs, const Value& rhs)
return static_cast<double>(lhs) > static_cast<double>(rhs);
else if ((lhs.IsObjectType<DateTime>() || lhs.IsEmpty()) && (rhs.IsObjectType<DateTime>() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
return Convert::ToDateTimeValue(lhs) > Convert::ToDateTimeValue(rhs);
else
else if (lhs.IsObjectType<Array>() && rhs.IsObjectType<Array>()) {
Array::Ptr larr = lhs;
Array::Ptr rarr = rhs;
ObjectLock llock(larr);
ObjectLock rlock(rarr);
Array::SizeType llen = larr->GetLength();
Array::SizeType rlen = rarr->GetLength();
for (Array::SizeType i = 0; i < std::max(llen, rlen); i++) {
Value lval = (i >= llen) ? Empty : larr->Get(i);
Value rval = (i >= rlen) ? Empty : rarr->Get(i);
if (lval > rval)
return true;
else if (lval < rval)
return false;
}
return false;
} else
BOOST_THROW_EXCEPTION(std::invalid_argument("Operator > cannot be applied to values of type '" + lhs.GetTypeName() + "' and '" + rhs.GetTypeName() + "'"));
}