From 3c14e4b52a07c814aa57303126039368e3e7b6fc Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 17 Sep 2012 14:18:19 +0300 Subject: [PATCH] test: tabs to spaces, remove trailing spaces and extra empty lines at the end of files --- test/options.cpp | 1 - test/test.cxx | 2 -- test/test64bit.cpp | 1 - test/testassignif.cpp | 1 - test/testautovariables.cpp | 2 -- test/testbufferoverrun.cpp | 30 ++++++++++++------------- test/testcharvar.cpp | 1 - test/testfilelister.cpp | 1 - test/testincompletestatement.cpp | 2 -- test/testleakautovar.cpp | 1 - test/testmathlib.cpp | 38 +++++++++++++++----------------- test/testobsoletefunctions.cpp | 2 -- test/testother.cpp | 32 +++++++++++++-------------- test/testpostfixoperator.cpp | 2 -- test/testrunner.cpp | 1 - test/testsuite.h | 1 - test/testsymboldatabase.cpp | 1 - test/testtokenize.cpp | 14 ++++++------ test/testuninitvar.cpp | 1 - test/testunusedfunctions.cpp | 1 - test/testunusedprivfunc.cpp | 1 - 21 files changed, 56 insertions(+), 80 deletions(-) diff --git a/test/options.cpp b/test/options.cpp index fc45f1761..c8481fc12 100644 --- a/test/options.cpp +++ b/test/options.cpp @@ -43,4 +43,3 @@ const std::string& options::which_test() const { return _which_test; } - diff --git a/test/test.cxx b/test/test.cxx index 0d3ca979b..36b1454db 100644 --- a/test/test.cxx +++ b/test/test.cxx @@ -32,5 +32,3 @@ int main() f(a); possible_style(); } - - diff --git a/test/test64bit.cpp b/test/test64bit.cpp index 21b1f502e..c1b1753a9 100644 --- a/test/test64bit.cpp +++ b/test/test64bit.cpp @@ -169,4 +169,3 @@ private: }; REGISTER_TEST(Test64BitPortability) - diff --git a/test/testassignif.cpp b/test/testassignif.cpp index 5d485081b..58b6247d5 100644 --- a/test/testassignif.cpp +++ b/test/testassignif.cpp @@ -138,4 +138,3 @@ private: }; REGISTER_TEST(TestAssignIf) - diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp index d3196cae8..d1c2d2a55 100644 --- a/test/testautovariables.cpp +++ b/test/testautovariables.cpp @@ -667,5 +667,3 @@ private: }; REGISTER_TEST(TestAutoVariables) - - diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp index 7f327d918..ec143082e 100644 --- a/test/testbufferoverrun.cpp +++ b/test/testbufferoverrun.cpp @@ -117,18 +117,18 @@ private: TEST_CASE(array_index_for_in_for); // FP: #2634 TEST_CASE(array_index_calculation); TEST_CASE(array_index_negative1); - TEST_CASE(array_index_negative2); // ticket #3063 + TEST_CASE(array_index_negative2); // ticket #3063 TEST_CASE(array_index_for_decr); - TEST_CASE(array_index_varnames); // FP: struct member. #1576 - TEST_CASE(array_index_for_break); // FP: for,break + TEST_CASE(array_index_varnames); // FP: struct member. #1576 + TEST_CASE(array_index_for_break); // FP: for,break TEST_CASE(array_index_for_continue); // for,continue - TEST_CASE(array_index_for); // FN: for,if - TEST_CASE(array_index_for_neq); // #2211: Using != in condition - TEST_CASE(array_index_for_question); // #2561: for, ?: + TEST_CASE(array_index_for); // FN: for,if + TEST_CASE(array_index_for_neq); // #2211: Using != in condition + TEST_CASE(array_index_for_question); // #2561: for, ?: TEST_CASE(array_index_for_andand_oror); // FN: using && or || in the for loop condition - TEST_CASE(array_index_vla_for); // #3221: access VLA inside for - TEST_CASE(array_index_extern); // FP when using 'extern'. #1684 - TEST_CASE(array_index_cast); // FP after cast. #2841 + TEST_CASE(array_index_vla_for); // #3221: access VLA inside for + TEST_CASE(array_index_extern); // FP when using 'extern'. #1684 + TEST_CASE(array_index_cast); // FP after cast. #2841 TEST_CASE(array_index_string_literal); TEST_CASE(buffer_overrun_1); @@ -1401,9 +1401,9 @@ private: check("int f( ) \n" "{\n" - " struct {\n" - " int arr[ 3 ];\n" - " } var[ 1 ];\n" + " struct {\n" + " int arr[ 3 ];\n" + " } var[ 1 ];\n" " int y;\n" " var[ 0 ].arr[ 0 ] = 0;\n" " var[ 0 ].arr[ 1 ] = 1;\n" @@ -1415,9 +1415,9 @@ private: check("int f( ) \n" "{\n" - " struct {\n" - " int arr[ 3 ];\n" - " } var[ 1 ];\n" + " struct {\n" + " int arr[ 3 ];\n" + " } var[ 1 ];\n" " int y;\n" " var[ 0 ].arr[ 0 ] = 0;\n" " var[ 0 ].arr[ 1 ] = 1;\n" diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp index f17824242..68d8ff9b4 100644 --- a/test/testcharvar.cpp +++ b/test/testcharvar.cpp @@ -224,4 +224,3 @@ private: }; REGISTER_TEST(TestCharVar) - diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp index 98acc0c6e..ac15eb31e 100644 --- a/test/testfilelister.cpp +++ b/test/testfilelister.cpp @@ -98,4 +98,3 @@ private: }; REGISTER_TEST(TestFileLister) - diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp index bd05e85e6..3db670908 100644 --- a/test/testincompletestatement.cpp +++ b/test/testincompletestatement.cpp @@ -206,5 +206,3 @@ private: }; REGISTER_TEST(TestIncompleteStatement) - - diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp index 9aa5b1614..b1160b192 100644 --- a/test/testleakautovar.cpp +++ b/test/testleakautovar.cpp @@ -566,4 +566,3 @@ private: }; REGISTER_TEST(TestLeakAutoVar) - diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp index 51d498eed..f0e2eb994 100644 --- a/test/testmathlib.cpp +++ b/test/testmathlib.cpp @@ -188,7 +188,7 @@ private: // ----------------- // 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(100.0 , MathLib::toDoubleNumber("1.0E+2")); ASSERT_EQUALS_DOUBLE(-100.0, MathLib::toDoubleNumber("-1.0E+2")); @@ -239,18 +239,18 @@ private: 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("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("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")); @@ -293,11 +293,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.")); @@ -342,5 +342,3 @@ private: }; REGISTER_TEST(TestMathLib) - - diff --git a/test/testobsoletefunctions.cpp b/test/testobsoletefunctions.cpp index 93c2724b0..9281f8606 100644 --- a/test/testobsoletefunctions.cpp +++ b/test/testobsoletefunctions.cpp @@ -293,5 +293,3 @@ private: }; REGISTER_TEST(TestObsoleteFunctions) - - diff --git a/test/testother.cpp b/test/testother.cpp index 51d871c22..e7ef4d039 100644 --- a/test/testother.cpp +++ b/test/testother.cpp @@ -4536,7 +4536,7 @@ private: "{\n" " if( token == \"C\")\n" " {\n" - " std::cout << \"C\";\n" + " std::cout << \"C\";\n" " }\n" " else if ( token == \"A\" )\n" " {\n" @@ -4736,18 +4736,18 @@ private: "int fitInt(long long int nValue){\n" " if( nValue < INT32_MAX )\n" " {\n" - " return 32;\n" + " return 32;\n" " }\n" " if( nValue < INT48_MAX )\n" " {\n" - " return 48;\n" + " return 48;\n" " }\n" " else if( nValue < INT64_MAX )\n" " {\n" - " return 64;\n" + " return 64;\n" " } else\n" " {\n" - " return -1;\n" + " return -1;\n" " }\n" "}\n"); ASSERT_EQUALS("", errout.str()); @@ -5651,7 +5651,7 @@ private: " char *p = malloc(100);\n" " if (x) {\n" " free(p);\n" - " x = 0;\n" + " x = 0;\n" " }\n" " free(p);\n" "}"); @@ -5789,16 +5789,16 @@ private: check( "int foo()\n" "{\n" - " int* a = new int;\n" - " bool doDelete = true;\n" - " if (a != 0)\n" - " {\n" - " doDelete = false;\n" - " delete a;\n" - " }\n" - " if(doDelete)\n" - " delete a;\n" - " return 0;\n" + " int* a = new int;\n" + " bool doDelete = true;\n" + " if (a != 0)\n" + " {\n" + " doDelete = false;\n" + " delete a;\n" + " }\n" + " if(doDelete)\n" + " delete a;\n" + " return 0;\n" "}" ); ASSERT_EQUALS("", errout.str()); diff --git a/test/testpostfixoperator.cpp b/test/testpostfixoperator.cpp index e8c822207..e0d478ea3 100644 --- a/test/testpostfixoperator.cpp +++ b/test/testpostfixoperator.cpp @@ -348,5 +348,3 @@ private: }; REGISTER_TEST(TestPostfixOperator) - - diff --git a/test/testrunner.cpp b/test/testrunner.cpp index 65b81befa..5d65f963f 100644 --- a/test/testrunner.cpp +++ b/test/testrunner.cpp @@ -28,4 +28,3 @@ int main(int argc, char *argv[]) return (ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } - diff --git a/test/testsuite.h b/test/testsuite.h index 4e2f8e223..44dc56d5b 100644 --- a/test/testsuite.h +++ b/test/testsuite.h @@ -78,4 +78,3 @@ public: #define REGISTER_TEST( CLASSNAME ) namespace { CLASSNAME instance; } #endif - diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp index 294cd4b34..8471905bd 100644 --- a/test/testsymboldatabase.cpp +++ b/test/testsymboldatabase.cpp @@ -1409,4 +1409,3 @@ private: }; REGISTER_TEST(TestSymbolDatabase) - diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp index b8a26de5a..f040e5bc0 100644 --- a/test/testtokenize.cpp +++ b/test/testtokenize.cpp @@ -2481,7 +2481,7 @@ private: "for ( int i = 0 ; i < 10 ; ++ i ) { }\n" "}"; ASSERT_EQUALS(expected, tokenizeAndStringify(code, true)); - ASSERT_EQUALS("", errout.str()); // debug warnings + ASSERT_EQUALS("", errout.str()); // debug warnings } void simplifyKnownVariablesBailOutFor2() { @@ -2494,7 +2494,7 @@ private: "while ( i < 10 ) { ++ i ; }\n" "}"; ASSERT_EQUALS(expected, tokenizeAndStringify(code, true)); - ASSERT_EQUALS("", errout.str()); // debug warnings + ASSERT_EQUALS("", errout.str()); // debug warnings } void simplifyKnownVariablesBailOutFor3() { @@ -2507,7 +2507,7 @@ private: "{ }\n" "}"; ASSERT_EQUALS(expected, tokenizeAndStringify(code, true)); - ASSERT_EQUALS("", errout.str()); // debug warnings + ASSERT_EQUALS("", errout.str()); // debug warnings } void simplifyKnownVariablesBailOutMemberFunction() { @@ -2531,7 +2531,7 @@ private: " return a;\n" "}\n"; tokenizeAndStringify(code,true); - ASSERT_EQUALS("", errout.str()); // no debug warnings + ASSERT_EQUALS("", errout.str()); // no debug warnings } void simplifyKnownVariablesBailOutSwitchBreak() { @@ -2590,17 +2590,17 @@ private: const char code[] = "void a(int x);" // <- x is passed by value "void b() {" " int x = 123;" - " a(x);" // <- replace with a(123); + " a(x);" // <- replace with a(123); "}"; const char expected[] = "void a ( int x ) ; void b ( ) { a ( 123 ) ; }"; ASSERT_EQUALS(expected, tokenizeAndStringify(code,true)); } { - const char code[] = "void a(int &x);" // <- x is passed by reference + const char code[] = "void a(int &x);" // <- x is passed by reference "void b() {" " int x = 123;" - " a(x);" // <- don't replace with a(123); + " a(x);" // <- don't replace with a(123); "}"; const char expected[] = "void a ( int & x ) ; void b ( ) { int x ; x = 123 ; a ( x ) ; }"; ASSERT_EQUALS(expected, tokenizeAndStringify(code,true)); diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index d6e20b468..9b6f85d51 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -2349,4 +2349,3 @@ private: }; REGISTER_TEST(TestUninitVar) - diff --git a/test/testunusedfunctions.cpp b/test/testunusedfunctions.cpp index 1ce54d1e5..b810ac8da 100644 --- a/test/testunusedfunctions.cpp +++ b/test/testunusedfunctions.cpp @@ -260,4 +260,3 @@ private: }; REGISTER_TEST(TestUnusedFunctions) - diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp index 9b05e9cb7..e79897ce2 100644 --- a/test/testunusedprivfunc.cpp +++ b/test/testunusedprivfunc.cpp @@ -659,4 +659,3 @@ private: }; REGISTER_TEST(TestUnusedPrivateFunction) -