Fix short option error

carbon-language · Jan 13, 2025 · 9afadf3 · 9afadf3
1 parent 3a44b65
commit 9afadf3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/common/command_line.cpp b/common/command_line.cpp
@@ -1035,11 +1035,12 @@ auto Parser::ParseShortOptionSeq(llvm::StringRef unparsed_arg)
         unparsed_arg));
   }
 
-  for (unsigned char c : unparsed_arg) {
-    auto* arg_entry =
-        (c < short_option_table_.size()) ? short_option_table_[c] : nullptr;
+  for (char c : unparsed_arg) {
+    auto* arg_entry = (c < static_cast<ssize_t>(short_option_table_.size()))
+                          ? short_option_table_[c]
+                          : nullptr;
     if (!arg_entry) {
-      return Error(llvm::formatv("unknown short option `{0}`", c));
+      return Error(llvm::formatv("unknown short option `-{0}`", c));
     }
     // Mark this argument as parsed.
     arg_entry->setInt(true);

diff --git a/common/command_line_test.cpp b/common/command_line_test.cpp
@@ -188,6 +188,9 @@ TEST(ArgParserTest, ShortArgs) {
   EXPECT_THAT(integer_option, Eq(123));
 
   TestRawOstream os;
+
+  EXPECT_THAT(parse({"-v"}, os), IsError(StrEq("unknown short option `-v`")));
+
   EXPECT_THAT(
       parse({"-xzf"}, os),
       IsError(StrEq("option `-z` (short for `--option2`) requires a value to "