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

Clang import; Refactoring

This commit is contained in:
Daniel Marjamäki 2020-01-07 19:51:44 +01:00
parent e5b99d3299
commit d75d9c1866
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/clangastdump.cpp
View File

@ -138,6 +138,7 @@ namespace clangastdump {
Token *addTypeTokens(TokenList *tokenList, const std::string &str);
Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode);
Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children);
void createTokensVarDecl(TokenList *tokenList);
std::string getSpelling() const;
std::string getType() const;
const Scope *getNestedInScope(TokenList *tokenList);
@ -308,25 +309,7 @@ Token *clangastdump::AstNode::createTokens(TokenList *tokenList)
return reftok;
}
if (nodeType == FieldDecl) {
bool isInit = mExtTokens.back() == "cinit";
const std::string addr = mExtTokens.front();
const std::string type = isInit ? mExtTokens[mExtTokens.size() - 2] : mExtTokens.back();
const std::string name = isInit ? mExtTokens[mExtTokens.size() - 3] : mExtTokens[mExtTokens.size() - 2];
addTypeTokens(tokenList, type);
Token *vartok1 = addtoken(tokenList, name);
Scope *scope = const_cast<Scope *>(tokenList->back()->scope());
const AccessControl accessControl = (scope->type == Scope::ScopeType::eGlobal) ? (AccessControl::Global) : (AccessControl::Local);
scope->varlist.push_back(Variable(vartok1, type, 0, accessControl, nullptr, scope));
mData->varDecl(addr, vartok1, &scope->varlist.back());
addtoken(tokenList, ";");
if (isInit) {
Token *vartok2 = addtoken(tokenList, name);
mData->ref(addr, vartok2);
Token *eq = addtoken(tokenList, "=");
eq->astOperand1(vartok2);
eq->astOperand2(children.back()->createTokens(tokenList));
addtoken(tokenList, ";");
}
createTokensVarDecl(tokenList);
return nullptr;
}
if (nodeType == FunctionDecl) {
@ -417,6 +400,14 @@ Token *clangastdump::AstNode::createTokens(TokenList *tokenList)
return unop;
}
if (nodeType == VarDecl) {
createTokensVarDecl(tokenList);
return nullptr;
}
return addtoken(tokenList, "?" + nodeType + "?");
}
void clangastdump::AstNode::createTokensVarDecl(TokenList *tokenList)
{
bool isInit = mExtTokens.back() == "cinit";
const std::string addr = mExtTokens.front();
const std::string type = isInit ? mExtTokens[mExtTokens.size() - 2] : mExtTokens.back();
@ -436,9 +427,6 @@ Token *clangastdump::AstNode::createTokens(TokenList *tokenList)
eq->astOperand2(children.back()->createTokens(tokenList));
addtoken(tokenList, ";");
}
return nullptr;
}
return addtoken(tokenList, "?" + nodeType + "?");
}
void clangastdump::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)