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

MathLib::toLongNumber: Better handling of '\x12' and '\000' char constants

This commit is contained in:
Daniel Marjamäki 2015-11-20 18:57:48 +01:00
parent 6590d46013
commit 79a70c1277
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mathlib.cpp
View File

@ -400,10 +400,14 @@ MathLib::bigint MathLib::toLongNumber(const std::string & str)
c = str[2]; c = str[2];
break; break;
default: default:
throw InternalError(0, "MathLib::toLongNumber: Unhandled char constant " + str); throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant " + str);
} }
} else if (str[1] == '\\' && str[2] == '0' && str.size() == 6U) {
return toLongNumber(str.substr(2,3));
} else if (str[1] == '\\' && str[2] == 'x' && str.size() == 6U) {
return toLongNumber("0" + str.substr(2,3));
} else } else
throw InternalError(0, "MathLib::toLongNumber: Unhandled char constant " + str); throw InternalError(0, "Internal Error. MathLib::toLongNumber: Unhandled char constant " + str);
return c & 0xff; return c & 0xff;
} }

20
test/testmathlib.cpp
View File

@ -48,7 +48,8 @@ private:
TEST_CASE(calculate); TEST_CASE(calculate);
TEST_CASE(calculate1); TEST_CASE(calculate1);
TEST_CASE(typesuffix); TEST_CASE(typesuffix);
TEST_CASE(convert); TEST_CASE(toLongNumber);
TEST_CASE(toDoubleNumber);
TEST_CASE(naninf); TEST_CASE(naninf);
TEST_CASE(isNullValue); TEST_CASE(isNullValue);
TEST_CASE(incdec); TEST_CASE(incdec);
@ -226,11 +227,7 @@ private:
ASSERT_EQUALS("2ULL", MathLib::add("1ULL", "1LLU")); ASSERT_EQUALS("2ULL", MathLib::add("1ULL", "1LLU"));
} }
void convert() const { void toLongNumber() const {
// ------------------
// tolong conversion:
// ------------------
// from hex // from hex
ASSERT_EQUALS(0 , MathLib::toLongNumber("0x0")); ASSERT_EQUALS(0 , MathLib::toLongNumber("0x0"));
ASSERT_EQUALS(0 , MathLib::toLongNumber("-0x0")); ASSERT_EQUALS(0 , MathLib::toLongNumber("-0x0"));
@ -272,6 +269,12 @@ private:
ASSERT_EQUALS(100 , MathLib::toLongNumber("+10.0E+1")); ASSERT_EQUALS(100 , MathLib::toLongNumber("+10.0E+1"));
ASSERT_EQUALS(-1 , MathLib::toLongNumber("-10.0E-1")); ASSERT_EQUALS(-1 , MathLib::toLongNumber("-10.0E-1"));
// from char
ASSERT_EQUALS((int)('A'), MathLib::toLongNumber("'A'"));
ASSERT_EQUALS((int)('\r'), MathLib::toLongNumber("'\\r'"));
ASSERT_EQUALS((int)('\x12'), MathLib::toLongNumber("'\\x12'"));
ASSERT_EQUALS((int)('\034'), MathLib::toLongNumber("'\\034'"));
ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a")); ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a"));
ASSERT_EQUALS(-8481036456200365558, MathLib::toLongNumber("0x8a4d4e470d0a1a0a")); ASSERT_EQUALS(-8481036456200365558, MathLib::toLongNumber("0x8a4d4e470d0a1a0a"));
ASSERT_EQUALS(9894494448401390090ULL, MathLib::toULongNumber("0x89504e470d0a1a0a")); ASSERT_EQUALS(9894494448401390090ULL, MathLib::toULongNumber("0x89504e470d0a1a0a"));
@ -300,10 +303,9 @@ private:
*/ */
ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toLongNumber("0x0A00000000000000LL")); ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toLongNumber("0x0A00000000000000LL"));
}
// ----------------- void toDoubleNumber() {
// to double number:
// -----------------
ASSERT_EQUALS_DOUBLE(10.0 , MathLib::toDoubleNumber("10")); ASSERT_EQUALS_DOUBLE(10.0 , MathLib::toDoubleNumber("10"));
ASSERT_EQUALS_DOUBLE(1000.0, MathLib::toDoubleNumber("10E+2")); ASSERT_EQUALS_DOUBLE(1000.0, MathLib::toDoubleNumber("10E+2"));
ASSERT_EQUALS_DOUBLE(100.0 , MathLib::toDoubleNumber("1.0E+2")); ASSERT_EQUALS_DOUBLE(100.0 , MathLib::toDoubleNumber("1.0E+2"));