From b684e1f2028eb30e5030c4938fa52d21da5d0754 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Mon, 8 Jan 2018 20:20:33 +0100 Subject: [PATCH] Updated AStyle to version 3.0.1 --- gui/test/data/benchmark/simple.cpp | 4 +- lib/cppcheck.cpp | 2 +- runastyle | 6 +- runastyle.bat | 4 +- test/testclass.cpp | 6 +- test/testio.cpp | 2 +- test/testmathlib.cpp | 542 ++++++++++++++--------------- test/testmemleak.cpp | 2 +- test/testtokenize.cpp | 2 +- 9 files changed, 285 insertions(+), 285 deletions(-) diff --git a/gui/test/data/benchmark/simple.cpp b/gui/test/data/benchmark/simple.cpp index 80bbb346a..4be2a8bd0 100644 --- a/gui/test/data/benchmark/simple.cpp +++ b/gui/test/data/benchmark/simple.cpp @@ -637,8 +637,8 @@ void CheckOther::checkIncorrectLogicOperator() { "(", Second, "<", "&&", First, "<", ")", MoreEqual, false }, // (3 < x) && (x < 1) <- always false { "(", Second, ">", "&&", Second, "<", ")", LessEqual, false }, // (1 > x) && (3 < x) <- always false { "(", Second, "<", "&&", Second, ">", ")", MoreEqual, false }, // (3 < x) && (1 > x) <- always false - { "(", First , ">|>=", "||", First, "<|<=", ")", Less, true }, // (x > 3) || (x < 10) <- always true - { "(", First , "<|<=", "||", First, ">|>=", ")", More, true }, // (x < 10) || (x > 3) <- always true + { "(", First, ">|>=", "||", First, "<|<=", ")", Less, true }, // (x > 3) || (x < 10) <- always true + { "(", First, "<|<=", "||", First, ">|>=", ")", More, true }, // (x < 10) || (x > 3) <- always true { "(", Second, "<|<=", "||", First, "<|<=", ")", Less, true }, // (3 < x) || (x < 10) <- always true { "(", First, "<|<=", "||", Second, "<|<=", ")", More, true }, // (x < 10) || (3 < x) <- always true { "(", First, ">|>=", "||", Second, ">|>=", ")", Less, true }, // (x > 3) || (10 > x) <- always true diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp index a859f3b0c..47778a90c 100644 --- a/lib/cppcheck.cpp +++ b/lib/cppcheck.cpp @@ -866,7 +866,7 @@ void CppCheck::analyseWholeProgram(const std::string &buildDir, const std::mapanalyseWholeProgram(fileInfoList, _settings, *this); for (std::list::iterator fi = fileInfoList.begin(); fi != fileInfoList.end(); ++fi) - delete(*fi); + delete (*fi); } bool CppCheck::isUnusedFunctionCheckEnabled() const diff --git a/runastyle b/runastyle index d7374130e..ee6c7c771 100755 --- a/runastyle +++ b/runastyle @@ -6,7 +6,7 @@ # If project management wishes to take a newer astyle version into use # just change this string to match the start of astyle version string. -ASTYLE_VERSION="Artistic Style Version 2.05.1" +ASTYLE_VERSION="Artistic Style Version 3.0.1" ASTYLE="astyle" DETECTED_VERSION=`$ASTYLE --version 2>&1` @@ -16,8 +16,8 @@ if [[ "$DETECTED_VERSION" != ${ASTYLE_VERSION}* ]]; then exit 1; fi -style="--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0" -options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines" +style="--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0" +options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces" $ASTYLE $style $options cli/*.cpp $ASTYLE $style $options cli/*.h diff --git a/runastyle.bat b/runastyle.bat index c7e198d85..4e8245240 100644 --- a/runastyle.bat +++ b/runastyle.bat @@ -1,7 +1,7 @@ @REM Script to run AStyle on the sources -@SET STYLE=--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0 -@SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines +@SET STYLE=--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0 +@SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces astyle %STYLE% %OPTIONS% cli/*.cpp astyle %STYLE% %OPTIONS% cli/*.h diff --git a/test/testclass.cpp b/test/testclass.cpp index 347881246..982b2d8ab 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -3345,7 +3345,7 @@ private: " int B::getB() { return b; }\n" "};"); ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n" - "[test.cpp:9] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n" , errout.str()); + "[test.cpp:9] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str()); checkConst("class Fred {\n" " class B {\n" @@ -3360,7 +3360,7 @@ private: " int B::getB() { return b; }\n" "};"); ASSERT_EQUALS("[test.cpp:11] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n" - "[test.cpp:10] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n" , errout.str()); + "[test.cpp:10] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str()); checkConst("class Fred {\n" " class B {\n" @@ -3375,7 +3375,7 @@ private: "int Fred::B::A::getA() { return a; }\n" "int Fred::B::getB() { return b; }"); ASSERT_EQUALS("[test.cpp:12] -> [test.cpp:4]: (style, inconclusive) Technically the member function 'Fred::B::getB' can be const.\n" - "[test.cpp:11] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n" , errout.str()); + "[test.cpp:11] -> [test.cpp:7]: (style, inconclusive) Technically the member function 'Fred::B::A::getA' can be const.\n", errout.str()); } // operator< can often be const diff --git a/test/testio.cpp b/test/testio.cpp index a28fc6c2d..faf57d51e 100644 --- a/test/testio.cpp +++ b/test/testio.cpp @@ -2461,7 +2461,7 @@ private: ASSERT_EQUALS("[test.cpp:2]: (warning) %hd in format string (no. 1) requires 'short' but the argument type is 'unsigned int'.\n" "[test.cpp:3]: (warning) %hhd in format string (no. 1) requires 'char' but the argument type is 'unsigned int'.\n" "[test.cpp:4]: (warning) %ld in format string (no. 1) requires 'long' but the argument type is 'unsigned int'.\n" - "[test.cpp:5]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n" , errout.str()); + "[test.cpp:5]: (warning) %lld in format string (no. 1) requires 'long long' but the argument type is 'unsigned int'.\n", errout.str()); check("void foo(size_t s, ptrdiff_t p) {\n" " printf(\"%zd\", s);\n" diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp index d6d33c0bc..9ad10a071 100644 --- a/test/testmathlib.cpp +++ b/test/testmathlib.cpp @@ -66,85 +66,85 @@ private: } void isGreater() const { - ASSERT_EQUALS(true , MathLib::isGreater("1.0", "0.001")); + ASSERT_EQUALS(true, MathLib::isGreater("1.0", "0.001")); ASSERT_EQUALS(false, MathLib::isGreater("-1.0", "0.001")); } void isGreaterEqual() const { - ASSERT_EQUALS(true , MathLib::isGreaterEqual("1.00", "1.0")); - ASSERT_EQUALS(true , MathLib::isGreaterEqual("1.001", "1.0")); - ASSERT_EQUALS(true , MathLib::isGreaterEqual("1.0", "0.001")); + ASSERT_EQUALS(true, MathLib::isGreaterEqual("1.00", "1.0")); + ASSERT_EQUALS(true, MathLib::isGreaterEqual("1.001", "1.0")); + ASSERT_EQUALS(true, MathLib::isGreaterEqual("1.0", "0.001")); ASSERT_EQUALS(false, MathLib::isGreaterEqual("-1.0", "0.001")); } void isEqual() const { - ASSERT_EQUALS(true , MathLib::isEqual("1.0", "1.0")); - ASSERT_EQUALS(false , MathLib::isEqual("1.", "1.01")); - ASSERT_EQUALS(true , MathLib::isEqual("0.1","1.0E-1")); + ASSERT_EQUALS(true, MathLib::isEqual("1.0", "1.0")); + ASSERT_EQUALS(false, MathLib::isEqual("1.", "1.01")); + ASSERT_EQUALS(true, MathLib::isEqual("0.1","1.0E-1")); } void isNotEqual() const { - ASSERT_EQUALS(false , MathLib::isNotEqual("1.0", "1.0")); - ASSERT_EQUALS(true , MathLib::isNotEqual("1.", "1.01")); + ASSERT_EQUALS(false, MathLib::isNotEqual("1.0", "1.0")); + ASSERT_EQUALS(true, MathLib::isNotEqual("1.", "1.01")); } void isLess() const { - ASSERT_EQUALS(false , MathLib::isLess("1.0", "0.001")); - ASSERT_EQUALS(true , MathLib::isLess("-1.0", "0.001")); + ASSERT_EQUALS(false, MathLib::isLess("1.0", "0.001")); + ASSERT_EQUALS(true, MathLib::isLess("-1.0", "0.001")); } void isLessEqual() const { - ASSERT_EQUALS(true , MathLib::isLessEqual("1.00", "1.0")); - ASSERT_EQUALS(false , MathLib::isLessEqual("1.001", "1.0")); - ASSERT_EQUALS(false , MathLib::isLessEqual("1.0", "0.001")); - ASSERT_EQUALS(true , MathLib::isLessEqual("-1.0", "0.001")); + ASSERT_EQUALS(true, MathLib::isLessEqual("1.00", "1.0")); + ASSERT_EQUALS(false, MathLib::isLessEqual("1.001", "1.0")); + ASSERT_EQUALS(false, MathLib::isLessEqual("1.0", "0.001")); + ASSERT_EQUALS(true, MathLib::isLessEqual("-1.0", "0.001")); } void calculate() const { // addition - ASSERT_EQUALS("256", MathLib::add("0xff", "1")); - ASSERT_EQUALS("249", MathLib::add("250", "-1")); - ASSERT_EQUALS("251", MathLib::add("250", "1")); - ASSERT_EQUALS("-2.0" , MathLib::add("-1.", "-1")); - ASSERT_EQUALS("-1" , MathLib::add("0", "-1")); - ASSERT_EQUALS("1" , MathLib::add("1", "0")); - ASSERT_EQUALS("0.0" , MathLib::add("0", "0.")); - ASSERT_EQUALS("1.00000001" , MathLib::add("1", "0.00000001")); // #4016 - ASSERT_EQUALS("30666.22" , MathLib::add("30666.22", "0.0")); // #4068 + ASSERT_EQUALS("256", MathLib::add("0xff", "1")); + ASSERT_EQUALS("249", MathLib::add("250", "-1")); + ASSERT_EQUALS("251", MathLib::add("250", "1")); + ASSERT_EQUALS("-2.0", MathLib::add("-1.", "-1")); + ASSERT_EQUALS("-1", MathLib::add("0", "-1")); + ASSERT_EQUALS("1", MathLib::add("1", "0")); + ASSERT_EQUALS("0.0", MathLib::add("0", "0.")); + ASSERT_EQUALS("1.00000001", MathLib::add("1", "0.00000001")); // #4016 + ASSERT_EQUALS("30666.22", MathLib::add("30666.22", "0.0")); // #4068 // subtraction ASSERT_EQUALS("254", MathLib::subtract("0xff", "1")); ASSERT_EQUALS("251", MathLib::subtract("250", "-1")); ASSERT_EQUALS("249", MathLib::subtract("250", "1")); - ASSERT_EQUALS("0.0" , MathLib::subtract("-1.", "-1")); - ASSERT_EQUALS("1" , MathLib::subtract("0", "-1")); - ASSERT_EQUALS("1" , MathLib::subtract("1", "0")); - ASSERT_EQUALS("0.0" , MathLib::subtract("0", "0.")); - ASSERT_EQUALS("0.99999999" , MathLib::subtract("1", "0.00000001")); // #4016 - ASSERT_EQUALS("30666.22" , MathLib::subtract("30666.22", "0.0")); // #4068 - ASSERT_EQUALS("0.0" , MathLib::subtract("0.0", "0.0")); + ASSERT_EQUALS("0.0", MathLib::subtract("-1.", "-1")); + ASSERT_EQUALS("1", MathLib::subtract("0", "-1")); + ASSERT_EQUALS("1", MathLib::subtract("1", "0")); + ASSERT_EQUALS("0.0", MathLib::subtract("0", "0.")); + ASSERT_EQUALS("0.99999999", MathLib::subtract("1", "0.00000001")); // #4016 + ASSERT_EQUALS("30666.22", MathLib::subtract("30666.22", "0.0")); // #4068 + ASSERT_EQUALS("0.0", MathLib::subtract("0.0", "0.0")); // multiply - ASSERT_EQUALS("-0.003" , MathLib::multiply("-1e-3", "3")); - ASSERT_EQUALS("-11.96" , MathLib::multiply("-2.3", "5.2")); - ASSERT_EQUALS("3000.0" , MathLib::multiply("1E3", "3")); - ASSERT_EQUALS("3000.0" , MathLib::multiply("1E+3", "3")); - ASSERT_EQUALS("3000.0" , MathLib::multiply("1.0E3", "3")); - ASSERT_EQUALS("-3000.0" , MathLib::multiply("-1.0E3", "3")); - ASSERT_EQUALS("-3000.0" , MathLib::multiply("-1.0E+3", "3")); - ASSERT_EQUALS("0.0" , MathLib::multiply("+1.0E+3", "0")); - ASSERT_EQUALS("2147483648" , MathLib::multiply("2","1073741824")); - ASSERT_EQUALS("536870912" , MathLib::multiply("512","1048576")); + ASSERT_EQUALS("-0.003", MathLib::multiply("-1e-3", "3")); + ASSERT_EQUALS("-11.96", MathLib::multiply("-2.3", "5.2")); + ASSERT_EQUALS("3000.0", MathLib::multiply("1E3", "3")); + ASSERT_EQUALS("3000.0", MathLib::multiply("1E+3", "3")); + ASSERT_EQUALS("3000.0", MathLib::multiply("1.0E3", "3")); + ASSERT_EQUALS("-3000.0", MathLib::multiply("-1.0E3", "3")); + ASSERT_EQUALS("-3000.0", MathLib::multiply("-1.0E+3", "3")); + ASSERT_EQUALS("0.0", MathLib::multiply("+1.0E+3", "0")); + ASSERT_EQUALS("2147483648", MathLib::multiply("2","1073741824")); + ASSERT_EQUALS("536870912", MathLib::multiply("512","1048576")); // divide - ASSERT_EQUALS("1" , MathLib::divide("1", "1")); - ASSERT_EQUALS("0" , MathLib::divide("0", "1")); - ASSERT_EQUALS("5" , MathLib::divide("-10", "-2")); + ASSERT_EQUALS("1", MathLib::divide("1", "1")); + ASSERT_EQUALS("0", MathLib::divide("0", "1")); + ASSERT_EQUALS("5", MathLib::divide("-10", "-2")); ASSERT_EQUALS("-2.5", MathLib::divide("-10.", "4")); - ASSERT_EQUALS("2.5" , MathLib::divide("-10.", "-4")); - ASSERT_EQUALS("5.0" , MathLib::divide("25.5", "5.1")); - ASSERT_EQUALS("7.0" , MathLib::divide("21.", "3")); - ASSERT_EQUALS("1" , MathLib::divide("3", "2")); + ASSERT_EQUALS("2.5", MathLib::divide("-10.", "-4")); + ASSERT_EQUALS("5.0", MathLib::divide("25.5", "5.1")); + ASSERT_EQUALS("7.0", MathLib::divide("21.", "3")); + ASSERT_EQUALS("1", MathLib::divide("3", "2")); ASSERT_THROW(MathLib::divide("123", "0"), InternalError); // throw ASSERT_THROW(MathLib::divide("-9223372036854775808", "-1"), InternalError); // #4520 - out of range => throw ASSERT_EQUALS("4611686018427387904", MathLib::divide("-9223372036854775808", "-2")); // #6679 @@ -155,23 +155,23 @@ private: } void calculate1() const { - ASSERT_EQUALS("0" , MathLib::calculate("2" , "1" , '%')); - ASSERT_EQUALS("2" , MathLib::calculate("12" , "5" , '%')); - ASSERT_EQUALS("1" , MathLib::calculate("100" , "3" , '%')); + ASSERT_EQUALS("0", MathLib::calculate("2", "1", '%')); + ASSERT_EQUALS("2", MathLib::calculate("12", "5", '%')); + ASSERT_EQUALS("1", MathLib::calculate("100", "3", '%')); #ifndef TEST_MATHLIB_VALUE // floating point modulo is not defined in C/C++ - ASSERT_EQUALS("0.0" , MathLib::calculate("2.0" , "1.0" , '%')); - ASSERT_EQUALS("12.0" , MathLib::calculate("12.0" , "13.0" , '%')); - ASSERT_EQUALS("1.3" , MathLib::calculate("5.3" , "2.0" , '%')); - ASSERT_EQUALS("1.7" , MathLib::calculate("18.5" , "4.2" , '%')); + ASSERT_EQUALS("0.0", MathLib::calculate("2.0", "1.0", '%')); + ASSERT_EQUALS("12.0", MathLib::calculate("12.0", "13.0", '%')); + ASSERT_EQUALS("1.3", MathLib::calculate("5.3", "2.0", '%')); + ASSERT_EQUALS("1.7", MathLib::calculate("18.5", "4.2", '%')); MathLib::calculate("123", "0.0", '%'); // don't throw #endif ASSERT_THROW(MathLib::calculate("123", "0", '%'), InternalError); // throw - ASSERT_EQUALS("0" , MathLib::calculate("1" , "1" , '^')); - ASSERT_EQUALS("3" , MathLib::calculate("2" , "1" , '^')); + ASSERT_EQUALS("0", MathLib::calculate("1", "1", '^')); + ASSERT_EQUALS("3", MathLib::calculate("2", "1", '^')); } void typesuffix() const { @@ -236,45 +236,45 @@ private: void toLongNumber() const { // from hex - ASSERT_EQUALS(0 , MathLib::toLongNumber("0x0")); - ASSERT_EQUALS(0 , MathLib::toLongNumber("-0x0")); - ASSERT_EQUALS(0 , MathLib::toLongNumber("+0x0")); - ASSERT_EQUALS(10 , MathLib::toLongNumber("0xa")); - ASSERT_EQUALS(10995 , MathLib::toLongNumber("0x2AF3")); - ASSERT_EQUALS(-10 , MathLib::toLongNumber("-0xa")); + ASSERT_EQUALS(0, MathLib::toLongNumber("0x0")); + ASSERT_EQUALS(0, MathLib::toLongNumber("-0x0")); + ASSERT_EQUALS(0, MathLib::toLongNumber("+0x0")); + ASSERT_EQUALS(10, MathLib::toLongNumber("0xa")); + ASSERT_EQUALS(10995, MathLib::toLongNumber("0x2AF3")); + ASSERT_EQUALS(-10, MathLib::toLongNumber("-0xa")); ASSERT_EQUALS(-10995, MathLib::toLongNumber("-0x2AF3")); - ASSERT_EQUALS(10 , MathLib::toLongNumber("+0xa")); - ASSERT_EQUALS(10995 , MathLib::toLongNumber("+0x2AF3")); + ASSERT_EQUALS(10, MathLib::toLongNumber("+0xa")); + ASSERT_EQUALS(10995, MathLib::toLongNumber("+0x2AF3")); // from octal - ASSERT_EQUALS(8 , MathLib::toLongNumber("010")); - ASSERT_EQUALS(8 , MathLib::toLongNumber("+010")); - ASSERT_EQUALS(-8 , MathLib::toLongNumber("-010")); - ASSERT_EQUALS(125 , MathLib::toLongNumber("0175")); - ASSERT_EQUALS(125 , MathLib::toLongNumber("+0175")); - ASSERT_EQUALS(-125 , MathLib::toLongNumber("-0175")); + ASSERT_EQUALS(8, MathLib::toLongNumber("010")); + ASSERT_EQUALS(8, MathLib::toLongNumber("+010")); + ASSERT_EQUALS(-8, MathLib::toLongNumber("-010")); + ASSERT_EQUALS(125, MathLib::toLongNumber("0175")); + ASSERT_EQUALS(125, MathLib::toLongNumber("+0175")); + ASSERT_EQUALS(-125, MathLib::toLongNumber("-0175")); // from binary - ASSERT_EQUALS(0 , MathLib::toLongNumber("0b0")); - ASSERT_EQUALS(1 , MathLib::toLongNumber("0b1")); - ASSERT_EQUALS(1 , MathLib::toLongNumber("+0b1")); - ASSERT_EQUALS(-1 , MathLib::toLongNumber("-0b1")); - ASSERT_EQUALS(215 , MathLib::toLongNumber("0b11010111")); - ASSERT_EQUALS(-215 , MathLib::toLongNumber("-0b11010111")); - ASSERT_EQUALS(215 , MathLib::toLongNumber("0B11010111")); + ASSERT_EQUALS(0, MathLib::toLongNumber("0b0")); + ASSERT_EQUALS(1, MathLib::toLongNumber("0b1")); + ASSERT_EQUALS(1, MathLib::toLongNumber("+0b1")); + ASSERT_EQUALS(-1, MathLib::toLongNumber("-0b1")); + ASSERT_EQUALS(215, MathLib::toLongNumber("0b11010111")); + ASSERT_EQUALS(-215, MathLib::toLongNumber("-0b11010111")); + ASSERT_EQUALS(215, MathLib::toLongNumber("0B11010111")); // from base 10 - ASSERT_EQUALS(10 , MathLib::toLongNumber("10")); - ASSERT_EQUALS(10 , MathLib::toLongNumber("10.")); - ASSERT_EQUALS(10 , MathLib::toLongNumber("10.0")); - ASSERT_EQUALS(100 , MathLib::toLongNumber("10E+1")); - ASSERT_EQUALS(1 , MathLib::toLongNumber("10E-1")); - ASSERT_EQUALS(100 , MathLib::toLongNumber("+10E+1")); - ASSERT_EQUALS(-1 , MathLib::toLongNumber("-10E-1")); - ASSERT_EQUALS(100 , MathLib::toLongNumber("+10.E+1")); - ASSERT_EQUALS(-1 , MathLib::toLongNumber("-10.E-1")); - ASSERT_EQUALS(100 , MathLib::toLongNumber("+10.0E+1")); - ASSERT_EQUALS(-1 , MathLib::toLongNumber("-10.0E-1")); + ASSERT_EQUALS(10, MathLib::toLongNumber("10")); + ASSERT_EQUALS(10, MathLib::toLongNumber("10.")); + ASSERT_EQUALS(10, MathLib::toLongNumber("10.0")); + ASSERT_EQUALS(100, MathLib::toLongNumber("10E+1")); + ASSERT_EQUALS(1, MathLib::toLongNumber("10E-1")); + ASSERT_EQUALS(100, MathLib::toLongNumber("+10E+1")); + ASSERT_EQUALS(-1, MathLib::toLongNumber("-10E-1")); + ASSERT_EQUALS(100, MathLib::toLongNumber("+10.E+1")); + ASSERT_EQUALS(-1, MathLib::toLongNumber("-10.E-1")); + ASSERT_EQUALS(100, MathLib::toLongNumber("+10.0E+1")); + ASSERT_EQUALS(-1, MathLib::toLongNumber("-10.0E-1")); // from char ASSERT_EQUALS((int)('A'), MathLib::toLongNumber("'A'")); @@ -320,15 +320,15 @@ private: ASSERT_EQUALS(9965707617509186058ULL, MathLib::toULongNumber("0x8a4d4e470d0a1a0a")); // zero input - ASSERT_EQUALS(0 , MathLib::toULongNumber("0")); - ASSERT_EQUALS(0 , MathLib::toULongNumber("-0")); - ASSERT_EQUALS(0 , MathLib::toULongNumber("+0")); - ASSERT_EQUALS(0U , MathLib::toULongNumber("0U")); - ASSERT_EQUALS(0 , MathLib::toULongNumber("-0x0")); + ASSERT_EQUALS(0, MathLib::toULongNumber("0")); + ASSERT_EQUALS(0, MathLib::toULongNumber("-0")); + ASSERT_EQUALS(0, MathLib::toULongNumber("+0")); + ASSERT_EQUALS(0U, MathLib::toULongNumber("0U")); + ASSERT_EQUALS(0, MathLib::toULongNumber("-0x0")); - ASSERT_EQUALS(1U , MathLib::toULongNumber("1U")); - ASSERT_EQUALS(10000U , MathLib::toULongNumber("1e4")); - ASSERT_EQUALS(10000U , MathLib::toULongNumber("1e4")); + ASSERT_EQUALS(1U, MathLib::toULongNumber("1U")); + ASSERT_EQUALS(10000U, MathLib::toULongNumber("1e4")); + ASSERT_EQUALS(10000U, MathLib::toULongNumber("1e4")); ASSERT_EQUALS(0xFF00000000000000UL, MathLib::toULongNumber("0xFF00000000000000UL")); ASSERT_EQUALS(0x0A00000000000000UL, MathLib::toULongNumber("0x0A00000000000000UL")); ASSERT_EQUALS(9U, MathLib::toULongNumber("011")); @@ -345,53 +345,53 @@ private: } void toDoubleNumber() const { - ASSERT_EQUALS_DOUBLE(10.0 , MathLib::toDoubleNumber("10"), 0.001); + ASSERT_EQUALS_DOUBLE(10.0, MathLib::toDoubleNumber("10"), 0.001); ASSERT_EQUALS_DOUBLE(1000.0, MathLib::toDoubleNumber("10E+2"), 0.001); - ASSERT_EQUALS_DOUBLE(100.0 , MathLib::toDoubleNumber("1.0E+2"), 0.001); + ASSERT_EQUALS_DOUBLE(100.0, MathLib::toDoubleNumber("1.0E+2"), 0.001); ASSERT_EQUALS_DOUBLE(-100.0, MathLib::toDoubleNumber("-1.0E+2"), 0.001); ASSERT_EQUALS_DOUBLE(-1e+10, MathLib::toDoubleNumber("-1.0E+10"), 1); - ASSERT_EQUALS_DOUBLE(100.0 , MathLib::toDoubleNumber("+1.0E+2"), 0.001); - ASSERT_EQUALS_DOUBLE(1e+10 , MathLib::toDoubleNumber("+1.0E+10"), 1); - ASSERT_EQUALS_DOUBLE(100.0 , MathLib::toDoubleNumber("1.0E+2"), 0.001); - ASSERT_EQUALS_DOUBLE(1e+10 , MathLib::toDoubleNumber("1.0E+10"), 1); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0E+0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0E-0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0E+00"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0E-00"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("-0E+00"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("+0E-00"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0."), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("0.0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("-0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("+0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("-0."), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("+0."), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("-0.0"), 0.000001); - ASSERT_EQUALS_DOUBLE(0.0 , MathLib::toDoubleNumber("+0.0"), 0.000001); - ASSERT_EQUALS_DOUBLE('0' , MathLib::toDoubleNumber("'0'"), 0.000001); + ASSERT_EQUALS_DOUBLE(100.0, MathLib::toDoubleNumber("+1.0E+2"), 0.001); + ASSERT_EQUALS_DOUBLE(1e+10, MathLib::toDoubleNumber("+1.0E+10"), 1); + ASSERT_EQUALS_DOUBLE(100.0, MathLib::toDoubleNumber("1.0E+2"), 0.001); + ASSERT_EQUALS_DOUBLE(1e+10, MathLib::toDoubleNumber("1.0E+10"), 1); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0E+0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0E-0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0E+00"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0E-00"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("-0E+00"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("+0E-00"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0."), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("0.0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("-0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("+0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("-0."), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("+0."), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("-0.0"), 0.000001); + ASSERT_EQUALS_DOUBLE(0.0, MathLib::toDoubleNumber("+0.0"), 0.000001); + ASSERT_EQUALS_DOUBLE('0', MathLib::toDoubleNumber("'0'"), 0.000001); // verify: string --> double --> string conversion - ASSERT_EQUALS("1.0" , MathLib::toString(MathLib::toDoubleNumber("1.0f"))); - ASSERT_EQUALS("1.0" , MathLib::toString(MathLib::toDoubleNumber("1.0"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("0.0f"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("0.0"))); - ASSERT_EQUALS("-1.0" , MathLib::toString(MathLib::toDoubleNumber("-1.0f"))); - ASSERT_EQUALS("-1.0" , MathLib::toString(MathLib::toDoubleNumber("-1.0"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("-0.0f"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("-0.0"))); - ASSERT_EQUALS("1.0" , MathLib::toString(MathLib::toDoubleNumber("+1.0f"))); - ASSERT_EQUALS("1.0" , MathLib::toString(MathLib::toDoubleNumber("+1.0"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("+0.0f"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("+0.0"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("-0"))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("-0."))); - ASSERT_EQUALS("0.0" , MathLib::toString(MathLib::toDoubleNumber("-0.0"))); + ASSERT_EQUALS("1.0", MathLib::toString(MathLib::toDoubleNumber("1.0f"))); + ASSERT_EQUALS("1.0", MathLib::toString(MathLib::toDoubleNumber("1.0"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("0.0f"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("0.0"))); + ASSERT_EQUALS("-1.0", MathLib::toString(MathLib::toDoubleNumber("-1.0f"))); + ASSERT_EQUALS("-1.0", MathLib::toString(MathLib::toDoubleNumber("-1.0"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("-0.0f"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("-0.0"))); + ASSERT_EQUALS("1.0", MathLib::toString(MathLib::toDoubleNumber("+1.0f"))); + ASSERT_EQUALS("1.0", MathLib::toString(MathLib::toDoubleNumber("+1.0"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("+0.0f"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("+0.0"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("-0"))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("-0."))); + ASSERT_EQUALS("0.0", MathLib::toString(MathLib::toDoubleNumber("-0.0"))); } void isint() const { // zero tests - ASSERT_EQUALS(true , MathLib::isInt("0")); + ASSERT_EQUALS(true, MathLib::isInt("0")); ASSERT_EQUALS(false, MathLib::isInt("0.")); ASSERT_EQUALS(false, MathLib::isInt("0.0")); ASSERT_EQUALS(false, MathLib::isInt("-0.")); @@ -403,30 +403,30 @@ private: ASSERT_EQUALS(false, MathLib::isInt("-0.0E+1")); ASSERT_EQUALS(false, MathLib::isInt("-0.0E-1")); - ASSERT_EQUALS(true , MathLib::isInt("1")); - ASSERT_EQUALS(true , MathLib::isInt("-1")); - ASSERT_EQUALS(true , MathLib::isInt("+1")); - ASSERT_EQUALS(false , MathLib::isInt("+1E+1")); - ASSERT_EQUALS(false , MathLib::isInt("+1E+10000")); - ASSERT_EQUALS(false , MathLib::isInt("-1E+1")); - ASSERT_EQUALS(false , MathLib::isInt("-1E+10000")); + ASSERT_EQUALS(true, MathLib::isInt("1")); + ASSERT_EQUALS(true, MathLib::isInt("-1")); + ASSERT_EQUALS(true, MathLib::isInt("+1")); + ASSERT_EQUALS(false, MathLib::isInt("+1E+1")); + ASSERT_EQUALS(false, MathLib::isInt("+1E+10000")); + ASSERT_EQUALS(false, MathLib::isInt("-1E+1")); + ASSERT_EQUALS(false, MathLib::isInt("-1E+10000")); ASSERT_EQUALS(false, MathLib::isInt("-1E-1")); ASSERT_EQUALS(false, MathLib::isInt("-1E-10000")); - 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")); - ASSERT_EQUALS(true , MathLib::isInt("0ull")); - ASSERT_EQUALS(true , MathLib::isInt("0llu")); - ASSERT_EQUALS(true , MathLib::isInt("333L")); - ASSERT_EQUALS(true , MathLib::isInt("330L")); - ASSERT_EQUALS(true , MathLib::isInt("330llu")); - ASSERT_EQUALS(true , MathLib::isInt("07")); - ASSERT_EQUALS(true , MathLib::isInt("0123")); + 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")); + ASSERT_EQUALS(true, MathLib::isInt("0ull")); + ASSERT_EQUALS(true, MathLib::isInt("0llu")); + ASSERT_EQUALS(true, MathLib::isInt("333L")); + ASSERT_EQUALS(true, MathLib::isInt("330L")); + 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("2352.3f")); ASSERT_EQUALS(false, MathLib::isInt("0.00004")); @@ -519,11 +519,11 @@ private: } void isnegative() const { - ASSERT_EQUALS(true , MathLib::isNegative("-1")); - ASSERT_EQUALS(true , MathLib::isNegative("-1.")); - ASSERT_EQUALS(true , MathLib::isNegative("-1.0")); - ASSERT_EQUALS(true , MathLib::isNegative("-1.0E+2")); - ASSERT_EQUALS(true , MathLib::isNegative("-1.0E-2")); + ASSERT_EQUALS(true, MathLib::isNegative("-1")); + ASSERT_EQUALS(true, MathLib::isNegative("-1.")); + ASSERT_EQUALS(true, MathLib::isNegative("-1.0")); + ASSERT_EQUALS(true, MathLib::isNegative("-1.0E+2")); + ASSERT_EQUALS(true, MathLib::isNegative("-1.0E-2")); ASSERT_EQUALS(false, MathLib::isNegative("+1")); ASSERT_EQUALS(false, MathLib::isNegative("+1.")); @@ -760,11 +760,11 @@ private: ASSERT_EQUALS(false, MathLib::isPositive("-1.0E+2")); ASSERT_EQUALS(false, MathLib::isPositive("-1.0E-2")); - ASSERT_EQUALS(true , MathLib::isPositive("+1")); - ASSERT_EQUALS(true , MathLib::isPositive("+1.")); - ASSERT_EQUALS(true , MathLib::isPositive("+1.0")); - ASSERT_EQUALS(true , MathLib::isPositive("+1.0E+2")); - ASSERT_EQUALS(true , MathLib::isPositive("+1.0E-2")); + ASSERT_EQUALS(true, MathLib::isPositive("+1")); + ASSERT_EQUALS(true, MathLib::isPositive("+1.")); + ASSERT_EQUALS(true, MathLib::isPositive("+1.0")); + ASSERT_EQUALS(true, MathLib::isPositive("+1.0E+2")); + ASSERT_EQUALS(true, MathLib::isPositive("+1.0E-2")); // test empty string ASSERT_EQUALS(false, MathLib::isPositive("")); // "" is neither positive nor negative @@ -772,9 +772,9 @@ private: void isFloat() const { ASSERT_EQUALS(false, MathLib::isFloat("")); - ASSERT_EQUALS(true , MathLib::isFloat("0.f")); - ASSERT_EQUALS(true , MathLib::isFloat("0.f")); - ASSERT_EQUALS(true , MathLib::isFloat("0xA.Fp-10")); + ASSERT_EQUALS(true, MathLib::isFloat("0.f")); + ASSERT_EQUALS(true, MathLib::isFloat("0.f")); + ASSERT_EQUALS(true, MathLib::isFloat("0xA.Fp-10")); } void isDecimalFloat() const { @@ -800,87 +800,87 @@ private: ASSERT_EQUALS(false, MathLib::isDecimalFloat(" 0 ")); ASSERT_EQUALS(false, MathLib::isDecimalFloat(" 0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.L")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("0. ")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat(" 0. ")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat(" 0.")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.L")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("0. ")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat(" 0. ")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat(" 0.")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("0..")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("..0..")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("..0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.0f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.0F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.0l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.0L")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0.")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0.")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0.0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0.0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0E0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0E0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0E0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0E+0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0E-0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0E+0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0E-0")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0.0E+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+0.0E-1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0.0E+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-0.0E-1")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("0..")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("..0..")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("..0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.0f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.0F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.0l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.0L")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0.")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0.")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0.0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0.0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0E0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0E0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0E0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0E+0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0E-0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0E+0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0E-0")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0.0E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+0.0E-1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0.0E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-0.0E-1")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("1")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("-1")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1e+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+100")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+100f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+100F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+100l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+100L")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+007")); // to be sure about #5485 - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+001f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+001F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+001l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+001L")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1E+10000")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-1E+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-1E+10000")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat(".1250E+04")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-1E-1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-1E-10000")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1.23e+01")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("+1.23E+01")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1e+x")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+X")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+001lX")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+001LX")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+001f2")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+001F2")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1e+003x")); - ASSERT_EQUALS(false , MathLib::isDecimalFloat("+1E+003X")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("1")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("-1")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1e+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+100")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+100f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+100F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+100l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+100L")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+007")); // to be sure about #5485 + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+001f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+001F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+001l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+001L")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1E+10000")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-1E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-1E+10000")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat(".1250E+04")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-1E-1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-1E-10000")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1.23e+01")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("+1.23E+01")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1e+x")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+X")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+001lX")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+001LX")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+001f2")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+001F2")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1e+003x")); + ASSERT_EQUALS(false, MathLib::isDecimalFloat("+1E+003X")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.4")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.3f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.3F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.3l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.3L")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("0.00004")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.00001f")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.00001F")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.00001l")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("2352.00001L")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat(".4")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat(".3e2")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("1.0E+1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("1.0E-1")); - ASSERT_EQUALS(true , MathLib::isDecimalFloat("-1.0E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.4")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.3f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.3F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.3l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.3L")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("0.00004")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.00001f")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.00001F")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.00001l")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("2352.00001L")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat(".4")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat(".3e2")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("1.0E+1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("1.0E-1")); + ASSERT_EQUALS(true, MathLib::isDecimalFloat("-1.0E+1")); } void naninf() const { @@ -1107,48 +1107,48 @@ private: } void sin() const { - ASSERT_EQUALS("0.0" , MathLib::sin("0")); + ASSERT_EQUALS("0.0", MathLib::sin("0")); } void cos() const { - ASSERT_EQUALS("1.0" , MathLib::cos("0")); + ASSERT_EQUALS("1.0", MathLib::cos("0")); } void tan() const { - ASSERT_EQUALS("0.0" , MathLib::tan("0")); + ASSERT_EQUALS("0.0", MathLib::tan("0")); } void abs() const { - ASSERT_EQUALS("0.0" , MathLib::abs("0")); - ASSERT_EQUALS("0.0" , MathLib::abs("+0")); - ASSERT_EQUALS("0.0" , MathLib::abs("-0")); - ASSERT_EQUALS("1.0" , MathLib::abs("+1")); - ASSERT_EQUALS("1.0" , MathLib::abs("+1.0")); - ASSERT_EQUALS("1.0" , MathLib::abs("-1")); - ASSERT_EQUALS("1.0" , MathLib::abs("-1.0")); + ASSERT_EQUALS("0.0", MathLib::abs("0")); + ASSERT_EQUALS("0.0", MathLib::abs("+0")); + ASSERT_EQUALS("0.0", MathLib::abs("-0")); + ASSERT_EQUALS("1.0", MathLib::abs("+1")); + ASSERT_EQUALS("1.0", MathLib::abs("+1.0")); + ASSERT_EQUALS("1.0", MathLib::abs("-1")); + ASSERT_EQUALS("1.0", MathLib::abs("-1.0")); } void toString() const { - ASSERT_EQUALS("0.0" , MathLib::toString(0.0)); - ASSERT_EQUALS("0.0" , MathLib::toString(+0.0)); - ASSERT_EQUALS("0.0" , MathLib::toString(-0.0)); + ASSERT_EQUALS("0.0", MathLib::toString(0.0)); + ASSERT_EQUALS("0.0", MathLib::toString(+0.0)); + ASSERT_EQUALS("0.0", MathLib::toString(-0.0)); // float (trailing f or F) - ASSERT_EQUALS("0" , MathLib::toString(+0.0f)); - ASSERT_EQUALS("-0" , MathLib::toString(-0.0F)); + ASSERT_EQUALS("0", MathLib::toString(+0.0f)); + ASSERT_EQUALS("-0", MathLib::toString(-0.0F)); // double (tailing l or L) - ASSERT_EQUALS("0" , MathLib::toString(+0.0l)); - ASSERT_EQUALS("-0" , MathLib::toString(-0.0L)); + ASSERT_EQUALS("0", MathLib::toString(+0.0l)); + ASSERT_EQUALS("-0", MathLib::toString(-0.0L)); } void characterLiteralsNormalization() const { // `A` is 0x41 and 0101 - ASSERT_EQUALS("A" , MathLib::normalizeCharacterLiteral("\\x41")); - ASSERT_EQUALS("A" , MathLib::normalizeCharacterLiteral("\\101")); + ASSERT_EQUALS("A", MathLib::normalizeCharacterLiteral("\\x41")); + ASSERT_EQUALS("A", MathLib::normalizeCharacterLiteral("\\101")); // Hexa and octal numbers should not only be intepreted in byte 1 - ASSERT_EQUALS("TESTATEST" , MathLib::normalizeCharacterLiteral("TEST\\x41TEST")); - ASSERT_EQUALS("TESTATEST" , MathLib::normalizeCharacterLiteral("TEST\\101TEST")); - ASSERT_EQUALS("TESTTESTA" , MathLib::normalizeCharacterLiteral("TESTTEST\\x41")); - ASSERT_EQUALS("TESTTESTA" , MathLib::normalizeCharacterLiteral("TESTTEST\\101")); + ASSERT_EQUALS("TESTATEST", MathLib::normalizeCharacterLiteral("TEST\\x41TEST")); + ASSERT_EQUALS("TESTATEST", MathLib::normalizeCharacterLiteral("TEST\\101TEST")); + ASSERT_EQUALS("TESTTESTA", MathLib::normalizeCharacterLiteral("TESTTEST\\x41")); + ASSERT_EQUALS("TESTTESTA", MathLib::normalizeCharacterLiteral("TESTTEST\\101")); // Single escape sequences - ASSERT_EQUALS("\?" , MathLib::normalizeCharacterLiteral("\\?")); - ASSERT_EQUALS("\'" , MathLib::normalizeCharacterLiteral("\\'")); + ASSERT_EQUALS("\?", MathLib::normalizeCharacterLiteral("\\?")); + ASSERT_EQUALS("\'", MathLib::normalizeCharacterLiteral("\\'")); // Incomplete hexa and octal sequences ASSERT_THROW(MathLib::normalizeCharacterLiteral("\\"), InternalError); ASSERT_THROW(MathLib::normalizeCharacterLiteral("\\x"), InternalError); diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp index b5b5659b0..77d76b157 100644 --- a/test/testmemleak.cpp +++ b/test/testmemleak.cpp @@ -657,7 +657,7 @@ private: , "realloc", "return", "rewind", "rewinddir", "scandir", "seekdir" , "setbuf", "setbuffer", "setlinebuf", "setvbuf", "snprintf", "sprintf", "stpcpy", "strcasecmp" , "strcat", "strchr", "strcmp", "strcpy", "stricmp", "strlen", "strncat", "strncmp" - , "strncpy", "strrchr", "strspn" ,"strstr", "strtod", "strtol", "strtoul", "switch" + , "strncpy", "strrchr", "strspn","strstr", "strtod", "strtol", "strtoul", "switch" , "sync_file_range", "telldir", "typeid", "while", "write", "writev", "lstat", "stat" , "_open", "_wopen", "vscanf", "vsscanf", "vfscanf", "vasprintf", "utime", "utimes", "unlink" , "tempnam", "system", "symlink", "strpbrk", "strncasecmp", "strdup", "strcspn", "strcoll" diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp index 3466dcc81..1bc3fc2ec 100755 --- a/test/testtokenize.cpp +++ b/test/testtokenize.cpp @@ -889,7 +889,7 @@ private: void foreach () { // #3690,#5154 const char code[] ="void f() { for each ( char c in MyString ) { Console::Write(c); } }"; - ASSERT_EQUALS("void f ( ) { asm ( \"char c in MyString\" ) { Console :: Write ( c ) ; } }" ,tokenizeAndStringify(code)); + ASSERT_EQUALS("void f ( ) { asm ( \"char c in MyString\" ) { Console :: Write ( c ) ; } }", tokenizeAndStringify(code)); } void combineOperators() {