CI; Fix self check false positive

danmar · danmar · commit f6efd8c6be1a · 2021-07-18T20:00:20.000+02:00
diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -273,11 +273,11 @@ void CheckFunctions::checkMissingReturn()
         }
         if (inconclusive && Token::simpleMatch(scope->bodyEnd->tokAt(-2), ") ; }")) {
             const Token *ftok = scope->bodyEnd->linkAt(-2)->previous();
-            if (mSettings->library.isNotLibraryFunction(ftok) && !ftok->isKeyword()) {
+            if (mSettings->library.isNotLibraryFunction(ftok)) {
                 const Token *tok = ftok;
                 while (Token::Match(tok->tokAt(-2), "%name% :: %name%"))
                     tok = tok->tokAt(-2);
-                if (Token::Match(tok->previous(), "[;{}] %name% (|::"))
+                if (Token::Match(tok->previous(), "[;{}] %name% (|::") && !tok->isKeyword())
                     missingReturnError(tok, Certainty::inconclusive);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -273,11 +273,11 @@ void CheckFunctions::checkMissingReturn()`
`273`	`273`	`}`
`274`	`274`	`if (inconclusive && Token::simpleMatch(scope->bodyEnd->tokAt(-2), ") ; }")) {`
`275`	`275`	`const Token *ftok = scope->bodyEnd->linkAt(-2)->previous();`
`276`		`- if (mSettings->library.isNotLibraryFunction(ftok) && !ftok->isKeyword()) {`
	`276`	`+ if (mSettings->library.isNotLibraryFunction(ftok)) {`
`277`	`277`	`const Token *tok = ftok;`
`278`	`278`	`while (Token::Match(tok->tokAt(-2), "%name% :: %name%"))`
`279`	`279`	`tok = tok->tokAt(-2);`
`280`		`- if (Token::Match(tok->previous(), "[;{}] %name% (\|::"))`
	`280`	`+ if (Token::Match(tok->previous(), "[;{}] %name% (\|::") && !tok->isKeyword())`
`281`	`281`	`missingReturnError(tok, Certainty::inconclusive);`
`282`	`282`	`}`
`283`	`283`	`}`