diff options
author | Brian Gesiak <modocache@gmail.com> | 2018-05-14 22:36:47 +0000 |
---|---|---|
committer | Brian Gesiak <modocache@gmail.com> | 2018-05-14 22:36:47 +0000 |
commit | 67ebb421ce018b22e875a03da7844e40d13fb173 (patch) | |
tree | 741a2cbc2a21daca12b11df21f7d57c6489f7d0a /lib/Option | |
parent | abb2646f5ab81d773b6a09632b7a66fa84334a37 (diff) |
Revert "[Option] Fix PR37006 prefix choice in findNearest"
Summary:
This revision causes build failures in PS4 and ppc64le buildbots (for example,
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/29988).
I'll revert for now and try to diagnose the issue.
Test Plan: check-llvm check-clang
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@332304 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Option')
-rw-r--r-- | lib/Option/OptTable.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/lib/Option/OptTable.cpp b/lib/Option/OptTable.cpp index 293b6e54e21..022b9d5d933 100644 --- a/lib/Option/OptTable.cpp +++ b/lib/Option/OptTable.cpp @@ -252,33 +252,38 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString, unsigned MinimumLength) const { assert(!Option.empty()); - // Consider each [option prefix + option name] pair as a candidate, finding - // the closest match. + // Consider each option 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; - // 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. + // 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]; + } - // Now check if the candidate ends with a character commonly used when + // 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 = ""; @@ -292,19 +297,14 @@ unsigned OptTable::findNearest(StringRef Option, std::string &NearestString, else std::tie(LHS, RHS) = Option.split(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(); - StringRef Candidate = (CandidatePrefix + CandidateName).str(); - unsigned Distance = - Candidate.edit_distance(NormalizedName, /*AllowReplacements=*/true, - /*MaxEditDistance=*/BestDistance); - if (Distance < BestDistance) { - BestDistance = Distance; - NearestString = (Candidate + RHS).str(); - } + 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(); } } return BestDistance; |