mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:stringconcat: Handle base case of recursion into left arg

Browse Source 
Change-Id: I9ed8586e8b77b009d55e411fdaa863eefc38b1c2
This commit is contained in:
Stephan Bergmann
2015-12-02 11:38:07 +01:00
parent a38110216c
commit f540e9264c
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
compilerplugins/clang/stringconcat.cxx
View File

@@ -39,8 +39,12 @@ bool StringConcat::VisitCallExpr(CallExpr const * expr) {
{ {
return true; return true;
} }
CallExpr const * left = dyn_cast<CallExpr>( SourceLocation leftLoc;
expr->getArg(0)->IgnoreParenImpCasts()); auto const leftExpr = expr->getArg(0)->IgnoreParenImpCasts();
if (isa<StringLiteral>(leftExpr)) {
leftLoc = leftExpr->getLocStart();
} else {
CallExpr const * left = dyn_cast<CallExpr>(leftExpr);
if (left == nullptr) { if (left == nullptr) {
return true; return true;
} }
@@ -56,6 +60,8 @@ bool StringConcat::VisitCallExpr(CallExpr const * expr) {
{ {
return true; return true;
} }
leftLoc = left->getArg(1)->getLocStart();
}
StringRef name { StringRef name {
compiler.getSourceManager().getFilename( compiler.getSourceManager().getFilename(
compiler.getSourceManager().getSpellingLoc(expr->getLocStart())) }; compiler.getSourceManager().getSpellingLoc(expr->getLocStart())) };
@@ -70,8 +76,7 @@ bool StringConcat::VisitCallExpr(CallExpr const * expr) {
"replace '%0' between string literals with juxtaposition", "replace '%0' between string literals with juxtaposition",
op == nullptr ? expr->getExprLoc() : op->getOperatorLoc()) op == nullptr ? expr->getExprLoc() : op->getOperatorLoc())
<< (oo == OverloadedOperatorKind::OO_Plus ? "+" : "<<") << (oo == OverloadedOperatorKind::OO_Plus ? "+" : "<<")
<< SourceRange( << SourceRange(leftLoc, expr->getArg(1)->getLocEnd());
left->getArg(1)->getLocStart(), expr->getArg(1)->getLocEnd());
return true; return true;
} }