From c8c59aa92b43566daa02d403ea7725b5386ede41 Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Fri, 21 Aug 2015 12:34:53 +0200
Subject: [PATCH] Removed Tokenizer::simplifyIfSameInnerCondition(). It covered
 only very simple patterns and is unlikely to have an impact on real-world
 code.

---
 lib/tokenize.cpp            | 26 --------------------------
 lib/tokenize.h              |  3 ---
 test/testsimplifytokens.cpp |  6 ------
 3 files changed, 35 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index d2b4e119b..cde33dc90 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -3602,7 +3602,6 @@ bool Tokenizer::simplifyTokenList2()
     simplifyErrNoInWhile();
     simplifyIfAndWhileAssign();
     simplifyRedundantParentheses();
-    simplifyIfSameInnerCondition();
     simplifyNestedStrcat();
     simplifyFuncInWhile();
 
@@ -5911,31 +5910,6 @@ void Tokenizer::simplifyVariableMultipleAssign()
     }
 }
 
-void Tokenizer::simplifyIfSameInnerCondition()
-{
-    // same inner condition
-    for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (Token::Match(tok, "if ( %name% ) {")) {
-            const unsigned int varid(tok->tokAt(2)->varId());
-            if (!varid)
-                continue;
-
-            for (Token *tok2 = tok->tokAt(5); tok2; tok2 = tok2->next()) {
-                if (Token::Match(tok2, "{|}"))
-                    break;
-                if (Token::simpleMatch(tok2, "if (")) {
-                    tok2 = tok2->tokAt(2);
-                    if (Token::Match(tok2, "%varid% )", varid))
-                        tok2->str("true");
-                    else if (Token::Match(tok2, "! %varid% )", varid))
-                        tok2->next()->varId(varid);
-                    break;
-                }
-            }
-        }
-    }
-}
-
 // Binary operators simplification map
 namespace {
     const std::map<std::string, std::string> cAlternativeTokens = make_container< std::map<std::string, std::string> >()
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 1baebc8e2..dbac16296 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -305,9 +305,6 @@ public:
      */
     void simplifyVariableMultipleAssign();
 
-    /** @brief simplify if (a) { if (a) */
-    void simplifyIfSameInnerCondition();
-
     /**
      * Simplify the 'C Alternative Tokens'
      * Examples:
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index 7721f3518..c5592ac5d 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -59,7 +59,6 @@ private:
         TEST_CASE(removePreIncrement);
 
         TEST_CASE(elseif1);
-        TEST_CASE(ifa_ifa);     // "if (a) { if (a) .." => "if (a) { if (1) .."
 
         TEST_CASE(sizeof_array);
         TEST_CASE(sizeof5);
@@ -854,11 +853,6 @@ private:
     }
 
 
-    void ifa_ifa() {
-        ASSERT_EQUALS("int a ; if ( a ) { { ab } cd }", tok("int a ; if (a) { if (a) { ab } cd }", true));
-    }
-
-
     unsigned int sizeofFromTokenizer(const char type[]) {
         errout.str("");