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

fix #3561 (SymbolDatabase: throw foo; creates a variable with type throw)

This commit is contained in:
Robert Reif 2012-01-27 19:24:01 -05:00
parent 8289e2428d
commit 42afd2d63a
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/symboldatabase.cpp
View File

@ -1905,6 +1905,9 @@ inline const Token* skipPointers(const Token* tok)
bool Scope::isVariableDeclaration(const Token* tok, const Token*& vartok, const Token*& typetok, bool &isArray, bool &isPointer, bool &isReference) const
{
if (tok && tok->str() == "throw" && check->_tokenizer->isCPP())
return false;
const Token* localTypeTok = skipScopeIdentifiers(tok);
const Token* localVarTok = NULL;

2
lib/tokenize.cpp
View File

@ -2855,7 +2855,7 @@ void Tokenizer::setVarId()
if (tok->str() == "new")
continue;
if (tok->str() == "throw")
if (tok->str() == "throw" && isCPP())
continue;
if (tok->str() == "virtual")

32
test/testsymboldatabase.cpp
View File

@ -28,6 +28,14 @@
tokenizer.tokenize(istr, "test.cpp"); \
const SymbolDatabase *db = tokenizer.getSymbolDatabase();
#define GET_SYMBOL_DB_C(code) \
errout.str(""); \
Settings settings; \
Tokenizer tokenizer(&settings, this); \
std::istringstream istr(code); \
tokenizer.tokenize(istr, "test.c"); \
const SymbolDatabase *db = tokenizer.getSymbolDatabase();
class TestSymbolDatabase: public TestFixture {
public:
TestSymbolDatabase()
@ -143,6 +151,8 @@ private:
TEST_CASE(symboldatabase22); // ticket #3437 (segmentation fault)
TEST_CASE(symboldatabase23); // ticket #3435
TEST_CASE(symboldatabase24); // ticket #3508 (constructor, destructor)
TEST_CASE(symboldatabase25); // ticket #3561 (throw C++)
TEST_CASE(symboldatabase26); // ticket #3561 (throw C)
}
void test_isVariableDeclarationCanHandleNull() {
@ -1085,6 +1095,28 @@ private:
}
// #ticket #3561 (throw C++)
void symboldatabase25() {
const std::string str("int main() {\n"
" foo bar;\n"
" throw bar;\n"
"}");
GET_SYMBOL_DB(str.c_str());
check(str.c_str(), false);
ASSERT_EQUALS("", errout.str());
ASSERT(db && db->getVariableListSize() == 2); // index 0 + 1 variable
}
// #ticket #3561 (throw C)
void symboldatabase26() {
const std::string str("int main() {\n"
" throw bar;\n"
"}");
GET_SYMBOL_DB_C(str.c_str());
check(str.c_str(), false);
ASSERT_EQUALS("", errout.str());
ASSERT(db && db->getVariableListSize() == 2); // index 0 + 1 variable
}
};