RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Fix OptTable::findNearest() adding delimiter for free

Browse Source 
Prior to this, OptTable::findNearest() thought that the input `--foo`
had an editing distance of 0 from an existing flag `--foo=`, which made
it suggest flags with delimiters more often than flags without one.
After this, it correctly assigns this case an editing distance of 1.

Differential Revision: https://reviews.llvm.org/D61373

llvm-svn: 359685
This commit is contained in:
Nico Weber 2019-05-01 14:46:17 +00:00
parent c74c37c69c
commit 91bcf24a84
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Option/OptTable.cpp
View File

@ -280,23 +280,22 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString,
// Now check if the candidate ends with a character commonly used when
// delimiting an option from its value, such as '=' or ':'. If it does,
// attempt to split the given option based on that delimiter.
std::string Delimiter = "";
char Last = CandidateName.back();
if (Last == '=' || Last == ':')
Delimiter = std::string(1, Last);
StringRef LHS, RHS;
if (Delimiter.empty())
LHS = Option;
else
char Last = CandidateName.back();
bool CandidateHasDelimiter = Last == '=' || Last == ':';
std::string NormalizedName = Option;
if (CandidateHasDelimiter) {
std::tie(LHS, RHS) = Option.split(Last);
NormalizedName = LHS;
if (Option.find(Last) == LHS.size())
NormalizedName += Last;
}
// Consider each possible prefix for each candidate to find the most
// appropriate one. For example, if a user asks for "--helm", suggest
// "--help" over "-help".
for (int P = 0;
const char *const CandidatePrefix = CandidateInfo.Prefixes[P]; P++) {
std::string NormalizedName = (LHS + Delimiter).str();
std::string Candidate = (CandidatePrefix + CandidateName).str();
StringRef CandidateRef = Candidate;
unsigned Distance =

5
unittests/Option/OptionParsingTest.cpp
View File

@ -298,6 +298,11 @@ TEST(Option, FindNearest) {
EXPECT_EQ(1U, T.findNearest("/framb:foo", Nearest));
EXPECT_EQ(Nearest, "/cramb:foo");
// `--glormp` should have an editing distance of 1 to `--glormp=`.
EXPECT_EQ(1U, T.findNearest("--glormp", Nearest));
EXPECT_EQ(Nearest, "--glormp=");
EXPECT_EQ(0U, T.findNearest("--glormp=foo", Nearest));
// Flags should be included and excluded as specified.
EXPECT_EQ(1U, T.findNearest("-doopf", Nearest, /*FlagsToInclude=*/OptFlag2));
EXPECT_EQ(Nearest, "-doopf2");

3
unittests/Option/Opts.td
View File

@ -36,4 +36,7 @@ def Doopf1 : Flag<["-"], "doopf1">, HelpText<"The doopf1 option">, Flags<[OptFla
def Doopf2 : Flag<["-"], "doopf2">, HelpText<"The doopf2 option">, Flags<[OptFlag2]>;
def Ermgh : Joined<["--"], "ermgh">, HelpText<"The ermgh option">, MetaVarName<"ERMGH">, Flags<[OptFlag1]>;
def Fjormp : Flag<["--"], "fjormp">, HelpText<"The fjormp option">, Flags<[OptFlag1]>;
def Glormp_eq : Flag<["--"], "glormp=">;
def DashDash : Option<["--"], "", KIND_REMAINING_ARGS>;