maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[NFC] Clean up braces and anon namespace

This commit is contained in:
Nathan James 2020-07-05 11:16:40 +01:00
parent 779432690f
commit e8158bf0e7
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clang-tools-extra/clang-tidy/readability/ElseAfterReturnCheck.cpp
View File

@ -19,7 +19,6 @@ namespace clang {
namespace tidy {
namespace readability {
namespace {
static const char ReturnStr[] = "return";
static const char ContinueStr[] = "continue";
static const char BreakStr[] = "break";
@ -28,44 +27,40 @@ static const char WarningMessage[] = "do not use 'else' after '%0'";
static const char WarnOnUnfixableStr[] = "WarnOnUnfixable";
static const char WarnOnConditionVariablesStr[] = "WarnOnConditionVariables";
const DeclRefExpr *findUsage(const Stmt *Node, int64_t DeclIdentifier) {
static const DeclRefExpr *findUsage(const Stmt *Node, int64_t DeclIdentifier) {
if (!Node)
return nullptr;
if (const auto *DeclRef = dyn_cast<DeclRefExpr>(Node)) {
if (DeclRef->getDecl()->getID() == DeclIdentifier) {
if (DeclRef->getDecl()->getID() == DeclIdentifier)
return DeclRef;
}
} else {
for (const Stmt *ChildNode : Node->children()) {
if (const DeclRefExpr *Result = findUsage(ChildNode, DeclIdentifier)) {
if (const DeclRefExpr *Result = findUsage(ChildNode, DeclIdentifier))
return Result;
}
}
}
return nullptr;
}
const DeclRefExpr *
static const DeclRefExpr *
findUsageRange(const Stmt *Node,
const llvm::iterator_range<int64_t *> &DeclIdentifiers) {
const llvm::ArrayRef<int64_t> &DeclIdentifiers) {
if (!Node)
return nullptr;
if (const auto *DeclRef = dyn_cast<DeclRefExpr>(Node)) {
if (llvm::is_contained(DeclIdentifiers, DeclRef->getDecl()->getID())) {
if (llvm::is_contained(DeclIdentifiers, DeclRef->getDecl()->getID()))
return DeclRef;
}
} else {
for (const Stmt *ChildNode : Node->children()) {
if (const DeclRefExpr *Result =
findUsageRange(ChildNode, DeclIdentifiers)) {
findUsageRange(ChildNode, DeclIdentifiers))
return Result;
}
}
}
return nullptr;
}
const DeclRefExpr *checkInitDeclUsageInElse(const IfStmt *If) {
static const DeclRefExpr *checkInitDeclUsageInElse(const IfStmt *If) {
const auto *InitDeclStmt = dyn_cast_or_null<DeclStmt>(If->getInit());
if (!InitDeclStmt)
return nullptr;
@ -82,25 +77,23 @@ const DeclRefExpr *checkInitDeclUsageInElse(const IfStmt *If) {
return findUsageRange(If->getElse(), DeclIdentifiers);
}
const DeclRefExpr *checkConditionVarUsageInElse(const IfStmt *If) {
const VarDecl *CondVar = If->getConditionVariable();
return CondVar != nullptr ? findUsage(If->getElse(), CondVar->getID())
: nullptr;
static const DeclRefExpr *checkConditionVarUsageInElse(const IfStmt *If) {
if (const VarDecl *CondVar = If->getConditionVariable())
return findUsage(If->getElse(), CondVar->getID());
return nullptr;
}
bool containsDeclInScope(const Stmt *Node) {
if (isa<DeclStmt>(Node)) {
static bool containsDeclInScope(const Stmt *Node) {
if (isa<DeclStmt>(Node))
return true;
}
if (const auto *Compound = dyn_cast<CompoundStmt>(Node)) {
if (const auto *Compound = dyn_cast<CompoundStmt>(Node))
return llvm::any_of(Compound->body(), [](const Stmt *SubNode) {
return isa<DeclStmt>(SubNode);
});
}
return false;
}
void removeElseAndBrackets(DiagnosticBuilder &Diag, ASTContext &Context,
static void removeElseAndBrackets(DiagnosticBuilder &Diag, ASTContext &Context,
const Stmt *Else, SourceLocation ElseLoc) {
auto Remap = [&](SourceLocation Loc) {
return Context.getSourceManager().getExpansionLoc(Loc);
@ -134,7 +127,6 @@ void removeElseAndBrackets(DiagnosticBuilder &Diag, ASTContext &Context,
SourceRange(ElseExpandedLoc, EndLoc), Repl);
}
}
} // namespace
ElseAfterReturnCheck::ElseAfterReturnCheck(StringRef Name,
ClangTidyContext *Context)