From 40739eb3fb9b82ebf6a9fa097b12b85453c6ae3b Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edo88@email.it>
Date: Mon, 16 Jan 2012 10:51:13 +0100
Subject: [PATCH] Reverted some changes in commits
 4b05c3e19f58f5b53e4e306e7fc1d8aae37a6e8f and
 4b08b13845609c0ac17ecd7fd20268bb4ea0f490.

---
 lib/tokenize.cpp | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index d8022cc8a..7ddf68db3 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4167,9 +4167,8 @@ bool Tokenizer::simplifyIfAddBraces()
         }
 
         else if (tok->str() == "else") {
-            const Token *tok2 = tok->next();
             // An else followed by an if or brace don't need to be processed further
-            if (tok2 && (tok2->str() == "if" || tok2->str() == "{"))
+            if (Token::Match(tok, "else if|{"))
                 continue;
         }
 
@@ -4214,17 +4213,12 @@ bool Tokenizer::simplifyIfAddBraces()
                     break;
                 }
                 tempToken = tempToken->link();
-                const Token *tempToken1 = tempToken->next();
-                if (!tempToken1)
+                if (!tempToken || !tempToken->next())
+                    break;
+                if (Token::simpleMatch(tempToken, "} else") && !Token::Match(tempToken->tokAt(2), "if|{"))
+                    innerIf = false;
+                else if (tempToken->next()->isName() && tempToken->next()->str() != "else")
                     break;
-                if (tempToken1->isName()) {
-                    if (tempToken1->str() == "else") {
-                        tempToken1 = tempToken1->next();
-                        if (!tempToken1 || (tempToken1->str() != "if" && tempToken1->str() != "{"))
-                            innerIf = false;
-                    } else
-                        break;
-                }
                 continue;
             }
 
@@ -4243,12 +4237,11 @@ bool Tokenizer::simplifyIfAddBraces()
                 if (!innerIf)
                     break;
 
-                const Token *tempToken1 = tempToken->next();
-                if (tempToken1 && tempToken1->str() == "else") {
-                    tempToken1 = tempToken1->next();
-                    if (!tempToken1 || tempToken1->str() != "if")
-                        innerIf = false;
-                } else
+                if (Token::simpleMatch(tempToken, "; else if"))
+                    ;
+                else if (Token::simpleMatch(tempToken, "; else"))
+                    innerIf = false;
+                else
                     break;
             }
         }