Fix #684 (Tokenizer: (65536*72/100) incorrectly simplified to zero)

http://sourceforge.net/apps/trac/cppcheck/ticket/684
danmar · Sep 15, 2009 · 55fc473 · 55fc473
1 parent 5efedf8
commit 55fc473
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/tokenize.cpp b/src/tokenize.cpp
@@ -3164,7 +3164,7 @@ bool Tokenizer::simplifyCalculations()
         }
 
         // (1-2)
-        if (Token::Match(tok, "[[,(=<>+-*] %num% [+-*/] %num% [],);=<>+-*]"))
+        if (Token::Match(tok, "[[,(=<>+-*] %num% [+-*/] %num% [],);=<>+-*/]"))
         {
             tok = tok->next();
 

diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -1420,6 +1420,7 @@ class TestSimplifyTokens : public TestFixture
 
         ASSERT_EQUALS("x = 1 + 2 * y ;", tok("x=1+2*y;"));
         ASSERT_EQUALS("x = 7 ;", tok("x=1+2*3;"));
+        ASSERT_EQUALS("x = 47185 ;", tok("x=(65536*72/100);"));
     }