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

Ticket #5297: simplifyCalculations should pass once more on tokens being simplified.

This commit is contained in:
Simon Martin 2014-05-10 09:37:56 +02:00
parent edd84c0906
commit 1e4902cb65
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/templatesimplifier.cpp
View File

@ -928,8 +928,12 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok)
// should be moved away. // should be moved away.
bool TemplateSimplifier::simplifyCalculations(Token *_tokens) bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
{ {
bool ret = false; bool ret = false, goback = false;
for (Token *tok = _tokens; tok; tok = tok->next()) { for (Token *tok = _tokens; tok; tok = tok->next()) {
if (goback) {
tok = tok->previous();
goback = false;
}
// Remove parentheses around variable.. // Remove parentheses around variable..
// keep parentheses here: dynamic_cast<Fred *>(p); // keep parentheses here: dynamic_cast<Fred *>(p);
// keep parentheses here: A operator * (int); // keep parentheses here: A operator * (int);
@ -1096,6 +1100,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
tok->str(result); tok->str(result);
tok->deleteNext(2); tok->deleteNext(2);
ret = true; ret = true;
goback = true;
} }
} }
} }

11
test/testsimplifytokens.cpp
View File

@ -136,6 +136,7 @@ private:
TEST_CASE(template41); // #4710 - const in instantiation not handled perfectly TEST_CASE(template41); // #4710 - const in instantiation not handled perfectly
TEST_CASE(template42); // #4878 - variadic templates TEST_CASE(template42); // #4878 - variadic templates
TEST_CASE(template43); // #5097 - assert due to '>>' not treated as end of template instantiation TEST_CASE(template43); // #5097 - assert due to '>>' not treated as end of template instantiation
TEST_CASE(template44); // #5297 - TemplateSimplifier::simplifyCalculations not eager enough
TEST_CASE(template_unhandled); TEST_CASE(template_unhandled);
TEST_CASE(template_default_parameter); TEST_CASE(template_default_parameter);
TEST_CASE(template_default_type); TEST_CASE(template_default_type);
@ -2379,6 +2380,16 @@ private:
tok(code); // Don't assert tok(code); // Don't assert
} }
void template44() { // #5297
tok("template<class T> struct StackContainer {"
" void foo(int i) {"
" if (0 >= 1 && i<0) {}"
" }"
"};"
"template<class T> class ZContainer : public StackContainer<T> {};"
"struct FGSTensor {};"
"class FoldedZContainer : public ZContainer<FGSTensor> {};");
}
void template_default_parameter() { void template_default_parameter() {
{ {