Skip to content

[Option] Fix simple subcommand with positional arguments #166859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

[Option] Fix simple subcommand with positional arguments #166859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f4e291
[𝘀𝗽𝗿] initial version
cachemeifyoucan Nov 6, 2025
fe0b41c
clang-format
cachemeifyoucan Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions llvm/lib/Option/ArgList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,8 @@ StringRef ArgList::getSubCommand(
HandleMultipleSubcommands(SubCommands);
return {};
}
if (!OtherPositionals.empty()) {
if (!OtherPositionals.empty())
HandleOtherPositionals(OtherPositionals);
return {};
}

if (SubCommands.size() == 1)
return SubCommands.front();
Expand Down
13 changes: 13 additions & 0 deletions llvm/unittests/Option/OptionSubCommandsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,19 @@ TYPED_TEST(OptSubCommandTableTest, SubCommandParsing) {
std::string::npos,
ErrMsg.find("Option [lowercase] is not valid for SubCommand [bar]"));
}

{
// Test case 7: Check valid use of a valid subcommand following more
// positional arguments.
const char *Args[] = {"bar", "input"};
InputArgList AL = T.ParseArgs(Args, MAI, MAC);
StringRef SC = AL.getSubCommand(
T.getSubCommands(), HandleMultipleSubcommands, HandleOtherPositionals);
EXPECT_EQ(SC, "bar"); // valid subcommand
EXPECT_NE(std::string::npos,
ErrMsg.find("Unregistered positionals passed"));
EXPECT_NE(std::string::npos, ErrMsg.find("input"));
}
}

TYPED_TEST(OptSubCommandTableTest, SubCommandHelp) {
Expand Down