From 840b2fb0351b07c21b218b058b3d08cb1fedbbba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 6 Jan 2015 20:44:58 +0100
Subject: [PATCH] Tokenizer: Removed simplification
 Tokenizer::simplifyAssignmentBlock. This fixes a fp in linux.

---
 lib/tokenize.cpp | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 1f37a2f0d..2519ac466 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3544,9 +3544,6 @@ bool Tokenizer::simplifyTokenList1(const char FileName[])
     // f(x=g())   =>   x=g(); f(x)
     simplifyAssignmentInFunctionCall();
 
-    // x = ({ 123; });  =>   { x = 123; }
-    simplifyAssignmentBlock();
-
     // The simplifyTemplates have inner loops
     if (_settings->terminated())
         return false;
@@ -9410,36 +9407,6 @@ void Tokenizer::simplifyAssignmentInFunctionCall()
     }
 }
 
-void Tokenizer::simplifyAssignmentBlock()
-{
-    for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "[;{}] %var% = ( {")) {
-            // goto the "} )"
-            unsigned int indentlevel = 0;
-            Token *tok2 = tok;
-            while (nullptr != (tok2 = tok2->next())) {
-                if (Token::Match(tok2, "(|{"))
-                    ++indentlevel;
-                else if (Token::Match(tok2, ")|}")) {
-                    if (indentlevel <= 2)
-                        break;
-                    --indentlevel;
-                }
-            }
-            if (indentlevel == 2 && Token::simpleMatch(tok2, "} )")) {
-                tok2 = tok2->tokAt(-3);
-                if (Token::Match(tok2, "[;{}] %num%|%var% ;")) {
-                    tok2->insertToken("=");
-                    tok2->insertToken(tok->next()->str());
-                    tok2->next()->varId(tok->next()->varId());
-                    tok->deleteNext(3);
-                    tok2->tokAt(5)->deleteNext();
-                }
-            }
-        }
-    }
-}
-
 // Remove __asm..
 void Tokenizer::simplifyAsm()
 {