MathLib: Return inf.0 for NAN and INF calculations

danmar · danmar · commit 794aebe3cfc1 · 2013-07-19T09:27:33.000+02:00
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -288,6 +288,8 @@ std::string MathLib::divide(const std::string &first, const std::string &second)
         if (b == 0)
             throw InternalError(0, "Internal Error: Division by zero");
         return longToString(toLongNumber(first) / b);
+    } else if (second == "0.0") {
+        return "inf.0";
     }
     return doubleToString(toDoubleNumber(first) / toDoubleNumber(second));
 }
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -41,6 +41,7 @@ class TestMathLib : public TestFixture {
         TEST_CASE(isNotEqual)
         TEST_CASE(isLess)
         TEST_CASE(isLessEqual)
+        TEST_CASE(naninf)
     }
 
     void isGreater() const {
@@ -344,6 +345,12 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS(true , MathLib::isFloat("1.0E-1"));
         ASSERT_EQUALS(true , MathLib::isFloat("-1.0E+1"));
     }
+
+    void naninf() {
+        ASSERT_EQUALS("inf.0", MathLib::divide("0.0", "0.0")); // nan
+        ASSERT_EQUALS("inf.0", MathLib::divide("3.0", "0.0")); // inf
+        ASSERT_EQUALS("inf.0", MathLib::divide("-3.0", "0.0")); // -inf
+    }
 };
 
 REGISTER_TEST(TestMathLib)

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,8 @@ std::string MathLib::divide(const std::string &first, const std::string &second)`
`288`	`288`	`if (b == 0)`
`289`	`289`	`throw InternalError(0, "Internal Error: Division by zero");`
`290`	`290`	`return longToString(toLongNumber(first) / b);`
	`291`	`+ } else if (second == "0.0") {`
	`292`	`+ return "inf.0";`
`291`	`293`	`}`
`292`	`294`	`return doubleToString(toDoubleNumber(first) / toDoubleNumber(second));`
`293`	`295`	`}`