walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix ticket #632 (Mathlib isInt() identifies "330L" as not int) 

http://sourceforge.net/apps/trac/cppcheck/ticket/632
This commit is contained in:
Reijo Tomperi 2009-09-11 23:46:59 +03:00
parent 8837e0dcff
commit ed1c9bed49
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mathlib.cpp
View File

@ -99,7 +99,7 @@ bool MathLib::isInt(const std::string & s)
{ {
Mode = eHex; Mode = eHex;
} }
else if (s.find("0", n, 1) != std::string::npos && std::isdigit(s[n+1])) else if (s.length() > 1 && s[0] == '0' && std::isdigit(s[1]))
{ {
Mode = eOctal; Mode = eOctal;
} }

7
test/testmathlib.cpp
View File

@ -56,6 +56,7 @@ private:
void isint() void isint()
{ {
ASSERT_EQUALS(true, MathLib::isInt("0"));
ASSERT_EQUALS(true, MathLib::isInt("0xa")); ASSERT_EQUALS(true, MathLib::isInt("0xa"));
ASSERT_EQUALS(true, MathLib::isInt("0l")); ASSERT_EQUALS(true, MathLib::isInt("0l"));
ASSERT_EQUALS(true, MathLib::isInt("0L")); ASSERT_EQUALS(true, MathLib::isInt("0L"));
@ -63,8 +64,10 @@ private:
ASSERT_EQUALS(true, MathLib::isInt("0ull")); ASSERT_EQUALS(true, MathLib::isInt("0ull"));
ASSERT_EQUALS(true, MathLib::isInt("0llu")); ASSERT_EQUALS(true, MathLib::isInt("0llu"));
ASSERT_EQUALS(true, MathLib::isInt("333L")); ASSERT_EQUALS(true, MathLib::isInt("333L"));
TODO_ASSERT_EQUALS(true, MathLib::isInt("330L")); ASSERT_EQUALS(true, MathLib::isInt("330L"));
TODO_ASSERT_EQUALS(true, MathLib::isInt("330llu")); ASSERT_EQUALS(true, MathLib::isInt("330llu"));
ASSERT_EQUALS(true, MathLib::isInt("07"));
ASSERT_EQUALS(true, MathLib::isInt("0123"));
ASSERT_EQUALS(false, MathLib::isInt("0.4")); ASSERT_EQUALS(false, MathLib::isInt("0.4"));
ASSERT_EQUALS(false, MathLib::isInt("2352.3f")); ASSERT_EQUALS(false, MathLib::isInt("2352.3f"));
} }