Java: Removed bailout added in 120073f

Daniel Marjamäki · Daniel Marjamäki · commit fee20bafa07a · 2010-10-28T18:01:51.000+02:00
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -745,7 +745,7 @@ void CheckClass::SpaceInfo::getVarList()
         }
 
         // If the vartok was set in the if-blocks above, create a entry for this variable..
-        if (vartok && vartok->str() != "operator" && !Token::Match(vartok->next(), "; %varid% =", vartok->varId()))
+        if (vartok && vartok->str() != "operator")
         {
             if (vartok->varId() == 0 && check->_settings->debugwarnings)
             {
diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -2244,12 +2244,30 @@ class TestClass : public TestFixture
         ASSERT_EQUALS("", errout.str());
     }
 
+    void checkUninitVarJava(const char code[])
+    {
+        // Tokenize..
+        Tokenizer tokenizer;
+        std::istringstream istr(code);
+        tokenizer.tokenize(istr, "test.java");
+        tokenizer.simplifyTokenList();
+
+        // Clear the error log
+        errout.str("");
+
+        // Check..
+        Settings settings;
+        settings._checkCodingStyle = true;
+        CheckClass checkClass(&tokenizer, &settings, this);
+        checkClass.constructors();
+    }
+
     void uninitJava()
     {
-        checkUninitVar("class A {\n"
-                       "    private: int i = 0;\n"
-                       "    public: A() { }\n"
-                       "};");
+        checkUninitVarJava("class A {\n"
+                           "    private: int i = 0;\n"
+                           "    public: A() { }\n"
+                           "};");
         ASSERT_EQUALS("", errout.str());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -745,7 +745,7 @@ void CheckClass::SpaceInfo::getVarList()`
`745`	`745`	`}`
`746`	`746`
`747`	`747`	`// If the vartok was set in the if-blocks above, create a entry for this variable..`
`748`		`- if (vartok && vartok->str() != "operator" && !Token::Match(vartok->next(), "; %varid% =", vartok->varId()))`
	`748`	`+ if (vartok && vartok->str() != "operator")`
`749`	`749`	`{`
`750`	`750`	`if (vartok->varId() == 0 && check->_settings->debugwarnings)`
`751`	`751`	`{`