feed

Author: hjanuschka

clang-tools-extra/clang-tidy/readability/CMakeLists.txt

@@ -57,8 +57,8 @@ add_clang_library(clangTidyReadabilityModule STATIC
   UniqueptrDeleteReleaseCheck.cpp
   UppercaseLiteralSuffixCheck.cpp
   UseAnyOfAllOfCheck.cpp
-  UseStdMinMaxCheck.cpp
   UseSpanFirstLastCheck.cpp
+  UseStdMinMaxCheck.cpp
 
   LINK_LIBS
   clangTidy

clang-tools-extra/clang-tidy/readability/ReadabilityTidyModule.cpp

@@ -171,10 +171,10 @@ class ReadabilityModule : public ClangTidyModule {
         "readability-uppercase-literal-suffix");
     CheckFactories.registerCheck<UseAnyOfAllOfCheck>(
         "readability-use-anyofallof");
-    CheckFactories.registerCheck<UseStdMinMaxCheck>(
-        "readability-use-std-min-max");
     CheckFactories.registerCheck<UseSpanFirstLastCheck>(
         "readability-use-span-first-last");
+    CheckFactories.registerCheck<UseStdMinMaxCheck>(
+        "readability-use-std-min-max");
   }
 };
 

clang-tools-extra/clang-tidy/readability/UseSpanFirstLastCheck.cpp

@@ -17,9 +17,6 @@ using namespace clang::ast_matchers;
 namespace clang::tidy::readability {
 
 void UseSpanFirstLastCheck::registerMatchers(MatchFinder *Finder) {
-  if (!getLangOpts().CPlusPlus20)
-    return;
-
   // Match span::subspan calls
   const auto HasSpanType =
       hasType(hasUnqualifiedDesugaredType(recordType(hasDeclaration(
@@ -53,56 +50,54 @@ void UseSpanFirstLastCheck::handleSubspanCall(
   // Check if this is subspan(0, n) -> first(n)
   bool IsZeroOffset = false;
   const Expr *OffsetE = Offset->IgnoreImpCasts();
-  if (const auto *IL = dyn_cast<IntegerLiteral>(OffsetE)) {
+  if (const auto *IL = dyn_cast<IntegerLiteral>(OffsetE))
     IsZeroOffset = IL->getValue() == 0;
-  }
 
   // Check if this is subspan(size() - n) -> last(n)
   bool IsSizeMinusN = false;
   const Expr *SizeMinusArg = nullptr;
-  if (const auto *BO = dyn_cast<BinaryOperator>(OffsetE)) {
-    if (BO->getOpcode() == BO_Sub) {
-      if (const auto *SizeCall = dyn_cast<CXXMemberCallExpr>(BO->getLHS())) {
-        if (SizeCall->getMethodDecl()->getName() == "size") {
-          IsSizeMinusN = true;
-          SizeMinusArg = BO->getRHS();
-        }
-      }
+
+  const auto *BO = dyn_cast<BinaryOperator>(OffsetE);
+  if (BO && BO->getOpcode() == BO_Sub) {
+    const auto *SizeCall = dyn_cast<CXXMemberCallExpr>(BO->getLHS());
+    if (SizeCall && SizeCall->getMethodDecl()->getName() == "size") {
+      IsSizeMinusN = true;
+      SizeMinusArg = BO->getRHS();
     }
   }
 
   // Build replacement text
   std::string Replacement;
   if (IsZeroOffset && Count) {
     // subspan(0, count) -> first(count)
-    auto CountStr = Lexer::getSourceText(
+    const auto CountStr = Lexer::getSourceText(
         CharSourceRange::getTokenRange(Count->getSourceRange()),
         Context.getSourceManager(), Context.getLangOpts());
     const auto *Base =
         cast<CXXMemberCallExpr>(Call)->getImplicitObjectArgument();
-    auto BaseStr = Lexer::getSourceText(
+    const StringRef BaseStr = Lexer::getSourceText(
         CharSourceRange::getTokenRange(Base->getSourceRange()),
         Context.getSourceManager(), Context.getLangOpts());
     Replacement = BaseStr.str() + ".first(" + CountStr.str() + ")";
   } else if (IsSizeMinusN && SizeMinusArg) {
     // subspan(size() - n) -> last(n)
-    auto ArgStr = Lexer::getSourceText(
+    const StringRef ArgStr = Lexer::getSourceText(
         CharSourceRange::getTokenRange(SizeMinusArg->getSourceRange()),
         Context.getSourceManager(), Context.getLangOpts());
     const auto *Base =
         cast<CXXMemberCallExpr>(Call)->getImplicitObjectArgument();
-    auto BaseStr = Lexer::getSourceText(
+    const StringRef BaseStr = Lexer::getSourceText(
         CharSourceRange::getTokenRange(Base->getSourceRange()),
         Context.getSourceManager(), Context.getLangOpts());
     Replacement = BaseStr.str() + ".last(" + ArgStr.str() + ")";
   }
 
   if (!Replacement.empty()) {
     if (IsZeroOffset && Count) {
-      diag(Call->getBeginLoc(), "prefer span::first() over subspan()")
+      diag(Call->getBeginLoc(), "prefer 'span::first()' over 'subspan()'")
           << FixItHint::CreateReplacement(Call->getSourceRange(), Replacement);
     } else {
-      diag(Call->getBeginLoc(), "prefer span::last() over subspan()")
+      diag(Call->getBeginLoc(), "prefer 'span::last()' over 'subspan()'")
           << FixItHint::CreateReplacement(Call->getSourceRange(), Replacement);
     }
   }

clang-tools-extra/clang-tidy/readability/UseSpanFirstLastCheck.h

@@ -33,6 +33,9 @@ class UseSpanFirstLastCheck : public ClangTidyCheck {
 
   void registerMatchers(ast_matchers::MatchFinder *Finder) override;
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+  bool isLanguageVersionSupported(const LangOptions &LangOpts) const override { 
+	   return LangOpts.CPlusPlus20; 
+	}
 
 private:
   void handleSubspanCall(const ast_matchers::MatchFinder::MatchResult &Result,

clang-tools-extra/test/clang-tidy/checkers/readability/use-span-first-last.cpp

@@ -34,16 +34,16 @@ void test() {
   std::span<int> s(arr, 5);
 
   auto sub1 = s.subspan(0, 3);
-  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::first() over subspan()
+  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer 'span::first()' over 'subspan()'
   // CHECK-FIXES: auto sub1 = s.first(3);
 
   auto sub2 = s.subspan(s.size() - 2);
-  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::last() over subspan()
+  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer 'span::last()' over 'subspan()'
   // CHECK-FIXES: auto sub2 = s.last(2);
 
   __SIZE_TYPE__ n = 2;
   auto sub3 = s.subspan(0, n);
-  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::first() over subspan()
+  // CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer 'span::first()' over 'subspan()'
   // CHECK-FIXES: auto sub3 = s.first(n);
 
   auto sub4 = s.subspan(1, 2);  // No warning