Bounds errors are verbose now and some unchecked conditions fixed as well

1 files changed, 48 insertions, 2 deletions

diff --git a/sigmod/Object.cpp b/sigmod/Object.cpp
index fd1c3621..9c45d8c6 100644
--- a/sigmod/Object.cpp
+++ b/sigmod/Object.cpp
@@ -71,9 +71,55 @@ QString Sigmod::Object::unused(const QString& variable)
     return QString("Setting unused variable %1").arg(variable);
 }
 
-QString Sigmod::Object::bounds(const QString& variable)
+QString Sigmod::Object::bounds(const QString& variable, const int min, const int max, const int value)
 {
-    return QString("Value for %1 out-of-bounds").arg(variable);
+    QString msg = QString("Value for %1 out-of-bounds (%2 -- %3) (%4)");
+    msg.arg(variable);
+    if (min == INT_MIN)
+        msg.arg(QString::fromUtf8("-∞"));
+    else
+        msg.arg(min);
+    if (max == INT_MAX)
+        msg.arg(QString::fromUtf8("∞"));
+    else
+        msg.arg(max);
+    return msg.arg(value);
+}
+
+QString Sigmod::Object::bounds(const QString& variable, const int min, const int max, const Sigcore::Fraction& value)
+{
+    QString msg("Value for %1 out-of-bounds (%2 -- %3) (%4 / %5)");
+    msg.arg(variable);
+    if (min == INT_MIN)
+        msg.arg(QString::fromUtf8("-∞"));
+    else
+        msg.arg(min);
+    if (max == INT_MAX)
+        msg.arg(QString::fromUtf8("∞"));
+    else
+        msg.arg(max);
+    return msg.arg(value.numerator()).arg(value.denominator());
+}
+
+QString Sigmod::Object::bounds(const QString& variable, const QPoint& min, const QPoint& max, const QPoint& value)
+{
+    QString msg("Value for %1 out-of-bounds ((%2, %3) -- (%4, %5)) (%6 / %7)");
+    return msg.arg(variable).arg(min.x()).arg(min.y()).arg(max.x()).arg(max.y()).arg(value.x()).arg(value.y());
+}
+
+QString Sigmod::Object::bounds(const QString& variable, const QString& min, const QString& max, const int value)
+{
+    return QString("Value for %1 out-of-bounds (%2 -- %3) (%4)").arg(variable).arg(min).arg(max).arg(value);
+}
+
+QString Sigmod::Object::bounds(const QString& variable, const int value)
+{
+    return QString("Value for %1 out-of-bounds (%2)").arg(variable).arg(value);
+}
+
+QString Sigmod::Object::bounds(const QString& variable, const QString& value)
+{
+    return QString("Value for %1 out-of-bounds (%2)").arg(variable).arg(value);
 }
 
 QString Sigmod::Object::subclass(const QString& subclass, const int id)