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

Clang import; ForStmt

This commit is contained in:
Daniel Marjamäki 2020-01-08 10:35:44 +01:00
parent 4b7e6c68b0
commit 61039023b2
2 changed files with 65 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/clangastdump.cpp
View File

@ -31,7 +31,9 @@ static const std::string BinaryOperator = "BinaryOperator";
static const std::string CallExpr = "CallExpr"; static const std::string CallExpr = "CallExpr";
static const std::string CompoundStmt = "CompoundStmt"; static const std::string CompoundStmt = "CompoundStmt";
static const std::string DeclRefExpr = "DeclRefExpr"; static const std::string DeclRefExpr = "DeclRefExpr";
static const std::string DeclStmt = "DeclStmt";
static const std::string FieldDecl = "FieldDecl"; static const std::string FieldDecl = "FieldDecl";
static const std::string ForStmt = "ForStmt";
static const std::string FunctionDecl = "FunctionDecl"; static const std::string FunctionDecl = "FunctionDecl";
static const std::string IfStmt = "IfStmt"; static const std::string IfStmt = "IfStmt";
static const std::string ImplicitCastExpr = "ImplicitCastExpr"; static const std::string ImplicitCastExpr = "ImplicitCastExpr";
@ -136,13 +138,19 @@ namespace clangastdump {
void setLocations(TokenList *tokenList, int file, int line, int col); void setLocations(TokenList *tokenList, int file, int line, int col);
void dumpAst(int num = 0, int indent = 0) const; void dumpAst(int num = 0, int indent = 0) const;
Token *createTokens(TokenList *tokenList); void createTokens1(TokenList *tokenList) {
setLocations(tokenList, 0, 1, 1);
createTokens(tokenList);
if (nodeType == VarDecl || nodeType == RecordDecl)
addtoken(tokenList, ";");
}
private: private:
Token *createTokens(TokenList *tokenList);
Token *addtoken(TokenList *tokenList, const std::string &str); Token *addtoken(TokenList *tokenList, const std::string &str);
void addTypeTokens(TokenList *tokenList, const std::string &str); void addTypeTokens(TokenList *tokenList, const std::string &str);
Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode); Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, AstNodePtr astNode);
Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children); Scope *createScope(TokenList *tokenList, Scope::ScopeType scopeType, const std::vector<AstNodePtr> &children);
void createTokensVarDecl(TokenList *tokenList); Token *createTokensVarDecl(TokenList *tokenList);
std::string getSpelling() const; std::string getSpelling() const;
std::string getType() const; std::string getType() const;
const Scope *getNestedInScope(TokenList *tokenList); const Scope *getNestedInScope(TokenList *tokenList);
@ -312,14 +320,33 @@ Token *clangastdump::AstNode::createTokens(TokenList *tokenList)
} }
return nullptr; return nullptr;
} }
if (nodeType == DeclStmt)
return children[0]->createTokens(tokenList);
if (nodeType == DeclRefExpr) { if (nodeType == DeclRefExpr) {
const std::string addr = mExtTokens[mExtTokens.size() - 3]; const std::string addr = mExtTokens[mExtTokens.size() - 3];
Token *reftok = addtoken(tokenList, unquote(mExtTokens[mExtTokens.size() - 2])); Token *reftok = addtoken(tokenList, unquote(mExtTokens[mExtTokens.size() - 2]));
mData->ref(addr, reftok); mData->ref(addr, reftok);
return reftok; return reftok;
} }
if (nodeType == FieldDecl) { if (nodeType == FieldDecl)
createTokensVarDecl(tokenList); return createTokensVarDecl(tokenList);
if (nodeType == ForStmt) {
Token *forToken = addtoken(tokenList, "for");
Token *par1 = addtoken(tokenList, "(");
Token *expr1 = children[0]->createTokens(tokenList);
Token *sep1 = addtoken(tokenList, ";");
Token *expr2 = children[2]->createTokens(tokenList);
Token *sep2 = addtoken(tokenList, ";");
Token *expr3 = children[3]->createTokens(tokenList);
Token *par2 = addtoken(tokenList, ")");
par1->link(par2);
par1->astOperand1(forToken);
par1->astOperand2(sep1);
sep1->astOperand1(expr1);
sep1->astOperand2(sep2);
sep2->astOperand1(expr2);
sep2->astOperand2(expr3);
createScope(tokenList, Scope::ScopeType::eFor, children[4]);
return nullptr; return nullptr;
} }
if (nodeType == FunctionDecl) { if (nodeType == FunctionDecl) {
@ -418,14 +445,12 @@ Token *clangastdump::AstNode::createTokens(TokenList *tokenList)
unop->astOperand1(children[0]->createTokens(tokenList)); unop->astOperand1(children[0]->createTokens(tokenList));
return unop; return unop;
} }
if (nodeType == VarDecl) { if (nodeType == VarDecl)
createTokensVarDecl(tokenList); return createTokensVarDecl(tokenList);
return nullptr;
}
return addtoken(tokenList, "?" + nodeType + "?"); return addtoken(tokenList, "?" + nodeType + "?");
} }
void clangastdump::AstNode::createTokensVarDecl(TokenList *tokenList) Token * clangastdump::AstNode::createTokensVarDecl(TokenList *tokenList)
{ {
bool isInit = mExtTokens.back() == "cinit"; bool isInit = mExtTokens.back() == "cinit";
const std::string addr = mExtTokens.front(); const std::string addr = mExtTokens.front();
@ -437,15 +462,13 @@ void clangastdump::AstNode::createTokensVarDecl(TokenList *tokenList)
const AccessControl accessControl = (scope->type == Scope::ScopeType::eGlobal) ? (AccessControl::Global) : (AccessControl::Local); const AccessControl accessControl = (scope->type == Scope::ScopeType::eGlobal) ? (AccessControl::Global) : (AccessControl::Local);
scope->varlist.push_back(Variable(vartok1, type, 0, accessControl, nullptr, scope)); scope->varlist.push_back(Variable(vartok1, type, 0, accessControl, nullptr, scope));
mData->varDecl(addr, vartok1, &scope->varlist.back()); mData->varDecl(addr, vartok1, &scope->varlist.back());
addtoken(tokenList, ";");
if (isInit) { if (isInit) {
Token *vartok2 = addtoken(tokenList, name);
mData->ref(addr, vartok2);
Token *eq = addtoken(tokenList, "="); Token *eq = addtoken(tokenList, "=");
eq->astOperand1(vartok2); eq->astOperand1(vartok1);
eq->astOperand2(children.back()->createTokens(tokenList)); eq->astOperand2(children.back()->createTokens(tokenList));
addtoken(tokenList, ";"); return eq;
} }
return vartok1;
} }
void clangastdump::parseClangAstDump(Tokenizer *tokenizer, std::istream &f) void clangastdump::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
@ -477,10 +500,8 @@ void clangastdump::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
const std::string ext = line.substr(pos2); const std::string ext = line.substr(pos2);
if (pos1 == 1 && endsWith(nodeType, "Decl", 4) && nodeType != "TypedefDecl") { if (pos1 == 1 && endsWith(nodeType, "Decl", 4) && nodeType != "TypedefDecl") {
if (!tree.empty()) { if (!tree.empty())
tree[0]->setLocations(tokenList, 0, 1, 1); tree[0]->createTokens1(tokenList);
tree[0]->createTokens(tokenList);
}
tree.clear(); tree.clear();
tree.push_back(std::make_shared<AstNode>(nodeType, ext, &data)); tree.push_back(std::make_shared<AstNode>(nodeType, ext, &data));
continue; continue;
@ -498,12 +519,8 @@ void clangastdump::parseClangAstDump(Tokenizer *tokenizer, std::istream &f)
tree[level] = newNode; tree[level] = newNode;
} }
if (!tree.empty()) { if (!tree.empty())
//if (tokenizer->getSettings()->debugnormal) tree[0]->createTokens1(tokenList);
// tree[0]->dumpAst();
tree[0]->setLocations(tokenList, 0, 1, 1);
tree[0]->createTokens(tokenList);
}
symbolDatabase->clangSetVariables(data.getVariableList()); symbolDatabase->clangSetVariables(data.getVariableList());
tokenList->clangSetOrigFiles(); tokenList->clangSetOrigFiles();

28
test/testclangastdump.cpp
View File

@ -29,6 +29,7 @@ public:
private: private:
void run() OVERRIDE { void run() OVERRIDE {
TEST_CASE(forStmt);
TEST_CASE(funcdecl1); TEST_CASE(funcdecl1);
TEST_CASE(funcdecl2); TEST_CASE(funcdecl2);
TEST_CASE(ifelse); TEST_CASE(ifelse);
@ -46,6 +47,25 @@ private:
return tokenizer.tokens()->stringifyList(true, false, false, true, false); return tokenizer.tokens()->stringifyList(true, false, false, true, false);
} }
void forStmt() {
const char clang[] = "`-FunctionDecl 0x2f93ae0 <1.c:1:1, col:56> col:5 main 'int ()'\n"
" `-CompoundStmt 0x2f93dc0 <col:12, col:56>\n"
" |-ForStmt 0x2f93d50 <col:14, col:44>\n"
" | |-DeclStmt 0x2f93c58 <col:19, col:28>\n"
" | | `-VarDecl 0x2f93bd8 <col:19, col:27> col:23 used i 'int' cinit\n"
" | | `-IntegerLiteral 0x2f93c38 <col:27> 'int' 0\n"
" | |-<<<NULL>>>\n"
" | |-BinaryOperator 0x2f93cd0 <col:30, col:34> 'int' '<'\n"
" | | |-ImplicitCastExpr 0x2f93cb8 <col:30> 'int' <LValueToRValue>\n"
" | | | `-DeclRefExpr 0x2f93c70 <col:30> 'int' lvalue Var 0x2f93bd8 'i' 'int'\n"
" | | `-IntegerLiteral 0x2f93c98 <col:34> 'int' 10\n"
" | |-UnaryOperator 0x2f93d20 <col:38, col:39> 'int' postfix '++'\n"
" | | `-DeclRefExpr 0x2f93cf8 <col:38> 'int' lvalue Var 0x2f93bd8 'i' 'int'\n"
" | `-CompoundStmt 0x2f93d40 <col:43, col:44>\n"
" `-ReturnStmt 0x2f93da8 <col:46, col:53>\n"
" `-IntegerLiteral 0x2f93d88 <col:53> 'int' 0";
ASSERT_EQUALS("int main ( ) { for ( int i@1 = 0 ; i@1 < 10 ; ++ i@1 ) { } ; return 0 ; }", parse(clang));
}
void funcdecl1() { void funcdecl1() {
const char clang[] = "`-FunctionDecl 0x3122c30 <1.c:1:1, col:22> col:6 foo 'void (int, int)'\n" const char clang[] = "`-FunctionDecl 0x3122c30 <1.c:1:1, col:22> col:6 foo 'void (int, int)'\n"
@ -100,7 +120,7 @@ private:
" `-ImplicitCastExpr 0x2441e40 <col:30, col:32> 'int' <LValueToRValue>\n" " `-ImplicitCastExpr 0x2441e40 <col:30, col:32> 'int' <LValueToRValue>\n"
" `-MemberExpr 0x2441e08 <col:30, col:32> 'int' lvalue .x 0x2441b48\n" " `-MemberExpr 0x2441e08 <col:30, col:32> 'int' lvalue .x 0x2441b48\n"
" `-DeclRefExpr 0x2441de0 <col:30> 'struct S':'struct S' lvalue ParmVar 0x2441be8 's' 'struct S':'struct S'"; " `-DeclRefExpr 0x2441de0 <col:30> 'struct S':'struct S' lvalue ParmVar 0x2441be8 's' 'struct S':'struct S'";
ASSERT_EQUALS("struct S { int x@1 ; }\n" ASSERT_EQUALS("struct S { int x@1 ; } ;\n"
"int foo ( struct S s@2 ) { return s@2 . x@1 ; }", "int foo ( struct S s@2 ) { return s@2 . x@1 ; }",
parse(clang)); parse(clang));
} }
@ -111,7 +131,7 @@ private:
" `-FieldDecl 0x354ebe8 <line:3:3, col:7> col:7 y 'int'"; " `-FieldDecl 0x354ebe8 <line:3:3, col:7> col:7 y 'int'";
ASSERT_EQUALS("struct S\n" ASSERT_EQUALS("struct S\n"
"{ int x@1 ;\n" "{ int x@1 ;\n"
"int y@2 ; }", "int y@2 ; } ;",
parse(clang)); parse(clang));
} }
@ -122,8 +142,8 @@ private:
" `-ImplicitCastExpr 0x32b8c00 <col:9> 'int' <LValueToRValue>\n" " `-ImplicitCastExpr 0x32b8c00 <col:9> 'int' <LValueToRValue>\n"
" `-DeclRefExpr 0x32b8bd8 <col:9> 'int' lvalue Var 0x32b8aa0 'a' 'int'"; " `-DeclRefExpr 0x32b8bd8 <col:9> 'int' lvalue Var 0x32b8aa0 'a' 'int'";
ASSERT_EQUALS("int a@1 ; a@1 = 1 ;\n" ASSERT_EQUALS("int a@1 = 1 ;\n"
"int b@2 ; b@2 = a@1 ;", "int b@2 = a@1 ;",
parse(clang)); parse(clang));
} }