some loop readability cleanups following previous Rider fixes (danmar#7014)

Author: firewave

lib/library.cpp

@@ -347,10 +347,12 @@ Library::Error Library::load(const tinyxml2::XMLDocument &doc)
                 }
             }
             if (allocationId == 0) {
-                if (nodename == "memory")
+                if (nodename == "memory") {
                     while (!ismemory(++mData->mAllocId)) {}
-                else
+                }
+                else {
                     while (!isresource(++mData->mAllocId)) {}
+                }
                 allocationId = mData->mAllocId;
             }
 

lib/token.cpp

@@ -1141,8 +1141,10 @@ Token* Token::insertToken(const std::string& tokenStr, const std::string& origin
                     newToken->mImpl->mScopeInfo = mImpl->mScopeInfo;
                 }
                 if (newToken->str() == ";") {
-                    const Token* statementStart;
-                    for (statementStart = newToken; statementStart->previous() && !Token::Match(statementStart->previous(), ";|{"); statementStart = statementStart->previous()) {}
+                    const Token* statementStart = newToken;
+                    while (statementStart->previous() && !Token::Match(statementStart->previous(), ";|{")) {
+                        statementStart = statementStart->previous();
+                    }
                     if (Token::Match(statementStart, "using namespace %name% ::|;")) {
                         const Token * tok1 = statementStart->tokAt(2);
                         std::string nameSpace;