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

Fix #12087 Library: add Container::Action::FIND_CONST (#5579)

This commit is contained in:
chrchr-github 2023-10-20 21:22:06 +02:00 committed by GitHub
parent b61feaf77f
commit 41bd28c0b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cfg/cppcheck-cfg.rng
View File

@ -698,6 +698,7 @@
<value>push</value> <value>push</value>
<value>pop</value> <value>pop</value>
<value>find</value> <value>find</value>
<value>find-const</value>
<value>insert</value> <value>insert</value>
<value>erase</value> <value>erase</value>
<value>change-content</value> <value>change-content</value>

12
cfg/std.cfg
View File

@ -8758,12 +8758,12 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
<function name="back" yields="item"/> <function name="back" yields="item"/>
<function name="data" yields="buffer"/> <function name="data" yields="buffer"/>
<function name="c_str" yields="buffer-nt"/> <function name="c_str" yields="buffer-nt"/>
<function name="find" action="find"/> <function name="find" action="find-const"/>
<function name="rfind" action="find"/> <function name="rfind" action="find-const"/>
<function name="find_last_of" action="find"/> <function name="find_last_of" action="find-const"/>
<function name="find_last_not_of" action="find"/> <function name="find_last_not_of" action="find-const"/>
<function name="find_first_of" action="find"/> <function name="find_first_of" action="find-const"/>
<function name="find_first_not_of" action="find"/> <function name="find_first_not_of" action="find-const"/>
</access> </access>
</container> </container>
<container id="stdBasicString" startPattern="std :: basic_string &lt;" inherits="stdAllString"> <container id="stdBasicString" startPattern="std :: basic_string &lt;" inherits="stdAllString">

4
lib/astutils.cpp
View File

@ -1966,7 +1966,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
return false; return false;
if (container->getYield(ftok->str()) != Library::Container::Yield::NO_YIELD) if (container->getYield(ftok->str()) != Library::Container::Yield::NO_YIELD)
return true; return true;
if (container->getAction(ftok->str()) == Library::Container::Action::FIND) if (container->getAction(ftok->str()) == Library::Container::Action::FIND_CONST)
return true; return true;
return false; return false;
} else if (const Library::Function* lf = library.getFunction(ftok)) { } else if (const Library::Function* lf = library.getFunction(ftok)) {
@ -1974,7 +1974,7 @@ bool isConstFunctionCall(const Token* ftok, const Library& library)
return true; return true;
if (lf->containerYield != Library::Container::Yield::NO_YIELD) if (lf->containerYield != Library::Container::Yield::NO_YIELD)
return true; return true;
if (lf->containerAction == Library::Container::Action::FIND) if (lf->containerAction == Library::Container::Action::FIND_CONST)
return true; return true;
return false; return false;
} else { } else {

4
lib/checkstl.cpp
View File

@ -1518,7 +1518,9 @@ void CheckStl::if_find()
} }
} }
if (container && container->getAction(funcTok->str()) == Library::Container::Action::FIND) { Library::Container::Action action{};
if (container &&
((action = container->getAction(funcTok->str())) == Library::Container::Action::FIND || action == Library::Container::Action::FIND_CONST)) {
if (if_findCompare(funcTok->next(), container->stdStringLike)) if (if_findCompare(funcTok->next(), container->stdStringLike))
continue; continue;

2
lib/library.cpp
View File

@ -175,6 +175,8 @@ Library::Container::Action Library::Container::actionFrom(const std::string& act
return Container::Action::POP; return Container::Action::POP;
if (actionName == "find") if (actionName == "find")
return Container::Action::FIND; return Container::Action::FIND;
if (actionName == "find-const")
return Container::Action::FIND_CONST;
if (actionName == "insert") if (actionName == "insert")
return Container::Action::INSERT; return Container::Action::INSERT;
if (actionName == "erase") if (actionName == "erase")

1
lib/library.h
View File

@ -197,6 +197,7 @@ public:
PUSH, PUSH,
POP, POP,
FIND, FIND,
FIND_CONST,
INSERT, INSERT,
ERASE, ERASE,
CHANGE_CONTENT, CHANGE_CONTENT,

1
lib/valueflow.cpp
View File

@ -8300,6 +8300,7 @@ bool ValueFlow::isContainerSizeChanged(const Token* tok, int indirect, const Set
} }
break; break;
case Library::Container::Action::FIND: case Library::Container::Action::FIND:
case Library::Container::Action::FIND_CONST:
case Library::Container::Action::CHANGE_CONTENT: case Library::Container::Action::CHANGE_CONTENT:
case Library::Container::Action::CHANGE_INTERNAL: case Library::Container::Action::CHANGE_INTERNAL:
break; break;

2
test/testlibrary.cpp
View File

@ -811,6 +811,7 @@ private:
" <function name=\"c_str\" yields=\"buffer-nt\"/>\n" " <function name=\"c_str\" yields=\"buffer-nt\"/>\n"
" <function name=\"front\" yields=\"item\"/>\n" " <function name=\"front\" yields=\"item\"/>\n"
" <function name=\"find\" action=\"find\"/>\n" " <function name=\"find\" action=\"find\"/>\n"
" <function name=\"cfind\" action=\"find-const\"/>\n"
" </access>\n" " </access>\n"
" </container>\n" " </container>\n"
" <container id=\"B\" startPattern=\"std :: B &lt;\" inherits=\"A\" opLessAllowed=\"false\">\n" " <container id=\"B\" startPattern=\"std :: B &lt;\" inherits=\"A\" opLessAllowed=\"false\">\n"
@ -851,6 +852,7 @@ private:
ASSERT_EQ(Library::Container::Action::PUSH, A.getAction("push_back")); ASSERT_EQ(Library::Container::Action::PUSH, A.getAction("push_back"));
ASSERT_EQ(Library::Container::Action::POP, A.getAction("pop_back")); ASSERT_EQ(Library::Container::Action::POP, A.getAction("pop_back"));
ASSERT_EQ(Library::Container::Action::FIND, A.getAction("find")); ASSERT_EQ(Library::Container::Action::FIND, A.getAction("find"));
ASSERT_EQ(Library::Container::Action::FIND_CONST, A.getAction("cfind"));
ASSERT_EQ(Library::Container::Action::NO_ACTION, A.getAction("foo")); ASSERT_EQ(Library::Container::Action::NO_ACTION, A.getAction("foo"));
ASSERT_EQUALS(B.type_templateArgNo, 1); ASSERT_EQUALS(B.type_templateArgNo, 1);