astyle formatting

[ci skip]

lib/checkother.cpp

@@ -1974,11 +1974,11 @@ void CheckOther::checkDuplicateExpression()
                             }
                             duplicateExpressionError(tok, tok, tok->str());
                         }
-                    } 
+                    }
-                } else if (styleEnabled && 
+                } else if (styleEnabled &&
-                    isOppositeCond(true, _tokenizer->isCPP(), tok->astOperand1(), tok->astOperand2(), _settings->library, false) && 
+                           isOppositeCond(true, _tokenizer->isCPP(), tok->astOperand1(), tok->astOperand2(), _settings->library, false) &&
-                    !Token::simpleMatch(tok, "=") &&
+                           !Token::simpleMatch(tok, "=") &&
-                    isWithoutSideEffects(_tokenizer->isCPP(), tok->astOperand1())) {
+                           isWithoutSideEffects(_tokenizer->isCPP(), tok->astOperand1())) {
                     oppositeExpressionError(tok, tok, tok->str());
                 } else if (!Token::Match(tok, "[-/%]")) { // These operators are not associative
                     if (styleEnabled && tok->astOperand2() && tok->str() == tok->astOperand1()->str() && isSameExpression(_tokenizer->isCPP(), true, tok->astOperand2(), tok->astOperand1()->astOperand2(), _settings->library, true) && isWithoutSideEffects(_tokenizer->isCPP(), tok->astOperand2()))

test/testleakautovar.cpp

@@ -947,13 +947,13 @@ private:
     }
 
     void doublefree9() {
-      check("struct foo {\n"
+        check("struct foo {\n"
-            "    int* get(int) { return new int(); }\n"
+              "    int* get(int) { return new int(); }\n"
-            "};\n"
+              "};\n"
-            "void f(foo* b) {\n"
+              "void f(foo* b) {\n"
-            "    std::unique_ptr<int> x(b->get(0));\n"
+              "    std::unique_ptr<int> x(b->get(0));\n"
-            "    std::unique_ptr<int> y(b->get(1));\n"
+              "    std::unique_ptr<int> y(b->get(1));\n"
-            "}\n", true);
+              "}\n", true);
         ASSERT_EQUALS("", errout.str());
     }
 

test/testother.cpp

@@ -3925,25 +3925,25 @@ private:
 
         check("void f(bool a) { if(a != !a) {} }");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
-        
+
         check("void f(bool a) { if( a == !(a) ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
-        
+
         check("void f(bool a) { if( a != !(a) ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
-        
+
         check("void f(bool a) { if( !(a) == a ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
-        
+
         check("void f(bool a) { if( !(a) != a ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
-        
+
         check("void f(bool a) { if( !(!a) == !(a) ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '=='.\n", errout.str());
-        
+
         check("void f(bool a) { if( !(!a) != !(a) ) {}}");
         ASSERT_EQUALS("[test.cpp:1] -> [test.cpp:1]: (style) Opposite expression on both sides of '!='.\n", errout.str());
-        
+
         check("void f(bool a) { a = !a; }");
         ASSERT_EQUALS("", errout.str());
     }