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

Fixed #9881 ((Regression) Hang with operator() in function call)

This commit is contained in:
Daniel Marjamäki 2020-09-07 21:32:29 +02:00
parent 07f6876dc8
commit c0ef640304
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -11265,8 +11265,12 @@ void Tokenizer::simplifyOverloadedOperators()
while (Token::simpleMatch(start, ",")) { while (Token::simpleMatch(start, ",")) {
if (Token::simpleMatch(start->previous(), ")")) if (Token::simpleMatch(start->previous(), ")"))
start = start->linkAt(-1); start = start->linkAt(-1);
else
break;
if (Token::Match(start->previous(), "%name%")) if (Token::Match(start->previous(), "%name%"))
start = start->tokAt(-2); start = start->tokAt(-2);
else
break;
} }
const Token *after = tok->linkAt(1); const Token *after = tok->linkAt(1);
while (Token::Match(after, ")|} , %name% (|{")) while (Token::Match(after, ")|} , %name% (|{"))

19
test/testtokenize.cpp
View File

@ -418,6 +418,7 @@ private:
TEST_CASE(simplifyOverloadedOperators1); TEST_CASE(simplifyOverloadedOperators1);
TEST_CASE(simplifyOverloadedOperators2); // (*this)(123) TEST_CASE(simplifyOverloadedOperators2); // (*this)(123)
TEST_CASE(simplifyOverloadedOperators3); // #9881 - hang
TEST_CASE(simplifyNullArray); TEST_CASE(simplifyNullArray);
@ -6665,6 +6666,24 @@ private:
tokenizeAndStringify(code)); tokenizeAndStringify(code));
} }
void simplifyOverloadedOperators3() { // #9881
const char code[] = "struct Func { double operator()(double x) const; };\n"
"void foo(double, double);\n"
"void test() {\n"
" Func max;\n"
" double y = 0;\n"
" foo(0, max(y));\n"
"}";
ASSERT_EQUALS("struct Func { double operator() ( double x ) const ; } ;\n"
"void foo ( double , double ) ;\n"
"void test ( ) {\n"
"Func max ;\n"
"double y ; y = 0 ;\n"
"foo ( 0 , max . operator() ( y ) ) ;\n"
"}",
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;"));
} }