Make it more explicit which oparators can be preeded by their operands

danmar · Feb 26, 2024 · 61f9489 · 61f9489
1 parent 47173be
commit 61f9489
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -646,7 +646,7 @@ static void compileUnaryOp(Token *&tok, AST_state& state, void (*f)(Token *&tok,
         state.depth--;
     }
 
-    if (!state.op.empty() && !(unaryop->str() == "&" && precedes(state.op.top(), unaryop))) {
+    if (!state.op.empty() && (!precedes(state.op.top(), unaryop) || unaryop->isIncDecOp() || Token::Match(unaryop, "[({[]"))) { // nullary functions, empty lists/arrays
         unaryop->astOperand1(state.op.top());
         state.op.pop();
     }

diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -3946,17 +3946,17 @@ class TestStl : public TestFixture {
     void size4() { // #2652 - don't warn about vector/deque
         check("void f(std::vector<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}", false, Standards::CPP03);
         ASSERT_EQUALS("", errout.str());
 
         check("void f(std::deque<int> &v) {\n"
               "    if (v.size() > 0U) {}\n"
-              "}");
+              "}", false, Standards::CPP03);
         ASSERT_EQUALS("", errout.str());
 
         check("void f(std::array<int,3> &a) {\n"
               "    if (a.size() > 0U) {}\n"
-              "}");
+              "}", false, Standards::CPP03);
         ASSERT_EQUALS("", errout.str());
     }