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

fix syntax error for num.operator std::string()[0] (#2389)

This commit is contained in:
IOBYTE 2019-11-23 11:42:24 -05:00 committed by Daniel Marjamäki
parent 14469aced8
commit fb1d60bfb1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tokenize.cpp
View File

@ -95,8 +95,11 @@ const Token * Tokenizer::isFunctionHead(const Token *tok, const std::string &end
tok = tok->link(); tok = tok->link();
if (Token::Match(tok, ") ;|{|[")) { if (Token::Match(tok, ") ;|{|[")) {
tok = tok->next(); tok = tok->next();
while (tok && tok->str() == "[" && tok->link()) while (tok && tok->str() == "[" && tok->link()) {
if (endsWith.find(tok->str()) != std::string::npos)
return tok;
tok = tok->link()->next(); tok = tok->link()->next();
}
return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr; return (tok && endsWith.find(tok->str()) != std::string::npos) ? tok : nullptr;
} }
if (cpp && tok->str() == ")") { if (cpp && tok->str() == ")") {
@ -10815,7 +10818,7 @@ void Tokenizer::deleteSymbolDatabase()
bool Tokenizer::operatorEnd(const Token * tok) const bool Tokenizer::operatorEnd(const Token * tok) const
{ {
if (tok && tok->str() == ")") { if (tok && tok->str() == ")") {
if (isFunctionHead(tok, "{|;|?|:")) if (isFunctionHead(tok, "{|;|?|:|["))
return true; return true;
tok = tok->next(); tok = tok->next();

7
test/testtokenize.cpp
View File

@ -409,6 +409,7 @@ private:
TEST_CASE(simplifyOperatorName22); TEST_CASE(simplifyOperatorName22);
TEST_CASE(simplifyOperatorName23); TEST_CASE(simplifyOperatorName23);
TEST_CASE(simplifyOperatorName24); TEST_CASE(simplifyOperatorName24);
TEST_CASE(simplifyOperatorName25);
TEST_CASE(simplifyNullArray); TEST_CASE(simplifyNullArray);
@ -6561,6 +6562,12 @@ private:
} }
} }
void simplifyOperatorName25() {
const char code[] = "bool negative(const Number &num) { return num.operator std::string()[0] == '-'; }";
ASSERT_EQUALS("bool negative ( const Number & num ) { return num . operatorstd::string ( ) [ 0 ] == '-' ; }",
tokenizeAndStringify(code));
}
void simplifyNullArray() { void simplifyNullArray() {
ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;")); ASSERT_EQUALS("* ( foo . bar [ 5 ] ) = x ;", tokenizeAndStringify("0[foo.bar[5]] = x;"));
} }