walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Token: Improved const correctness of findsimplematch() and findmatch(). There are no functional changes.

This commit is contained in:
orbitcowboy 2016-10-29 21:37:45 +02:00
parent e76710c906
commit 960a0c6b11
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/token.cpp
View File

@ -843,7 +843,7 @@ Token * Token::findClosingBracket()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const Token *Token::findsimplematch(const Token *startTok, const char pattern[]) const Token *Token::findsimplematch(const Token * const startTok, const char pattern[])
{ {
for (const Token* tok = startTok; tok; tok = tok->next()) { for (const Token* tok = startTok; tok; tok = tok->next()) {
if (Token::simpleMatch(tok, pattern)) if (Token::simpleMatch(tok, pattern))
@ -852,7 +852,7 @@ const Token *Token::findsimplematch(const Token *startTok, const char pattern[])
return 0; return 0;
} }
const Token *Token::findsimplematch(const Token *startTok, const char pattern[], const Token *end) const Token *Token::findsimplematch(const Token * const startTok, const char pattern[], const Token * const end)
{ {
for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) { for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) {
if (Token::simpleMatch(tok, pattern)) if (Token::simpleMatch(tok, pattern))
@ -861,7 +861,7 @@ const Token *Token::findsimplematch(const Token *startTok, const char pattern[],
return nullptr; return nullptr;
} }
const Token *Token::findmatch(const Token *startTok, const char pattern[], unsigned int varId) const Token *Token::findmatch(const Token * const startTok, const char pattern[], const unsigned int varId)
{ {
for (const Token* tok = startTok; tok; tok = tok->next()) { for (const Token* tok = startTok; tok; tok = tok->next()) {
if (Token::Match(tok, pattern, varId)) if (Token::Match(tok, pattern, varId))
@ -870,7 +870,7 @@ const Token *Token::findmatch(const Token *startTok, const char pattern[], unsig
return nullptr; return nullptr;
} }
const Token *Token::findmatch(const Token *startTok, const char pattern[], const Token *end, unsigned int varId) const Token *Token::findmatch(const Token * const startTok, const char pattern[], const Token * const end, const unsigned int varId)
{ {
for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) { for (const Token* tok = startTok; tok && tok != end; tok = tok->next()) {
if (Token::Match(tok, pattern, varId)) if (Token::Match(tok, pattern, varId))

16
lib/token.h
View File

@ -411,20 +411,20 @@ public:
setFlag(fIsEnumType, value); setFlag(fIsEnumType, value);
} }
static const Token *findsimplematch(const Token *startTok, const char pattern[]); static const Token *findsimplematch(const Token * const startTok, const char pattern[]);
static const Token *findsimplematch(const Token *startTok, const char pattern[], const Token *end); static const Token *findsimplematch(const Token * const startTok, const char pattern[], const Token * const end);
static const Token *findmatch(const Token *startTok, const char pattern[], unsigned int varId = 0); static const Token *findmatch(const Token * const startTok, const char pattern[], const unsigned int varId = 0U);
static const Token *findmatch(const Token *startTok, const char pattern[], const Token *end, unsigned int varId = 0); static const Token *findmatch(const Token * const startTok, const char pattern[], const Token * const end, const unsigned int varId = 0U);
static Token *findsimplematch(Token *startTok, const char pattern[]) { static Token *findsimplematch(Token * const startTok, const char pattern[]) {
return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern)); return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern));
} }
static Token *findsimplematch(Token *startTok, const char pattern[], const Token *end) { static Token *findsimplematch(Token * const startTok, const char pattern[], const Token * const end) {
return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern, end)); return const_cast<Token *>(findsimplematch(const_cast<const Token *>(startTok), pattern, end));
} }
static Token *findmatch(Token *startTok, const char pattern[], unsigned int varId = 0) { static Token *findmatch(Token * const startTok, const char pattern[], const unsigned int varId = 0U) {
return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, varId)); return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, varId));
} }
static Token *findmatch(Token *startTok, const char pattern[], const Token *end, unsigned int varId = 0) { static Token *findmatch(Token * const startTok, const char pattern[], const Token * const end, const unsigned int varId = 0U) {
return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, end, varId)); return const_cast<Token *>(findmatch(const_cast<const Token *>(startTok), pattern, end, varId));
} }