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

Fix code to follow the "Don’t use else after a return" rule. 

Summary:
Fix code to follow the "Don’t use else after a return" rule.
This is a followup from rL219792.

Reviewers: alexfh

Subscribers: klimek, cfe-commits

Differential Revision: http://reviews.llvm.org/D5826

llvm-svn: 219939
This commit is contained in:
Samuel Benzaquen 2014-10-16 17:50:19 +00:00
parent 92c8c95943
commit b6f73bc510
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/ASTMatchers/ASTMatchersInternal.cpp
View File

@ -232,15 +232,15 @@ bool HasNameMatcher::matchesNodeUnqualified(const NamedDecl &Node) const {
if (Node.getIdentifier()) { if (Node.getIdentifier()) {
// Simple name. // Simple name.
return Name == Node.getName(); return Name == Node.getName();
} else if (Node.getDeclName()) { }
if (Node.getDeclName()) {
// Name needs to be constructed. // Name needs to be constructed.
llvm::SmallString<128> NodeName; llvm::SmallString<128> NodeName;
llvm::raw_svector_ostream OS(NodeName); llvm::raw_svector_ostream OS(NodeName);
Node.printName(OS); Node.printName(OS);
return Name == OS.str(); return Name == OS.str();
} else {
return false;
} }
return false;
} }
bool HasNameMatcher::matchesNodeFull(const NamedDecl &Node) const { bool HasNameMatcher::matchesNodeFull(const NamedDecl &Node) const {
@ -249,11 +249,12 @@ bool HasNameMatcher::matchesNodeFull(const NamedDecl &Node) const {
Node.printQualifiedName(OS); Node.printQualifiedName(OS);
const StringRef FullName = OS.str(); const StringRef FullName = OS.str();
const StringRef Pattern = Name; const StringRef Pattern = Name;
if (Pattern.startswith("::")) {
if (Pattern.startswith("::"))
return FullName == Pattern; return FullName == Pattern;
} else {
return FullName.endswith(("::" + Pattern).str()); return FullName.endswith(Pattern) &&
} FullName.drop_back(Pattern.size()).endswith("::");
} }
bool HasNameMatcher::matchesNode(const NamedDecl &Node) const { bool HasNameMatcher::matchesNode(const NamedDecl &Node) const {