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

astyle run [ci skip]

This commit is contained in:
Martin Ettl 2014-05-16 23:01:21 +02:00
parent 6f31ce334d
commit af369b4925
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mathlib.cpp
View File

@ -552,8 +552,8 @@ std::string MathLib::divide(const std::string &first, const std::string &second)
} else if (isNullValue(second)) { } else if (isNullValue(second)) {
if (isNullValue(first)) if (isNullValue(first))
return "nan.0"; return "nan.0";
const int sign_first = (isPositive(first)) ? 1 : -1; const int sign_first = (isPositive(first)) ? 1 : -1;
const int sign_second = (isPositive(second)) ? 1 : -1; const int sign_second = (isPositive(second)) ? 1 : -1;
return (sign_first*sign_second == 1) ? "inf.0" : "-inf.0"; return (sign_first*sign_second == 1) ? "inf.0" : "-inf.0";
} }
return toString(toDoubleNumber(first) / toDoubleNumber(second)); return toString(toDoubleNumber(first) / toDoubleNumber(second));

7
test/testassignif.cpp
View File

@ -38,7 +38,7 @@ private:
TEST_CASE(compare); // mismatching LHS/RHS in comparison TEST_CASE(compare); // mismatching LHS/RHS in comparison
TEST_CASE(multicompare); // mismatching comparisons TEST_CASE(multicompare); // mismatching comparisons
TEST_CASE(duplicateIf); // duplicate conditions in if and else-if TEST_CASE(duplicateIf); // duplicate conditions in if and else-if
TEST_CASE(invalidMissingSemicolon); // crash as of #5867 TEST_CASE(invalidMissingSemicolon); // crash as of #5867
} }
void check(const char code[]) { void check(const char code[]) {
@ -379,9 +379,8 @@ private:
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void invalidMissingSemicolon() void invalidMissingSemicolon() {
{
// simply survive - a syntax error would be even better // simply survive - a syntax error would be even better
check("void f(int x) {\n" check("void f(int x) {\n"
" x = 42\n" " x = 42\n"

20
test/testmathlib.cpp
View File

@ -599,18 +599,18 @@ private:
void naninf() const { void naninf() const {
ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "0.0")); // nan ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "0.0")); // nan
ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("-0.0", "0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("-0.0", "0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("-0.f", "0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("-0.f", "0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("-0.0", "-0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("-0.0", "-0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("-.0", "-0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("-.0", "-0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "-0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("0.0", "-0.f")); // nan (#5875)
ASSERT_EQUALS("nan.0", MathLib::divide("0.f", "-0.f")); // nan (#5875) ASSERT_EQUALS("nan.0", MathLib::divide("0.f", "-0.f")); // nan (#5875)
ASSERT_EQUALS("inf.0", MathLib::divide("3.0", "0.0")); // inf ASSERT_EQUALS("inf.0", MathLib::divide("3.0", "0.0")); // inf
ASSERT_EQUALS("inf.0", MathLib::divide("3.0", "0.f")); // inf (#5875) ASSERT_EQUALS("inf.0", MathLib::divide("3.0", "0.f")); // inf (#5875)
ASSERT_EQUALS("-inf.0", MathLib::divide("-3.0", "0.0")); // -inf (#5142) ASSERT_EQUALS("-inf.0", MathLib::divide("-3.0", "0.0")); // -inf (#5142)
ASSERT_EQUALS("-inf.0", MathLib::divide("-3.0", "0.0f")); // -inf (#5142) ASSERT_EQUALS("-inf.0", MathLib::divide("-3.0", "0.0f")); // -inf (#5142)
ASSERT_EQUALS("inf.0", MathLib::divide("-3.0", "-0.0f")); // inf (#5142) ASSERT_EQUALS("inf.0", MathLib::divide("-3.0", "-0.0f")); // inf (#5142)
} }
void isNullValue() const { void isNullValue() const {