Support oct and hex numbers in macros

llvm · IvanArkhipov1999 · Dec 2, 2023 · Dec 2, 2023 · Dec 3, 2023 · Dec 3, 2023
commit a4110d8978500b83e554e8ab9038852b282584da
diff --git a/clang-tools-extra/clang-tidy/modernize/UseDigitSeparatorCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseDigitSeparatorCheck.cpp
@@ -277,6 +277,10 @@ void UseDigitSeparatorCallbacks::MacroDefined(const Token &MacroNameTok,
      std::string BinaryNumber = OriginalLiteralString;
      BinaryNumber.erase(0, 2);
      IntegerValue = llvm::APInt(128, std::stoul(BinaryNumber, nullptr, 2));
+    } else if (llvm::StringRef(OriginalLiteralString).starts_with("0x")) {
+      IntegerValue = llvm::APInt(128, std::stoul(OriginalLiteralString, nullptr, 16));
+    } else if (llvm::StringRef(OriginalLiteralString).starts_with("0")) {
+      IntegerValue = llvm::APInt(128, std::stoul(OriginalLiteralString, nullptr, 8));
    } else {
      IntegerValue = llvm::APInt(128, std::stoul(OriginalLiteralString));
    }

diff --git a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-digit-separator.cpp b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-digit-separator.cpp
@@ -543,3 +543,19 @@ double AssignmentPostfixScientificNotFormattedFloat4 = -1.2345678e-10F;
 #define MINUS_BINARY_NOT_FORMATTED_INTEGER -0b11101101
 // CHECK-MESSAGES: :[[@LINE-1]]:45: warning: unformatted representation of integer literal '0b11101101' [modernize-use-digit-separator]
 // CHECK-FIXES: 0b1110'1101
+
+#define OCT_NOT_FORMATTED_INTEGER 037512
+// CHECK-MESSAGES: :[[@LINE-1]]:35: warning: unformatted representation of integer literal '037512' [modernize-use-digit-separator]
+// CHECK-FIXES: 037'512
+
+#define MINUS_OCT_NOT_FORMATTED_INTEGER -037512
+// CHECK-MESSAGES: :[[@LINE-1]]:42: warning: unformatted representation of integer literal '037512' [modernize-use-digit-separator]
+// CHECK-FIXES: 037'512
+
+#define HEX_NOT_FORMATTED_INTEGER 0x4f356
+// CHECK-MESSAGES: :[[@LINE-1]]:35: warning: unformatted representation of integer literal '0x4f356' [modernize-use-digit-separator]
+// CHECK-FIXES: 0x4'F356
+
+#define MINUS_HEX_NOT_FORMATTED_INTEGER -0x4f356
+// CHECK-MESSAGES: :[[@LINE-1]]:42: warning: unformatted representation of integer literal '0x4f356' [modernize-use-digit-separator]
+// CHECK-FIXES: 0x4'F356