RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

Un-revert "[Option] Fix PR37006 prefix choice in findNearest"

Browse Source 
Summary:
In https://reviews.llvm.org/rL332804 I loosed the assertion in
the Clang driver test that forced me to revert
https://reviews.llvm.org/rL332299. Once this lands I should be
able to narrow down what caused PS4 buildbots to fail, and
reinstate the check in that test.

Test Plan: check-llvm & check-clang

llvm-svn: 332805
This commit is contained in:
Brian Gesiak 2018-05-19 12:03:26 +00:00
parent 59d8d97866
commit 9888ad314c
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Option/OptTable.cpp
View File

@ -252,38 +252,33 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString,
unsigned MinimumLength) const {
assert(!Option.empty());
// Consider each option as a candidate, finding the closest match.
// Consider each [option prefix + option name] pair as a candidate, finding
// the closest match.
unsigned BestDistance = UINT_MAX;
for (const Info &CandidateInfo :
ArrayRef<Info>(OptionInfos).drop_front(FirstSearchableIndex)) {
StringRef CandidateName = CandidateInfo.Name;
// Ignore option candidates with empty names, such as "--", or names
// that do not meet the minimum length.
// We can eliminate some option prefix/name pairs as candidates right away:
// * Ignore option candidates with empty names, such as "--", or names
// that do not meet the minimum length.
if (CandidateName.empty() || CandidateName.size() < MinimumLength)
continue;
// If FlagsToInclude were specified, ignore options that don't include
// those flags.
// * If FlagsToInclude were specified, ignore options that don't include
// those flags.
if (FlagsToInclude && !(CandidateInfo.Flags & FlagsToInclude))
continue;
// Ignore options that contain the FlagsToExclude.
// * Ignore options that contain the FlagsToExclude.
if (CandidateInfo.Flags & FlagsToExclude)
continue;
// Ignore positional argument option candidates (which do not
// have prefixes).
// * Ignore positional argument option candidates (which do not
// have prefixes).
if (!CandidateInfo.Prefixes)
continue;
// Find the most appropriate prefix. For example, if a user asks for
// "--helm", suggest "--help" over "-help".
StringRef Prefix = CandidateInfo.Prefixes[0];
for (int P = 1; CandidateInfo.Prefixes[P]; P++) {
if (Option.startswith(CandidateInfo.Prefixes[P]))
Prefix = CandidateInfo.Prefixes[P];
}
// Check if the candidate ends with a character commonly used when
// 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 = "";
@ -297,14 +292,19 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString,
else
std::tie(LHS, RHS) = Option.split(Last);
std::string NormalizedName =
(LHS.drop_front(Prefix.size()) + Delimiter).str();
unsigned Distance =
CandidateName.edit_distance(NormalizedName, /*AllowReplacements=*/true,
/*MaxEditDistance=*/BestDistance);
if (Distance < BestDistance) {
BestDistance = Distance;
NearestString = (Prefix + CandidateName + RHS).str();
// 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();
StringRef Candidate = (CandidatePrefix + CandidateName).str();
unsigned Distance =
Candidate.edit_distance(NormalizedName, /*AllowReplacements=*/true,
/*MaxEditDistance=*/BestDistance);
if (Distance < BestDistance) {
BestDistance = Distance;
NearestString = (Candidate + RHS).str();
}
}
}
return BestDistance;

4
unittests/Option/OptionParsingTest.cpp
View File

@ -283,6 +283,10 @@ TEST(Option, FindNearest) {
EXPECT_EQ(Nearest, "-blorp");
EXPECT_EQ(1U, T.findNearest("--blorm", Nearest));
EXPECT_EQ(Nearest, "--blorp");
EXPECT_EQ(1U, T.findNearest("-blarg", Nearest));
EXPECT_EQ(Nearest, "-blarn");
EXPECT_EQ(1U, T.findNearest("--blarm", Nearest));
EXPECT_EQ(Nearest, "--blarn");
EXPECT_EQ(1U, T.findNearest("-fjormp", Nearest));
EXPECT_EQ(Nearest, "--fjormp");

1
unittests/Option/Opts.td
View File

@ -30,6 +30,7 @@ def Slurp : Option<["-"], "slurp", KIND_REMAINING_ARGS>;
def SlurpJoined : Option<["-"], "slurpjoined", KIND_REMAINING_ARGS_JOINED>;
def Blorp : Flag<["-", "--"], "blorp">, HelpText<"The blorp option">, Flags<[OptFlag1]>;
def Blarn : Flag<["--", "-"], "blarn">, HelpText<"The blarn option">, Flags<[OptFlag1]>;
def Cramb : Joined<["/"], "cramb:">, HelpText<"The cramb option">, MetaVarName<"CRAMB">, Flags<[OptFlag1]>;
def Doopf1 : Flag<["-"], "doopf1">, HelpText<"The doopf1 option">, Flags<[OptFlag1]>;
def Doopf2 : Flag<["-"], "doopf2">, HelpText<"The doopf2 option">, Flags<[OptFlag2]>;