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

Clang import; minor tweaks

This commit is contained in:
Daniel Marjamäki 2020-01-12 18:05:45 +01:00
parent 1e207e42c5
commit ae7ff940e6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/clangimport.cpp
View File

@ -326,8 +326,12 @@ void clangimport::AstNode::setLocations(TokenList *tokenList, int file, int line
line = std::atoi(ext.substr(6).c_str()); line = std::atoi(ext.substr(6).c_str());
if (ext.find(", col:") != std::string::npos) if (ext.find(", col:") != std::string::npos)
col = std::atoi(ext.c_str() + ext.find(", col:") + 6); col = std::atoi(ext.c_str() + ext.find(", col:") + 6);
} else if (ext[0] == '<' && ext.find(":") != std::string::npos) } else if (ext[0] == '<' && ext.find(":") != std::string::npos) {
file = tokenList->appendFileIfNew(ext.substr(1,ext.find(":") - 1)); std::string::size_type sep1 = ext.find(":");
std::string::size_type sep2 = ext.find(":", sep1+1);
file = tokenList->appendFileIfNew(ext.substr(1, sep1 - 1));
line = MathLib::toLongNumber(ext.substr(sep1+1, sep2-sep1));
}
} }
mFile = file; mFile = file;
mLine = line; mLine = line;
@ -625,8 +629,11 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
} }
return nullptr; return nullptr;
} }
if (nodeType == ImplicitCastExpr) if (nodeType == ImplicitCastExpr) {
return children[0]->createTokens(tokenList); Token *expr = children[0]->createTokens(tokenList);
setValueType(expr);
return expr;
}
if (nodeType == IntegerLiteral) if (nodeType == IntegerLiteral)
return addtoken(tokenList, mExtTokens.back()); return addtoken(tokenList, mExtTokens.back());
if (nodeType == NullStmt) if (nodeType == NullStmt)