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

Clang import; Testing that token index is set properly

This commit is contained in:
Daniel Marjamäki 2021-01-06 11:19:14 +01:00
parent 0bd401c17b
commit 9e4e06a524
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/clangimport.cpp
View File

@ -1558,7 +1558,8 @@ void clangimport::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
throw InternalError(tok, "Token::link() is not set properly"); throw InternalError(tok, "Token::link() is not set properly");
} }
tokenList->front()->assignIndexes(); if (tokenList->front())
tokenList->front()->assignIndexes();
symbolDatabase->clangSetVariables(data.getVariableList()); symbolDatabase->clangSetVariables(data.getVariableList());
symbolDatabase->createSymbolDatabaseExprIds(); symbolDatabase->createSymbolDatabaseExprIds();
tokenList->clangSetOrigFiles(); tokenList->clangSetOrigFiles();

18
test/testclangimport.cpp
View File

@ -109,6 +109,7 @@ private:
TEST_CASE(whileStmt1); TEST_CASE(whileStmt1);
TEST_CASE(whileStmt2); TEST_CASE(whileStmt2);
TEST_CASE(tokenIndex);
TEST_CASE(symbolDatabaseEnum1); TEST_CASE(symbolDatabaseEnum1);
TEST_CASE(symbolDatabaseFunction1); TEST_CASE(symbolDatabaseFunction1);
TEST_CASE(symbolDatabaseFunction2); TEST_CASE(symbolDatabaseFunction2);
@ -1028,16 +1029,25 @@ private:
} }
#define GET_SYMBOL_DB(clang) \ #define GET_SYMBOL_DB(AST) \
Settings settings; \ Settings settings; \
settings.clang = true; \ settings.clang = true; \
settings.platform(cppcheck::Platform::PlatformType::Unix64); \ settings.platform(cppcheck::Platform::PlatformType::Unix64); \
Tokenizer tokenizer(&settings, this); \ Tokenizer tokenizer(&settings, this); \
std::istringstream istr(clang); \ std::istringstream istr(AST); \
clangimport::parseClangAstDump(&tokenizer, istr); \ clangimport::parseClangAstDump(&tokenizer, istr); \
const SymbolDatabase *db = tokenizer.getSymbolDatabase(); \ const SymbolDatabase *db = tokenizer.getSymbolDatabase(); \
ASSERT(db); \ ASSERT(db)
do {} while(false)
void tokenIndex() {
const char clang[] = "`-FunctionDecl 0x1e07dd0 <67.cpp:1:1, col:13> col:6 foo 'void ()'\n"
" `-CompoundStmt 0x1e07eb8 <col:12, col:13>";
ASSERT_EQUALS("void foo ( ) { }", parse(clang));
GET_SYMBOL_DB(clang);
const Token *tok = tokenizer.tokens();
ASSERT_EQUALS(tok->index() + 1, tok->next()->index());
}
void symbolDatabaseEnum1() { void symbolDatabaseEnum1() {
const char clang[] = "|-NamespaceDecl 0x29ad5f8 <1.cpp:1:1, line:3:1> line:1:11 ns\n" const char clang[] = "|-NamespaceDecl 0x29ad5f8 <1.cpp:1:1, line:3:1> line:1:11 ns\n"