diff options
Diffstat (limited to 'clang-tools-extra/clang-tidy/ClangTidy.cpp')
| -rw-r--r-- | clang-tools-extra/clang-tidy/ClangTidy.cpp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp index 7e18f38..76243e9 100644 --- a/clang-tools-extra/clang-tidy/ClangTidy.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidy.cpp @@ -117,7 +117,8 @@ public: void reportDiagnostic(const ClangTidyError &Error) { const tooling::DiagnosticMessage &Message = Error.Message; - SourceLocation Loc = getLocation(Message.FilePath, Message.FileOffset); + const SourceLocation Loc = + getLocation(Message.FilePath, Message.FileOffset); // Contains a pair for each attempted fix: location and whether the fix was // applied successfully. SmallVector<std::pair<SourceLocation, bool>, 4> FixLocations; @@ -157,11 +158,11 @@ public: // FIXME: Implement better conflict handling. llvm::errs() << "Trying to resolve conflict: " << llvm::toString(std::move(Err)) << "\n"; - unsigned NewOffset = + const unsigned NewOffset = Replacements.getShiftedCodePosition(R.getOffset()); - unsigned NewLength = Replacements.getShiftedCodePosition( - R.getOffset() + R.getLength()) - - NewOffset; + const unsigned NewLength = Replacements.getShiftedCodePosition( + R.getOffset() + R.getLength()) - + NewOffset; if (NewLength == R.getLength()) { R = Replacement(R.getFilePath(), NewOffset, NewLength, R.getReplacementText()); @@ -200,7 +201,7 @@ public: for (const auto &FileAndReplacements : FileReplacements) { Rewriter Rewrite(SourceMgr, LangOpts); - StringRef File = FileAndReplacements.first(); + const StringRef File = FileAndReplacements.first(); VFS.setCurrentWorkingDirectory(FileAndReplacements.second.BuildDir); llvm::ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer = SourceMgr.getFileManager().getBufferForFile(File); @@ -210,7 +211,7 @@ public: // FIXME: Maybe don't apply fixes for other files as well. continue; } - StringRef Code = Buffer.get()->getBuffer(); + const StringRef Code = Buffer.get()->getBuffer(); auto Style = format::getStyle( *Context.getOptionsForFile(File).FormatStyle, File, "none"); if (!Style) { @@ -262,7 +263,7 @@ private: if (!File) return {}; - FileID ID = SourceMgr.getOrCreateFileID(*File, SrcMgr::C_User); + const FileID ID = SourceMgr.getOrCreateFileID(*File, SrcMgr::C_User); return SourceMgr.getLocForStartOfFile(ID).getLocWithOffset(Offset); } @@ -284,7 +285,8 @@ private: } void reportNote(const tooling::DiagnosticMessage &Message) { - SourceLocation Loc = getLocation(Message.FilePath, Message.FileOffset); + const SourceLocation Loc = + getLocation(Message.FilePath, Message.FileOffset); auto Diag = Diags.Report(Loc, Diags.getCustomDiagID(DiagnosticsEngine::Note, "%0")) << Message.Message; @@ -296,8 +298,9 @@ private: CharSourceRange getRange(const FileByteRange &Range) { SmallString<128> AbsoluteFilePath{Range.FilePath}; Files.makeAbsolutePath(AbsoluteFilePath); - SourceLocation BeginLoc = getLocation(AbsoluteFilePath, Range.FileOffset); - SourceLocation EndLoc = BeginLoc.getLocWithOffset(Range.Length); + const SourceLocation BeginLoc = + getLocation(AbsoluteFilePath, Range.FileOffset); + const SourceLocation EndLoc = BeginLoc.getLocWithOffset(Range.Length); // Retrieve the source range for applicable highlights and fixes. Macro // definition on the command line have locations in a virtual buffer and // don't have valid file paths and are therefore not applicable. @@ -353,7 +356,8 @@ ClangTidyASTConsumerFactory::ClangTidyASTConsumerFactory( if (Context.canExperimentalCustomChecks() && custom::RegisterCustomChecks) custom::RegisterCustomChecks(Context.getOptions(), *CheckFactories); #endif - for (ClangTidyModuleRegistry::entry E : ClangTidyModuleRegistry::entries()) { + for (ClangTidyModuleRegistry::entry const E : + ClangTidyModuleRegistry::entries()) { std::unique_ptr<ClangTidyModule> Module = E.instantiate(); Module->addCheckFactories(*CheckFactories); } @@ -394,8 +398,9 @@ static CheckersList getAnalyzerCheckersAndPackages(ClangTidyContext &Context, // Always add all core checkers if any other static analyzer check is enabled. // This is currently necessary, as other path sensitive checks rely on the // core checkers. - for (StringRef CheckName : RegisteredCheckers) { - std::string ClangTidyCheckName((AnalyzerCheckNamePrefix + CheckName).str()); + for (const StringRef CheckName : RegisteredCheckers) { + const std::string ClangTidyCheckName( + (AnalyzerCheckNamePrefix + CheckName).str()); if (CheckName.starts_with("core") || Context.isCheckEnabled(ClangTidyCheckName)) { @@ -504,7 +509,7 @@ std::vector<std::string> ClangTidyASTConsumerFactory::getCheckNames() { ClangTidyOptions::OptionMap ClangTidyASTConsumerFactory::getCheckOptions() { ClangTidyOptions::OptionMap Options; - std::vector<std::unique_ptr<ClangTidyCheck>> Checks = + const std::vector<std::unique_ptr<ClangTidyCheck>> Checks = CheckFactories->createChecks(&Context); for (const auto &Check : Checks) Check->storeOptions(Options); @@ -564,7 +569,7 @@ runClangTidy(clang::tidy::ClangTidyContext &Context, std::make_shared<PCHContainerOperations>(), BaseFS); // Add extra arguments passed by the clang-tidy command-line. - ArgumentsAdjuster PerFileExtraArgumentsInserter = + const ArgumentsAdjuster PerFileExtraArgumentsInserter = [&Context](const CommandLineArguments &Args, StringRef Filename) { ClangTidyOptions Opts = Context.getOptionsForFile(Filename); CommandLineArguments AdjustedArgs = Args; @@ -703,7 +708,7 @@ ChecksAndOptions getAllChecksAndOptions(bool AllowEnablingAnalyzerAlphaCheckers, #if CLANG_TIDY_ENABLE_STATIC_ANALYZER SmallString<64> Buffer(AnalyzerCheckNamePrefix); - size_t DefSize = Buffer.size(); + const size_t DefSize = Buffer.size(); for (const auto &AnalyzerCheck : AnalyzerOptions::getRegisteredCheckers( AllowEnablingAnalyzerAlphaCheckers)) { Buffer.truncate(DefSize); |