Skip to content

Commit 9a86c0f

Browse files
committed
Address clang-tidy warnings except in mlir_op_builder.cpp which is following MLIR coding conventions
1 parent a25b8af commit 9a86c0f

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

clang-tools-extra/clang-tidy/llvm/MLIROpBuilderCheck.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,63 +24,63 @@ using namespace ::clang::transformer; // NOLINT: Too many names.
2424

2525
class TypeAsWrittenStencil : public StencilInterface {
2626
public:
27-
explicit TypeAsWrittenStencil(std::string S) : id(std::move(S)) {}
27+
explicit TypeAsWrittenStencil(std::string S) : Id(std::move(S)) {}
2828
std::string toString() const override {
29-
return (llvm::Twine("TypeAsWritten(\"") + id + "\")").str();
29+
return (llvm::Twine("TypeAsWritten(\"") + Id + "\")").str();
3030
}
3131

3232
llvm::Error eval(const MatchFinder::MatchResult &match,
3333
std::string *result) const override {
34-
llvm::Expected<CharSourceRange> n = node(id)(match);
34+
llvm::Expected<CharSourceRange> n = node(Id)(match);
3535
if (!n)
3636
return n.takeError();
37-
SourceRange srcRange = n->getAsRange();
38-
if (srcRange.isInvalid()) {
37+
const SourceRange SrcRange = n->getAsRange();
38+
if (SrcRange.isInvalid()) {
3939
return llvm::make_error<llvm::StringError>(llvm::errc::invalid_argument,
40-
"srcRange is invalid");
40+
"SrcRange is invalid");
4141
}
42-
const CharSourceRange range = n->getTokenRange(srcRange);
43-
auto nextToken = [&](std::optional<Token> token) {
44-
if (!token)
45-
return token;
46-
return clang::Lexer::findNextToken(token->getLocation(),
42+
const CharSourceRange Range = n->getTokenRange(SrcRange);
43+
auto NextToken = [&](std::optional<Token> Token) {
44+
if (!Token)
45+
return Token;
46+
return clang::Lexer::findNextToken(Token->getLocation(),
4747
*match.SourceManager,
4848
match.Context->getLangOpts());
4949
};
50-
std::optional<Token> lessToken = clang::Lexer::findNextToken(
51-
range.getBegin(), *match.SourceManager, match.Context->getLangOpts());
52-
while (lessToken && lessToken->getKind() != clang::tok::less) {
53-
lessToken = nextToken(lessToken);
50+
std::optional<Token> LessToken = clang::Lexer::findNextToken(
51+
Range.getBegin(), *match.SourceManager, match.Context->getLangOpts());
52+
while (LessToken && LessToken->getKind() != clang::tok::less) {
53+
LessToken = NextToken(LessToken);
5454
}
55-
if (!lessToken) {
55+
if (!LessToken) {
5656
return llvm::make_error<llvm::StringError>(llvm::errc::invalid_argument,
5757
"missing '<' token");
5858
}
59-
std::optional<Token> endToken = nextToken(lessToken);
60-
for (std::optional<Token> greaterToken = nextToken(endToken);
61-
greaterToken && greaterToken->getKind() != clang::tok::greater;
62-
greaterToken = nextToken(greaterToken)) {
63-
endToken = greaterToken;
59+
std::optional<Token> EndToken = NextToken(LessToken);
60+
for (std::optional<Token> GreaterToken = NextToken(EndToken);
61+
GreaterToken && GreaterToken->getKind() != clang::tok::greater;
62+
GreaterToken = NextToken(GreaterToken)) {
63+
EndToken = GreaterToken;
6464
}
65-
if (!endToken) {
65+
if (!EndToken) {
6666
return llvm::make_error<llvm::StringError>(llvm::errc::invalid_argument,
6767
"missing '>' token");
6868
}
6969
*result += clang::tooling::getText(
70-
CharSourceRange::getTokenRange(lessToken->getEndLoc(),
71-
endToken->getLastLoc()),
70+
CharSourceRange::getTokenRange(LessToken->getEndLoc(),
71+
EndToken->getLastLoc()),
7272
*match.Context);
7373
return llvm::Error::success();
7474
}
75-
std::string id;
75+
std::string Id;
7676
};
7777

7878
Stencil typeAsWritten(StringRef Id) {
7979
// Using this instead of `describe` so that we get the exact same spelling.
8080
return std::make_shared<TypeAsWrittenStencil>(std::string(Id));
8181
}
8282

83-
RewriteRuleWith<std::string> MlirOpBuilderCheckRule() {
83+
RewriteRuleWith<std::string> mlirOpBuilderCheckRule() {
8484
return makeRule(
8585
cxxMemberCallExpr(
8686
on(expr(hasType(
@@ -98,6 +98,6 @@ RewriteRuleWith<std::string> MlirOpBuilderCheckRule() {
9898

9999
MlirOpBuilderCheck::MlirOpBuilderCheck(StringRef Name,
100100
ClangTidyContext *Context)
101-
: TransformerClangTidyCheck(MlirOpBuilderCheckRule(), Name, Context) {}
101+
: TransformerClangTidyCheck(mlirOpBuilderCheckRule(), Name, Context) {}
102102

103103
} // namespace clang::tidy::llvm_check

0 commit comments

Comments
 (0)