From 3dbfd80becfabfc4019238fa9606c5578e109366 Mon Sep 17 00:00:00 2001 From: firewave Date: Thu, 29 Aug 2024 20:01:32 +0200 Subject: [PATCH] token.h: flagged some functions with `RET_NONNULL` --- lib/token.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/token.h b/lib/token.h index ca7e7ce1e03..38481ed6a99 100644 --- a/lib/token.h +++ b/lib/token.h @@ -919,9 +919,9 @@ class CPPCHECKLIB Token { * @param prepend Insert the new token before this token when it's not * the first one on the tokens list. */ - Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString, bool prepend = false); + RET_NONNULL Token* insertToken(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString, bool prepend = false); - Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString) + RET_NONNULL Token* insertTokenBefore(const std::string& tokenStr, const std::string& originalNameStr = emptyString, const std::string& macroNameStr = emptyString) { return insertToken(tokenStr, originalNameStr, macroNameStr, true); } @@ -1224,7 +1224,7 @@ class CPPCHECKLIB Token { /** * @return the first token of the next argument. Does only work on argument * lists. Requires that Tokenizer::createLinks2() has been called before. - * Returns 0, if there is no next argument. + * Returns nullptr, if there is no next argument. */ const Token* nextArgument() const; Token *nextArgument(); @@ -1232,14 +1232,14 @@ class CPPCHECKLIB Token { /** * @return the first token of the next argument. Does only work on argument * lists. Should be used only before Tokenizer::createLinks2() was called. - * Returns 0, if there is no next argument. + * Returns nullptr, if there is no next argument. */ const Token* nextArgumentBeforeCreateLinks2() const; /** * @return the first token of the next template argument. Does only work on template argument * lists. Requires that Tokenizer::createLinks2() has been called before. - * Returns 0, if there is no next argument. + * Returns nullptr, if there is no next argument. */ const Token* nextTemplateArgument() const; @@ -1477,14 +1477,14 @@ class CPPCHECKLIB Token { return nullptr; } - Token *astTop() { + RET_NONNULL Token *astTop() { Token *ret = this; while (ret->mImpl->mAstParent) ret = ret->mImpl->mAstParent; return ret; } - const Token *astTop() const { + RET_NONNULL const Token *astTop() const { const Token *ret = this; while (ret->mImpl->mAstParent) ret = ret->mImpl->mAstParent;