Tokenizer: cleanup simplification of '!= 0' to avoid FP in 'x[(y & 0x80) != 0]' (linux)

danmar · danmar · commit 7bafbfbd6eaa · 2015-01-04T13:50:54.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -6142,10 +6142,6 @@ void Tokenizer::simplifyIfNotNull()
             }
         }
 
-        else if (tok->link() && Token::simpleMatch(tok, ") != 0")) {
-            deleteFrom = tok;
-        }
-
         if (deleteFrom) {
             Token::eraseTokens(deleteFrom, deleteFrom->tokAt(3));
             tok = deleteFrom;
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -579,7 +579,7 @@ class TestOther : public TestFixture {
         ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
 
         invalidFunctionUsage("int f() { memset(a,b,sizeof(a)!=0); }");
-        TODO_ASSERT_EQUALS("error", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:1]: (error) Invalid memset() argument nr 3. A non-boolean value is required.\n", errout.str());
 
         invalidFunctionUsage("int f() { strtol(a,b,sizeof(a)!=12); }");
         ASSERT_EQUALS("[test.cpp:1]: (error) Invalid strtol() argument nr 3. The value is 0 or 1 (comparison result) but the valid values are '0,2:36'.\n", errout.str());
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -1668,7 +1668,7 @@ class TestSimplifyTokens : public TestFixture {
         ASSERT_EQUALS("char * s ; do { s = new char [ 10 ] ; } while ( ! s ) ;",
                       tok("char *s; do { } while (0 == (s=new char[10]));"));
         // #4911
-        ASSERT_EQUALS("; do { current = f ( ) ; } while ( current ) ;", simplifyIfAndWhileAssign(";do { } while((current=f()) != NULL);"));
+        ASSERT_EQUALS("; do { current = f ( ) ; } while ( ( current ) != 0 ) ;", simplifyIfAndWhileAssign(";do { } while((current=f()) != NULL);"));
     }
 
     void ifnot() {

Original file line number	Diff line number	Diff line change
`@@ -6142,10 +6142,6 @@ void Tokenizer::simplifyIfNotNull()`
`6142`	`6142`	`}`
`6143`	`6143`	`}`
`6144`	`6144`
`6145`		`- else if (tok->link() && Token::simpleMatch(tok, ") != 0")) {`
`6146`		`- deleteFrom = tok;`
`6147`		`- }`
`6148`		`-`
`6149`	`6145`	`if (deleteFrom) {`
`6150`	`6146`	`Token::eraseTokens(deleteFrom, deleteFrom->tokAt(3));`
`6151`	`6147`	`tok = deleteFrom;`
Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ class TestSimplifyTokens : public TestFixture {`
`1668`	`1668`	`ASSERT_EQUALS("char * s ; do { s = new char [ 10 ] ; } while ( ! s ) ;",`
`1669`	`1669`	`tok("char *s; do { } while (0 == (s=new char[10]));"));`
`1670`	`1670`	`// #4911`
`1671`		`- ASSERT_EQUALS("; do { current = f ( ) ; } while ( current ) ;", simplifyIfAndWhileAssign(";do { } while((current=f()) != NULL);"));`
	`1671`	`+ ASSERT_EQUALS("; do { current = f ( ) ; } while ( ( current ) != 0 ) ;", simplifyIfAndWhileAssign(";do { } while((current=f()) != NULL);"));`
`1672`	`1672`	`}`
`1673`	`1673`
`1674`	`1674`	`void ifnot() {`