From 521e3495b790ab9b107fc2217d4dc6c712c2dfe5 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Sat, 28 Apr 2018 17:17:40 +0200 Subject: [PATCH] Adjustment for implementation of Token::insertToken() (#1194) Three attributes are reset in this member function even if their values are stored in the same token object. Move a corresponding sanity check so that less assignments could be performed eventually. Link: https://trac.cppcheck.net/ticket/8532 Signed-off-by: Markus Elfring --- lib/token.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/token.cpp b/lib/token.cpp index dbb749488..d2d71660c 100644 --- a/lib/token.cpp +++ b/lib/token.cpp @@ -909,11 +909,12 @@ void Token::insertToken(const std::string &tokenStr, const std::string &original newToken->str(tokenStr); if (!originalNameStr.empty()) newToken->originalName(originalNameStr); - newToken->_linenr = _linenr; - newToken->_fileIndex = _fileIndex; - newToken->_progressValue = _progressValue; if (newToken != this) { + newToken->_linenr = _linenr; + newToken->_fileIndex = _fileIndex; + newToken->_progressValue = _progressValue; + if (prepend) { /*if (this->previous())*/ { newToken->previous(this->previous());