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

Clang import; Improved handling of constructor

This commit is contained in:
Daniel Marjamäki 2020-04-12 17:13:58 +02:00
parent 0d1a476b1f
commit 4dfb793cd2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/clangimport.cpp
View File

@ -632,15 +632,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
return par1; return par1;
} }
if (nodeType == CXXConstructorDecl) { if (nodeType == CXXConstructorDecl) {
bool hasBody = false; createTokensFunctionDecl(tokenList);
for (AstNodePtr child: children) {
if (child->nodeType == CompoundStmt && !child->children.empty()) {
hasBody = true;
break;
}
}
if (hasBody)
createTokensFunctionDecl(tokenList);
return nullptr; return nullptr;
} }
if (nodeType == CXXDeleteExpr) { if (nodeType == CXXDeleteExpr) {
@ -1065,13 +1057,16 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
const bool hasBody = mFile == 0 && !children.empty() && children.back()->nodeType == CompoundStmt; const bool hasBody = mFile == 0 && !children.empty() && children.back()->nodeType == CompoundStmt;
SymbolDatabase *symbolDatabase = mData->mSymbolDatabase; SymbolDatabase *symbolDatabase = mData->mSymbolDatabase;
addTypeTokens(tokenList, '\'' + getType() + '\''); if (nodeType != CXXConstructorDecl)
addTypeTokens(tokenList, '\'' + getType() + '\'');
Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters()); Token *nameToken = addtoken(tokenList, getSpelling() + getTemplateParameters());
Scope *nestedIn = const_cast<Scope *>(nameToken->scope()); Scope *nestedIn = const_cast<Scope *>(nameToken->scope());
if (!prev) { if (!prev) {
nestedIn->functionList.push_back(Function(nameToken)); nestedIn->functionList.push_back(Function(nameToken));
mData->funcDecl(mExtTokens.front(), nameToken, &nestedIn->functionList.back()); mData->funcDecl(mExtTokens.front(), nameToken, &nestedIn->functionList.back());
if (nodeType == CXXConstructorDecl)
nestedIn->functionList.back().type = Function::Type::eConstructor;
} else { } else {
const std::string addr = *(std::find(mExtTokens.begin(), mExtTokens.end(), "prev") + 1); const std::string addr = *(std::find(mExtTokens.begin(), mExtTokens.end(), "prev") + 1);
mData->ref(addr, nameToken); mData->ref(addr, nameToken);
@ -1091,6 +1086,9 @@ void clangimport::AstNode::createTokensFunctionDecl(TokenList *tokenList)
} }
Token *par1 = addtoken(tokenList, "("); Token *par1 = addtoken(tokenList, "(");
if (!prev)
function->arg = par1;
function->token = nameToken;
// Function arguments // Function arguments
function->argumentList.clear(); function->argumentList.clear();
for (int i = 0; i < children.size(); ++i) { for (int i = 0; i < children.size(); ++i) {