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

Clang import: Better handling of scope types

This commit is contained in:
Daniel Marjamäki 2020-11-07 15:02:36 +01:00
parent 88a35d2253
commit ff17d3e7c6
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/clangimport.cpp
View File

@ -117,7 +117,16 @@ static std::vector<std::string> splitString(const std::string &line)
pos2 = line.find("\'", pos2 + 3); pos2 = line.find("\'", pos2 + 3);
} else { } else {
pos2 = line.find(" ", pos1) - 1; pos2 = line.find(" ", pos1) - 1;
if (std::isalpha(line[pos1]) && if ((std::isalpha(line[pos1]) || line[pos1] == '_') &&
line.find("::", pos1) < pos2 &&
line.find("::", pos1) < line.find("<", pos1)) {
pos2 = line.find("::", pos1);
ret.push_back(line.substr(pos1, pos2-pos1));
ret.push_back("::");
pos1 = pos2 + 2;
continue;
}
if ((std::isalpha(line[pos1]) || line[pos1] == '_') &&
line.find("<", pos1) < pos2 && line.find("<", pos1) < pos2 &&
line.find("<<",pos1) != line.find("<",pos1) && line.find("<<",pos1) != line.find("<",pos1) &&
line.find(">", pos1) != std::string::npos && line.find(">", pos1) != std::string::npos &&
@ -457,7 +466,7 @@ const ::Type * clangimport::AstNode::addTypeTokens(TokenList *tokenList, const s
for (const Token *typeToken = tokenList->back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) { for (const Token *typeToken = tokenList->back(); Token::Match(typeToken, "&|*|%name%"); typeToken = typeToken->previous()) {
if (!typeToken->isName()) if (!typeToken->isName())
continue; continue;
const ::Type *recordType = scope->findType(typeToken->str()); const ::Type *recordType = scope->check->findVariableType(scope, typeToken);
if (recordType) { if (recordType) {
const_cast<Token*>(typeToken)->type(recordType); const_cast<Token*>(typeToken)->type(recordType);
return recordType; return recordType;