Fixed danmar#6280 (MathLib: binary literals are integers)

IOBYTE · danmar · commit b7c91875399e · 2014-11-19T06:43:52.000+01:00
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -505,7 +505,7 @@ bool MathLib::isDec(const std::string & s)
 
 bool MathLib::isInt(const std::string & s)
 {
-    return isDec(s) || isHex(s) || isOct(s);
+    return isDec(s) || isHex(s) || isOct(s) || isBin(s);
 }
 
 std::string MathLib::add(const std::string & first, const std::string & second)
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -274,6 +274,8 @@ class TestMathLib : public TestFixture {
 
         ASSERT_EQUALS(true , MathLib::isInt("0xff"));
         ASSERT_EQUALS(true , MathLib::isInt("0xa"));
+        ASSERT_EQUALS(true , MathLib::isInt("0b1000"));
+        ASSERT_EQUALS(true , MathLib::isInt("0B1000"));
         ASSERT_EQUALS(true , MathLib::isInt("0l"));
         ASSERT_EQUALS(true , MathLib::isInt("0L"));
         ASSERT_EQUALS(true , MathLib::isInt("0ul"));

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ bool MathLib::isDec(const std::string & s)`
`505`	`505`
`506`	`506`	`bool MathLib::isInt(const std::string & s)`
`507`	`507`	`{`
`508`		`- return isDec(s) \|\| isHex(s) \|\| isOct(s);`
	`508`	`+ return isDec(s) \|\| isHex(s) \|\| isOct(s) \|\| isBin(s);`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`std::string MathLib::add(const std::string & first, const std::string & second)`