Expand comparison check to more operators

This doesn't actually catch any more real cases in the current code, but it future-proofs while I'm thinking about such things.
CleverRaven · May 7, 2020 · 590c5f9 · 590c5f9
1 parent 44ca15b
commit 590c5f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/cata_variant.h b/src/cata_variant.h
@@ -325,9 +325,9 @@ class cata_variant
         CATA_VARIANT_OPERATOR( == );
         CATA_VARIANT_OPERATOR( != );
         CATA_VARIANT_OPERATOR( < ); // NOLINT( cata-use-localized-sorting )
-        CATA_VARIANT_OPERATOR( <= );
-        CATA_VARIANT_OPERATOR( > );
-        CATA_VARIANT_OPERATOR( >= );
+        CATA_VARIANT_OPERATOR( <= ); // NOLINT( cata-use-localized-sorting )
+        CATA_VARIANT_OPERATOR( > ); // NOLINT( cata-use-localized-sorting )
+        CATA_VARIANT_OPERATOR( >= ); // NOLINT( cata-use-localized-sorting )
 #undef CATA_VARIANT_OPERATOR
     private:
         explicit cata_variant( cata_variant_type t, std::string &&v )

diff --git a/tools/clang-tidy-plugin/UseLocalizedSortingCheck.cpp b/tools/clang-tidy-plugin/UseLocalizedSortingCheck.cpp
@@ -91,7 +91,12 @@ void UseLocalizedSortingCheck::registerMatchers( MatchFinder *Finder )
                 0,
                 expr( hasType( qualType().bind( "arg0Type" ) ) ).bind( "arg0Expr" )
             ),
-            hasOverloadedOperatorName( "<" )
+            anyOf(
+                hasOverloadedOperatorName( "<" ),
+                hasOverloadedOperatorName( ">" ),
+                hasOverloadedOperatorName( "<=" ),
+                hasOverloadedOperatorName( ">=" )
+            )
         ).bind( "opCall" ),
         this
     );