Nits 7

Author: olabetskyi

simplecpp.cpp

@@ -1331,7 +1331,9 @@ simplecpp::Token * simplecpp::TokenList::foldLogicalOpToSingleValue(Token *tok,
             tok = (step)(tok);
             deleteToken(oldToken);
         } else {
-            deleteToken(tok);
+            Token * oldToken = tok;
+            tok = (step)(tok);
+            deleteToken(oldToken);
             break;
         }
     }
@@ -1363,20 +1365,20 @@ void simplecpp::TokenList::constFoldLogicalOp(Token *tok)
         breakPoints.insert(":");
         breakPoints.insert("?");
         if (tok->str() == "||"){
-            if (stringToLL(tok->previous->str()) != 0) {
+            if (stringToLL(tok->previous->str())) {
                 tok = foldLogicalOpToSingleValue(tok->previous, breakPoints, &stepForward, std::make_pair<std::string, std::string>("(", ")"), "1");
                 break;
-            } else if (stringToLL(tok->next->str()) != 0) {
+            } else if (stringToLL(tok->next->str())) {
                 tok = foldLogicalOpToSingleValue(tok->next, breakPoints, &stepBack, std::make_pair<std::string, std::string>(")", "("), "1");
                 break;
             }
             result = 0;
         } else /*if (tok->str() == "&&")*/ {
             breakPoints.insert("||");
-            if (stringToLL(tok->previous->str()) == 0) {
+            if (!stringToLL(tok->previous->str())) {
                 tok = foldLogicalOpToSingleValue(tok->previous, breakPoints, &stepForward, std::make_pair<std::string, std::string>("(", ")"), "0");
                 break;
-            } else if (stringToLL(tok->next->str()) == 0) {
+            } else if (!stringToLL(tok->next->str())) {
                 tok = foldLogicalOpToSingleValue(tok->next, breakPoints, &stepBack, std::make_pair<std::string, std::string>(")", "("), "0");
                 break;
             }