fixed #13506 - fixed tokenizing of +-prefixed numbers in conditions (#7230)

Author: firewave

Diff for: lib/tokenize.cpp

@@ -3626,9 +3626,11 @@ void Tokenizer::concatenateNegativeNumberAndAnyPositive()
         while (tok->str() != ">" && tok->next() && tok->strAt(1) == "+" && (!Token::Match(tok->tokAt(2), "%name% (|;") || Token::Match(tok, "%op%")))
             tok->deleteNext();
 
-        if (Token::Match(tok->next(), "- %num%")) {
+        if (Token::Match(tok->next(), "+|- %num%")) {
+            // cppcheck-suppress redundantCopyLocalConst - cannot make it a reference because it is deleted afterwards
+            std::string prefix = tok->strAt(1);
             tok->deleteNext();
-            tok->next()->str("-" + tok->strAt(1));
+            tok->next()->str(prefix + tok->strAt(1));
         }
     }
 }

Diff for: test/testcondition.cpp

@@ -6354,6 +6354,14 @@ class TestCondition : public TestFixture {
             "[test.cpp:3]: (style) Condition 'f>1.00' is always false\n",
             "",
             errout_str());
+
+        check("void foo() {\n" // #13506
+              "    float nf = -1.0;\n"
+              "    if (nf > +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:3]: (style) Condition 'nf>+1.0' is always false\n",
+            errout_str());
     }
 };
 

Diff for: test/testother.cpp

@@ -302,7 +302,8 @@ class TestOther : public TestFixture {
         TEST_CASE(knownPointerToBool);
         TEST_CASE(iterateByValue);
 
-        TEST_CASE(alwaysTrueFloating);
+        TEST_CASE(knownConditionFloating);
+        TEST_CASE(knownConditionPrefixed);
     }
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
@@ -12888,7 +12889,7 @@ class TestOther : public TestFixture {
                       errout_str());
     }
 
-    void alwaysTrueFloating()
+    void knownConditionFloating()
     {
         check("void foo() {\n" // #11200
               "    float f = 1.0;\n"
@@ -12905,9 +12906,16 @@ class TestOther : public TestFixture {
               "    float f = 1.0;\n"
               "    if (f > +1.0) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS(
+        ASSERT_EQUALS(
             "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'f > +1.0' is always false.\n",
-            "",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float f = 1.0;\n"
+              "    if (f < +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'f < 1.0' is always false.\n",
             errout_str());
 
         check("void foo() {\n" // #11200
@@ -12925,9 +12933,16 @@ class TestOther : public TestFixture {
               "    float pf = +1.0;\n"
               "    if (pf > +1.0) {}\n"
               "}\n");
-        TODO_ASSERT_EQUALS(
+        ASSERT_EQUALS(
             "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'pf > +1.0' is always false.\n",
-            "",
+            errout_str());
+
+        check("void foo() {\n"
+              "    float pf = +1.0;\n"
+              "    if (pf < +1.0) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'pf < 1.0' is always false.\n",
             errout_str());
 
         check("void foo() {\n" // #11200
@@ -12941,7 +12956,7 @@ class TestOther : public TestFixture {
             "[test.cpp:2] -> [test.cpp:4]: (style) The comparison 'nf > -1.0' is always false.\n",
             errout_str());
 
-        check("void foo() {\n" // #13506
+        check("void foo() {\n" // #13508
               "    float nf = -1.0;\n"
               "    if (nf > +1.0) {}\n"
               "}\n");
@@ -12984,6 +12999,25 @@ class TestOther : public TestFixture {
             "",
             errout_str());
     }
+
+    void knownConditionPrefixed()
+    {
+        check("void foo() {\n"
+              "    int i = 1;\n"
+              "    if (i < +1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'i < 1' is always false.\n",
+            errout_str());
+
+        check("void foo() {\n" // #13506
+              "    int i = 1;\n"
+              "    if (i > +1) {}\n"
+              "}\n");
+        ASSERT_EQUALS(
+            "[test.cpp:2] -> [test.cpp:3]: (style) The comparison 'i > +1' is always false.\n",
+            errout_str());
+    }
 };
 
 REGISTER_TEST(TestOther)