Implement comparison operators for the Array class

[icinga2] / lib / base / value-operators.cpp

diff --git a/lib/base/value-operators.cpp b/lib/base/value-operators.cpp
index 9c18f7faa8c074d0214bc288f50200017c2b2b18..ad0039722a663cf35fa5bb6810702954c0b5e4a0 100644 (file)
--- a/lib/base/value-operators.cpp
+++ b/lib/base/value-operators.cpp
@@ -20,6 +20,8 @@
 #include "base/value.hpp"
 #include "base/array.hpp"
 #include "base/dictionary.hpp"
+#include "base/datetime.hpp"
+#include "base/convert.hpp"
 #include "base/utility.hpp"
 #include "base/objectlock.hpp"
 #include <boost/foreach.hpp>
@@ -54,18 +56,12 @@ Value::operator double(void) const
 Value::operator String(void) const
 {
        Object *object;
-       double integral, fractional;
 
        switch (GetType()) {
                case ValueEmpty:
                        return String();
                case ValueNumber:
-                       fractional = std::modf(boost::get<double>(m_Value), &integral);
-
-                       if (fractional != 0)
-                               return boost::lexical_cast<std::string>(m_Value);
-                       else
-                               return boost::lexical_cast<std::string>((long)integral);
+                       return Convert::ToString(boost::get<double>(m_Value));
                case ValueBoolean:
                        if (boost::get<bool>(m_Value))
                                return "true";
@@ -177,6 +173,13 @@ bool Value::operator==(const Value& rhs) const
                return false;
 
        if (IsObject()) {
+               if (IsObjectType<DateTime>() && rhs.IsObjectType<DateTime>()) {
+                       DateTime::Ptr dt1 = *this;
+                       DateTime::Ptr dt2 = rhs;
+
+                       return dt1->GetValue() == dt2->GetValue();
+               }
+
                if (IsObjectType<Array>() && rhs.IsObjectType<Array>()) {
                        Array::Ptr arr1 = *this;
                        Array::Ptr arr2 = rhs;
@@ -234,6 +237,8 @@ Value icinga::operator+(const Value& lhs, const Value& rhs)
                return static_cast<String>(lhs) + static_cast<String>(rhs);
        else if ((lhs.IsNumber() || lhs.IsEmpty()) && (rhs.IsNumber() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
                return static_cast<double>(lhs) + static_cast<double>(rhs);
+       else if (lhs.IsObjectType<DateTime>() && rhs.IsNumber())
+               return new DateTime(Convert::ToDateTimeValue(lhs) + rhs);
        else if ((lhs.IsObjectType<Array>() || lhs.IsEmpty()) && (rhs.IsObjectType<Array>() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty())) {
                Array::Ptr result = new Array();
                if (!lhs.IsEmpty())
@@ -277,6 +282,12 @@ Value icinga::operator-(const Value& lhs, const Value& rhs)
 {
        if ((lhs.IsNumber() || lhs.IsEmpty()) && !lhs.IsString() && (rhs.IsNumber() || rhs.IsEmpty()) && !rhs.IsString() && !(lhs.IsEmpty() && rhs.IsEmpty()))
                return static_cast<double>(lhs) - static_cast<double>(rhs);
+       else if (lhs.IsObjectType<DateTime>() && rhs.IsNumber())
+               return new DateTime(Convert::ToDateTimeValue(lhs) - rhs);
+       else if (lhs.IsObjectType<DateTime>() && rhs.IsObjectType<DateTime>())
+               return Convert::ToDateTimeValue(lhs) - Convert::ToDateTimeValue(rhs);
+       else if ((lhs.IsObjectType<DateTime>() || lhs.IsEmpty()) && (rhs.IsObjectType<DateTime>() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
+               return new DateTime(Convert::ToDateTimeValue(lhs) - Convert::ToDateTimeValue(rhs));
        else if ((lhs.IsObjectType<Array>() || lhs.IsEmpty()) && (rhs.IsObjectType<Array>() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty())) {
                if (lhs.IsEmpty())
                        return new Array();
@@ -567,7 +578,30 @@ bool icinga::operator<(const Value& lhs, const Value& rhs)
                return static_cast<String>(lhs) < static_cast<String>(rhs);
        else if ((lhs.IsNumber() || lhs.IsEmpty()) && (rhs.IsNumber() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
                return static_cast<double>(lhs) < static_cast<double>(rhs);
-       else
+       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 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() + "'"));
 }
 
@@ -597,7 +631,30 @@ bool icinga::operator>(const Value& lhs, const Value& rhs)
                return static_cast<String>(lhs) > static_cast<String>(rhs);
        else if ((lhs.IsNumber() || lhs.IsEmpty()) && (rhs.IsNumber() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
                return static_cast<double>(lhs) > static_cast<double>(rhs);
-       else
+       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 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() + "'"));
 }
 
@@ -627,6 +684,8 @@ bool icinga::operator<=(const Value& lhs, const Value& rhs)
                return static_cast<String>(lhs) <= static_cast<String>(rhs);
        else if ((lhs.IsNumber() || lhs.IsEmpty()) && (rhs.IsNumber() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
                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
                BOOST_THROW_EXCEPTION(std::invalid_argument("Operator <= cannot be applied to values of type '" + lhs.GetTypeName() + "' and '" + rhs.GetTypeName() + "'"));
 }
@@ -657,6 +716,8 @@ bool icinga::operator>=(const Value& lhs, const Value& rhs)
                return static_cast<String>(lhs) >= static_cast<String>(rhs);
        else if ((lhs.IsNumber() || lhs.IsEmpty()) && (rhs.IsNumber() || rhs.IsEmpty()) && !(lhs.IsEmpty() && rhs.IsEmpty()))
                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
                BOOST_THROW_EXCEPTION(std::invalid_argument("Operator >= cannot be applied to values of type '" + lhs.GetTypeName() + "' and '" + rhs.GetTypeName() + "'"));
 }