Value flow: added bailout on }

danmar · danmar · commit 58fb2e756bd3 · 2014-01-06T11:27:56.000+01:00
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -100,6 +100,12 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, ErrorLogger *errorLog
                 if (var && tok2 == var->nameToken())
                     break;
             }
+
+            if (tok2->str() == "}") {
+                if (settings->debugwarnings)
+                    bailout(tokenlist, errorLogger, tok2, "variable " + var->nameToken()->str() + " stopping on }");
+                break;
+            }
         }
     }
 }
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -81,6 +81,13 @@ class TestValueFlow : public TestFixture {
                             "}";
         ASSERT_EQUALS(true, testValueOfX(code, 2U, 123));
 
+        // bailout: if/else/etc
+        bailout("void f(int x) {\n"
+                "    if (x != 123) { b = x; }\n"
+                "    if (x == 123) {}\n"
+                "}");
+        ASSERT_EQUALS("[test.cpp:2]: (debug) ValueFlow bailout: variable x stopping on }\n", errout.str());
+
         // bailout: assignment
         bailout("void f(int x) {\n"
                 "    x = y;\n"

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,12 @@ static void valueFlowBeforeCondition(TokenList tokenlist, ErrorLogger errorLog`
`100`	`100`	`if (var && tok2 == var->nameToken())`
`101`	`101`	`break;`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ if (tok2->str() == "}") {`
	`105`	`+ if (settings->debugwarnings)`
	`106`	`+ bailout(tokenlist, errorLogger, tok2, "variable " + var->nameToken()->str() + " stopping on }");`
	`107`	`+ break;`
	`108`	`+ }`
`103`	`109`	`}`
`104`	`110`	`}`
`105`	`111`	`}`