Merge pull request 'dead code: removing of if-else statement' (#37) from dead_code_removing into master

sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp

@@ -527,20 +527,24 @@ void removeDeadCode(SgStatement* func,
     for (auto st = start; st != end; st = st->lexNext())
     {
         const int var = st->variant();
-        if ((var == FOR_NODE || var == WHILE_NODE || var == IF_NODE || var == SWITCH_NODE) &&
+        if ((var == FOR_NODE || var == WHILE_NODE || var == SWITCH_NODE) &&
             st->lexNext()->variant() == CONTROL_END)
         {
             remove.push_back(st);
-            continue;
         }
-
+        else if (var == IF_NODE)
-        if (var == IF_NODE)
         {
             SgStatement* ifS = st;
             while (ifS->lexNext()->variant() == ELSEIF_NODE)
                 ifS = ifS->lexNext();
 
-            if (ifS->lexNext()->variant() == CONTROL_END) 
+            SgStatement* lastNode = ifS->lastNodeOfStmt();
+            ifS = ifS->lexNext();
+
+            while (ifS->variant() == CONTROL_END && ifS != lastNode)
+                ifS = ifS->lexNext();
+
+            if(ifS == lastNode)
                 remove.push_back(st);
         }