From cc97834e887770dc6f235f4de39553b5ea4a5dfd Mon Sep 17 00:00:00 2001
From: Dmitry-Me <wipedout@yandex.ru>
Date: Sat, 26 Aug 2017 08:18:24 +0300
Subject: [PATCH] Revert "Combine overlapping patterns"

This reverts commit 123f9b67e0dbae67555a3242181edada1633af7f.
---
 lib/tokenize.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 56c77a724..dabeaa150 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4358,7 +4358,8 @@ bool Tokenizer::removeRedundantConditions()
 void Tokenizer::removeRedundantFor()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "[;{}] for ( %type%| %name% = %num% ; %name% < %num% ; ++| %name% ++| ) {")) {
+        if (Token::Match(tok, "[;{}] for ( %name% = %num% ; %name% < %num% ; ++| %name% ++| ) {") ||
+            Token::Match(tok, "[;{}] for ( %type% %name% = %num% ; %name% < %num% ; ++| %name% ++| ) {")) {
             // Same variable name..
             const Token* varTok = tok->tokAt(3);
             bool type = varTok->next()->isName();