CheckCondition: Fix FP for undeclared variables (daca)

danmar · danmar · commit c34fdd190517 · 2017-09-10T22:30:41.000+02:00
diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -526,7 +526,7 @@ void CheckCondition::multiCondition2()
                 }
             } else if (!nonlocal && cond->isName()) {
                 // varid is 0. this is possibly a nonlocal variable..
-                nonlocal = Token::Match(cond->astParent(), "%cop%|(|[") || (_tokenizer->isCPP() && cond->str() == "this");
+                nonlocal = Token::Match(cond->astParent(), "%cop%|(|[") || Token::Match(cond, "%name% .") || (_tokenizer->isCPP() && cond->str() == "this");
             } else {
                 tokens.push(cond->astOperand1());
                 tokens.push(cond->astOperand2());
diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -1627,6 +1627,15 @@ class TestCondition : public TestFixture {
               "   }\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        // daca hyphy
+        check("bool f() {\n"
+              "  if (rec.lLength==0) {\n"
+              "    rec.Delete(i);\n"
+              "    if (rec.lLength!=0) {}\n"
+              "  }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void oppositeInnerConditionAlias() {

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ void CheckCondition::multiCondition2()`
`526`	`526`	`}`
`527`	`527`	`} else if (!nonlocal && cond->isName()) {`
`528`	`528`	`// varid is 0. this is possibly a nonlocal variable..`
`529`		`- nonlocal = Token::Match(cond->astParent(), "%cop%\|(\|[") \|\| (_tokenizer->isCPP() && cond->str() == "this");`
	`529`	`+ nonlocal = Token::Match(cond->astParent(), "%cop%\|(\|[") \|\| Token::Match(cond, "%name% .") \|\| (_tokenizer->isCPP() && cond->str() == "this");`
`530`	`530`	`} else {`
`531`	`531`	`tokens.push(cond->astOperand1());`
`532`	`532`	`tokens.push(cond->astOperand2());`