Changeset 636

Timestamp:

12/03/16 01:52:05 (8 years ago)

Author:

Maciej Komosinski

Message:

Modulo by zero is safe just as division by zero and prints analogous messages

Location:

cpp/frams/util

Files:

• extvalue.cpp (modified) (1 diff)
• extvalue.h (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -828 +828 @@
 
 
+void ExtValue::modInt(paInt a)
+{
+        if (a)
+                idata() %= a;
+        else
+        {
+                logPrintf("ExtValue", "modulo", LOG_ERROR, "Modulo by zero: %d%%0", idata());
+                setInvalid();
+        }
+}
+
+void ExtValue::modDouble(double a)
+{
+        if (a == 0.0)
+        {
+                logPrintf("ExtValue", "modulo", LOG_ERROR, "Modulo by zero: %s%%0.0", getString().c_str());
+                setInvalid();
+        }
+        else
+                setDouble(fmod(ddata(),a));
+}
+
 void ExtValue::operator%=(const ExtValue& src)
 {
         switch (type)
         {
-        case TInt: idata() = idata() % src.getInt(); break;
-        case TDouble: ddata() = fmod(ddata(), src.getDouble()); break;
+        case TInt: modInt(src.getInt()); break;
+        case TDouble: modDouble(src.getDouble()); break;
 
         case TString:

cpp/frams/util/extvalue.h

@@ -168 +168 @@
         void divInt(paInt a);
         void divDouble(double a);
+        void modInt(paInt a);
+        void modDouble(double a);
 
         int operator==(const ExtValue& src) const;