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

Fixed #3934 (False positive for logical conjunction with enum and define)

This commit is contained in:
Daniel Marjamäki 2012-07-07 15:34:26 +02:00
parent d3c44c20ff
commit 49198f52c4
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/tokenize.cpp
View File

@ -7099,6 +7099,7 @@ void Tokenizer::simplifyEnum()
if (ev.start == NULL) { if (ev.start == NULL) {
tok1 = ev.value; tok1 = ev.value;
lastEnumValueStart = lastEnumValueEnd = NULL; lastEnumValueStart = lastEnumValueEnd = NULL;
lastValue = MathLib::toLongNumber(ev.value->str());
} }
} }
} }

5
test/testsimplifytokens.cpp
View File

@ -347,6 +347,7 @@ private:
TEST_CASE(enum28); TEST_CASE(enum28);
TEST_CASE(enum29); // ticket #3747 (bitwise or value) TEST_CASE(enum29); // ticket #3747 (bitwise or value)
TEST_CASE(enum30); // ticket #3852 (false positive) TEST_CASE(enum30); // ticket #3852 (false positive)
TEST_CASE(enum31); // ticket #3934 (calculation in first item)
// remove "std::" on some standard functions // remove "std::" on some standard functions
TEST_CASE(removestd); TEST_CASE(removestd);
@ -7027,6 +7028,10 @@ private:
TODO_ASSERT_EQUALS("","[test.cpp:12] -> [test.cpp:7]: (style) Variable 'two' hides enumerator with same name\n", errout.str()); TODO_ASSERT_EQUALS("","[test.cpp:12] -> [test.cpp:7]: (style) Variable 'two' hides enumerator with same name\n", errout.str());
} }
void enum31() { // #3934 - calculation in first item
const char code[] = "enum { x=2*32, y }; i = y;";
ASSERT_EQUALS("i = 65 ;", checkSimplifyEnum(code));
}
void removestd() { void removestd() {
ASSERT_EQUALS("; strcpy ( a , b ) ;", tok("; std::strcpy(a,b);")); ASSERT_EQUALS("; strcpy ( a , b ) ;", tok("; std::strcpy(a,b);"));