forked from OSchip/llvm-project
Convert two more files that were using Windows line endings and remove
a stray single '\r' from one file. These are the last line ending issues I can find in the files containing parts of LLVM's file headers. llvm-svn: 351634
This commit is contained in:
parent
d92d70b7f0
commit
4a50956c07
|
@ -1,58 +1,58 @@
|
|||
//===--- ElseAfterReturnCheck.cpp - clang-tidy-----------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "ElseAfterReturnCheck.h"
|
||||
#include "clang/AST/ASTContext.h"
|
||||
#include "clang/ASTMatchers/ASTMatchFinder.h"
|
||||
#include "clang/Tooling/FixIt.h"
|
||||
|
||||
using namespace clang::ast_matchers;
|
||||
|
||||
namespace clang {
|
||||
namespace tidy {
|
||||
namespace readability {
|
||||
|
||||
void ElseAfterReturnCheck::registerMatchers(MatchFinder *Finder) {
|
||||
const auto ControlFlowInterruptorMatcher =
|
||||
stmt(anyOf(returnStmt().bind("return"), continueStmt().bind("continue"),
|
||||
breakStmt().bind("break"),
|
||||
expr(ignoringImplicit(cxxThrowExpr().bind("throw")))));
|
||||
Finder->addMatcher(
|
||||
compoundStmt(forEach(
|
||||
ifStmt(unless(isConstexpr()),
|
||||
hasThen(stmt(
|
||||
anyOf(ControlFlowInterruptorMatcher,
|
||||
compoundStmt(has(ControlFlowInterruptorMatcher))))),
|
||||
hasElse(stmt().bind("else")))
|
||||
.bind("if"))),
|
||||
this);
|
||||
}
|
||||
|
||||
void ElseAfterReturnCheck::check(const MatchFinder::MatchResult &Result) {
|
||||
const auto *If = Result.Nodes.getNodeAs<IfStmt>("if");
|
||||
SourceLocation ElseLoc = If->getElseLoc();
|
||||
std::string ControlFlowInterruptor;
|
||||
for (const auto *BindingName : {"return", "continue", "break", "throw"})
|
||||
if (Result.Nodes.getNodeAs<Stmt>(BindingName))
|
||||
ControlFlowInterruptor = BindingName;
|
||||
|
||||
DiagnosticBuilder Diag = diag(ElseLoc, "do not use 'else' after '%0'")
|
||||
<< ControlFlowInterruptor;
|
||||
Diag << tooling::fixit::createRemoval(ElseLoc);
|
||||
|
||||
// FIXME: Removing the braces isn't always safe. Do a more careful analysis.
|
||||
// FIXME: Change clang-format to correctly un-indent the code.
|
||||
if (const auto *CS = Result.Nodes.getNodeAs<CompoundStmt>("else"))
|
||||
Diag << tooling::fixit::createRemoval(CS->getLBracLoc())
|
||||
<< tooling::fixit::createRemoval(CS->getRBracLoc());
|
||||
}
|
||||
|
||||
} // namespace readability
|
||||
} // namespace tidy
|
||||
} // namespace clang
|
||||
//===--- ElseAfterReturnCheck.cpp - clang-tidy-----------------------------===//
|
||||
//
|
||||
// The LLVM Compiler Infrastructure
|
||||
//
|
||||
// This file is distributed under the University of Illinois Open Source
|
||||
// License. See LICENSE.TXT for details.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
#include "ElseAfterReturnCheck.h"
|
||||
#include "clang/AST/ASTContext.h"
|
||||
#include "clang/ASTMatchers/ASTMatchFinder.h"
|
||||
#include "clang/Tooling/FixIt.h"
|
||||
|
||||
using namespace clang::ast_matchers;
|
||||
|
||||
namespace clang {
|
||||
namespace tidy {
|
||||
namespace readability {
|
||||
|
||||
void ElseAfterReturnCheck::registerMatchers(MatchFinder *Finder) {
|
||||
const auto ControlFlowInterruptorMatcher =
|
||||
stmt(anyOf(returnStmt().bind("return"), continueStmt().bind("continue"),
|
||||
breakStmt().bind("break"),
|
||||
expr(ignoringImplicit(cxxThrowExpr().bind("throw")))));
|
||||
Finder->addMatcher(
|
||||
compoundStmt(forEach(
|
||||
ifStmt(unless(isConstexpr()),
|
||||
hasThen(stmt(
|
||||
anyOf(ControlFlowInterruptorMatcher,
|
||||
compoundStmt(has(ControlFlowInterruptorMatcher))))),
|
||||
hasElse(stmt().bind("else")))
|
||||
.bind("if"))),
|
||||
this);
|
||||
}
|
||||
|
||||
void ElseAfterReturnCheck::check(const MatchFinder::MatchResult &Result) {
|
||||
const auto *If = Result.Nodes.getNodeAs<IfStmt>("if");
|
||||
SourceLocation ElseLoc = If->getElseLoc();
|
||||
std::string ControlFlowInterruptor;
|
||||
for (const auto *BindingName : {"return", "continue", "break", "throw"})
|
||||
if (Result.Nodes.getNodeAs<Stmt>(BindingName))
|
||||
ControlFlowInterruptor = BindingName;
|
||||
|
||||
DiagnosticBuilder Diag = diag(ElseLoc, "do not use 'else' after '%0'")
|
||||
<< ControlFlowInterruptor;
|
||||
Diag << tooling::fixit::createRemoval(ElseLoc);
|
||||
|
||||
// FIXME: Removing the braces isn't always safe. Do a more careful analysis.
|
||||
// FIXME: Change clang-format to correctly un-indent the code.
|
||||
if (const auto *CS = Result.Nodes.getNodeAs<CompoundStmt>("else"))
|
||||
Diag << tooling::fixit::createRemoval(CS->getLBracLoc())
|
||||
<< tooling::fixit::createRemoval(CS->getRBracLoc());
|
||||
}
|
||||
|
||||
} // namespace readability
|
||||
} // namespace tidy
|
||||
} // namespace clang
|
||||
|
|
|
@ -22,4 +22,4 @@ using namespace clang::targets;
|
|||
void ARCTargetInfo::getTargetDefines(const LangOptions &Opts,
|
||||
MacroBuilder &Builder) const {
|
||||
Builder.defineMacro("__arc__");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,22 +1,22 @@
|
|||
;===- ./lib/WindowsManifest/LLVMBuild.txt ----------------------*- Conf -*--===;
|
||||
;
|
||||
; The LLVM Compiler Infrastructure
|
||||
;
|
||||
; This file is distributed under the University of Illinois Open Source
|
||||
; License. See LICENSE.TXT for details.
|
||||
;
|
||||
;===------------------------------------------------------------------------===;
|
||||
;
|
||||
; This is an LLVMBuild description file for the components in this subdirectory.
|
||||
;
|
||||
; For more information on the LLVMBuild system, please see:
|
||||
;
|
||||
; http://llvm.org/docs/LLVMBuild.html
|
||||
;
|
||||
;===------------------------------------------------------------------------===;
|
||||
|
||||
[component_0]
|
||||
type = Library
|
||||
name = WindowsManifest
|
||||
parent = Libraries
|
||||
required_libraries = Support
|
||||
;===- ./lib/WindowsManifest/LLVMBuild.txt ----------------------*- Conf -*--===;
|
||||
;
|
||||
; The LLVM Compiler Infrastructure
|
||||
;
|
||||
; This file is distributed under the University of Illinois Open Source
|
||||
; License. See LICENSE.TXT for details.
|
||||
;
|
||||
;===------------------------------------------------------------------------===;
|
||||
;
|
||||
; This is an LLVMBuild description file for the components in this subdirectory.
|
||||
;
|
||||
; For more information on the LLVMBuild system, please see:
|
||||
;
|
||||
; http://llvm.org/docs/LLVMBuild.html
|
||||
;
|
||||
;===------------------------------------------------------------------------===;
|
||||
|
||||
[component_0]
|
||||
type = Library
|
||||
name = WindowsManifest
|
||||
parent = Libraries
|
||||
required_libraries = Support
|
||||
|
|
Loading…
Reference in New Issue