Merge pull request #645 from Dmitry-Me/mergeOverlappingPatterns6

Merge overlapping patterns
This commit is contained in:
PKEuS 2015-08-17 20:01:54 +02:00
commit 957bdfa6ab
1 changed files with 1 additions and 2 deletions

View File

@ -6315,8 +6315,7 @@ bool Tokenizer::simplifyKnownVariables()
else if (tok2->previous()->str() != "*" && !Token::Match(tok2->tokAt(-2), "* --|++") && else if (tok2->previous()->str() != "*" && !Token::Match(tok2->tokAt(-2), "* --|++") &&
(Token::Match(tok2, "%name% = %bool%|%char%|%num%|%str%|%name% ;") || (Token::Match(tok2, "%name% = %bool%|%char%|%num%|%str%|%name% ;") ||
Token::Match(tok2, "%name% [ ] = %str% ;") || Token::Match(tok2, "%name% [ %num%| ] = %str% ;") ||
Token::Match(tok2, "%name% [ %num% ] = %str% ;") ||
Token::Match(tok2, "%name% = & %name% ;") || Token::Match(tok2, "%name% = & %name% ;") ||
Token::Match(tok2, "%name% = & %name% [ 0 ] ;"))) { Token::Match(tok2, "%name% = & %name% [ 0 ] ;"))) {
const unsigned int varid = tok2->varId(); const unsigned int varid = tok2->varId();