[llvm] 8d1a8fc - [llvm-strings] Style updates primarily for --radix (#222454)

[via llvm-commits]

Author: Harald van Dijk
Date: 2026-09-10T11:10:28+01:00
New Revision: 8d1a8fc4be3dc404bdaf63a493c3acc4cb48db52

URL: https://github.com/llvm/llvm-project/commit/8d1a8fc4be3dc404bdaf63a493c3acc4cb48db52
DIFF: https://github.com/llvm/llvm-project/commit/8d1a8fc4be3dc404bdaf63a493c3acc4cb48db52.diff

LOG: [llvm-strings] Style updates primarily for --radix (#222454)

* Silence clang-tidy by moving radix into anonymous namespace
* Adjust type and variable naming to match LLVM style
* Adjust --radix command line error message to match llvm-objdump
* Use llvm::StringSwitch to map option values to enumerators
* Remove undocumented and untested --radix="" option which was an
implementation detail to handle --radix not being specified

Added: 
    

Modified: 
    llvm/test/tools/llvm-strings/radix.test
    llvm/tools/llvm-strings/llvm-strings.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-strings/radix.test b/llvm/test/tools/llvm-strings/radix.test
index e13e201b2cf5e..7a18b63701d45 100644
--- a/llvm/test/tools/llvm-strings/radix.test
+++ b/llvm/test/tools/llvm-strings/radix.test
@@ -57,5 +57,7 @@ CHECK-HEX: {{^}}     22 eight
 CHECK-HEX: {{^}}     28 nine
 
 ## Show that an invalid value is rejected.
-RUN: not llvm-strings --radix z %t/a.txt 2>&1 | FileCheck %s --check-prefix=INVALID
-INVALID: error: --radix value should be one of: '' (no offset), 'o' (octal), 'd' (decimal), 'x' (hexadecimal)
+RUN: not llvm-strings --radix z %t/a.txt 2>&1 | FileCheck %s --check-prefix=INVALID-Z
+INVALID-Z: error: 'z' is not a valid value for '--radix='
+RUN: not llvm-strings --radix "" %t/a.txt 2>&1 | FileCheck %s --check-prefix=INVALID-EMPTY
+INVALID-EMPTY: error: '' is not a valid value for '--radix='

diff  --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp
index 9979b93de8427..f834dd2b55fc0 100644
--- a/llvm/tools/llvm-strings/llvm-strings.cpp
+++ b/llvm/tools/llvm-strings/llvm-strings.cpp
@@ -61,7 +61,6 @@ class StringsOptTable : public opt::GenericOptTable {
     setDashDashParsing(true);
   }
 };
-} // namespace
 
 static StringRef ToolName;
 
@@ -71,8 +70,9 @@ static cl::list<std::string> InputFileNames(cl::Positional,
 static int MinLength = 4;
 static bool PrintFileName;
 
-enum radix { none, octal, hexadecimal, decimal };
-static radix Radix;
+enum class Radix { None, Octal, Hexadecimal, Decimal };
+static Radix Radix;
+} // namespace
 
 [[noreturn]] static void reportCmdLineError(const Twine &Message) {
   WithColor::error(errs(), ToolName) << Message << "\n";
@@ -89,21 +89,21 @@ static void parseIntArg(const opt::InputArgList &Args, int ID, T &Value) {
 }
 
 static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
-  auto print = [&OS, FileName](unsigned Offset, StringRef L) {
+  auto Print = [&OS, FileName](unsigned Offset, StringRef L) {
     if (L.size() < static_cast<size_t>(MinLength))
       return;
     if (PrintFileName)
       OS << FileName << ": ";
     switch (Radix) {
-    case none:
+    case Radix::None:
       break;
-    case octal:
+    case Radix::Octal:
       OS << format("%7o ", Offset);
       break;
-    case hexadecimal:
+    case Radix::Hexadecimal:
       OS << format("%7x ", Offset);
       break;
-    case decimal:
+    case Radix::Decimal:
       OS << format("%7u ", Offset);
       break;
     }
@@ -117,12 +117,12 @@ static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
       if (S == nullptr)
         S = P;
     } else if (S) {
-      print(S - B, StringRef(S, P - S));
+      Print(S - B, StringRef(S, P - S));
       S = nullptr;
     }
   }
   if (S)
-    print(S - B, StringRef(S, E - S));
+    Print(S - B, StringRef(S, E - S));
 }
 
 int main(int argc, char **argv) {
@@ -151,18 +151,20 @@ int main(int argc, char **argv) {
 
   parseIntArg(Args, OPT_bytes_EQ, MinLength);
   PrintFileName = Args.hasArg(OPT_print_file_name);
-  StringRef R = Args.getLastArgValue(OPT_radix_EQ);
-  if (R.empty())
-    Radix = none;
-  else if (R == "o")
-    Radix = octal;
-  else if (R == "d")
-    Radix = decimal;
-  else if (R == "x")
-    Radix = hexadecimal;
-  else
-    reportCmdLineError("--radix value should be one of: '' (no offset), 'o' "
-                       "(octal), 'd' (decimal), 'x' (hexadecimal)");
+  Arg *RadixArg = Args.getLastArg(OPT_radix_EQ);
+  if (!RadixArg) {
+    Radix = Radix::None;
+  } else {
+    Radix = llvm::StringSwitch<enum Radix>(RadixArg->getValue())
+                .Case("o", Radix::Octal)
+                .Case("d", Radix::Decimal)
+                .Case("x", Radix::Hexadecimal)
+                .Default(Radix::None);
+    if (Radix == Radix::None)
+      reportCmdLineError("'" + StringRef(RadixArg->getValue()) +
+                         "' is not a valid value for '" +
+                         RadixArg->getSpelling() + "'");
+  }
 
   if (MinLength == 0) {
     errs() << "invalid minimum string length 0\n";