Tokenizer: better simplification of calculations in conditions

Daniel Marjamäki · Daniel Marjamäki · commit f34e9e66233b · 2011-04-02T11:08:58.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -7383,7 +7383,8 @@ bool Tokenizer::simplifyCalculations()
                    Token::Match(tok, "<< %num% [+-*/] %num% [],);=<>+-*/|&^]") ||
                    Token::Match(tok, "[[,(=<>+-*|&^] %num% [+-*/] %num% <<|>>") ||
                    Token::Match(tok, "<< %num% [+-*/] %num% <<") ||
-                   Token::Match(tok, "[(,[] %num% [|&^] %num% [];,);]"))
+                   Token::Match(tok, "[(,[] %num% [|&^] %num% [];,);]") ||
+                   Token::Match(tok, "(|==|!=|<=|>=|<|>|+ %num% [+-*/] %num% ==|!=|<=|>=|<|>|)"))
             {
                 tok = tok->next();
 
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -2719,6 +2719,12 @@ class TestSimplifyTokens : public TestFixture
         ASSERT_EQUALS("; a [ 0 ] ;", tok(";a[0*(*p)];"));
 
         ASSERT_EQUALS(";", tok("; x = x + 0;"));
+
+        ASSERT_EQUALS("if ( a == 2 )", tok("if (a==1+1)"));
+        ASSERT_EQUALS("if ( a + 2 != 6 )", tok("if (a+1+1!=1+2+3)"));
+
+        // TODO: "4/4" should be simplified
+        TODO_ASSERT_EQUALS("if ( 4 < a )", "if ( 4 < a * 4 / 4 )", tok("if (14-2*5<a*4/(2*2))"));
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -7383,7 +7383,8 @@ bool Tokenizer::simplifyCalculations()`
`7383`	`7383`	`Token::Match(tok, "<< %num% [+-/] %num% [],);=<>+-/\|&^]") \|\|`
`7384`	`7384`	`Token::Match(tok, "[[,(=<>+-\|&^] %num% [+-/] %num% <<\|>>") \|\|`
`7385`	`7385`	`Token::Match(tok, "<< %num% [+-*/] %num% <<") \|\|`
`7386`		`- Token::Match(tok, "[(,[] %num% [\|&^] %num% [];,);]"))`
	`7386`	`+ Token::Match(tok, "[(,[] %num% [\|&^] %num% [];,);]") \|\|`
	`7387`	`+ Token::Match(tok, "(\|==\|!=\|<=\|>=\|<\|>\|+ %num% [+-*/] %num% ==\|!=\|<=\|>=\|<\|>\|)"))`
`7387`	`7388`	`{`
`7388`	`7389`	`tok = tok->next();`
`7389`	`7390`