Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement Linear glob match #4094

Browse source
This commit is contained in:
hazem samir 2017-12-06 08:15:43 +02:00 committed by ridiculousfish
parent ae700c8707
commit c45d4abaef
1 changed files with 49 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
src/wildcard.cpp
View file

@ -93,54 +93,63 @@ bool wildcard_has(const wcstring &str, bool internal) {
/// \param wc The wildcard. /// \param wc The wildcard.
/// \param is_first Whether files beginning with dots should not be matched against wildcards. /// \param is_first Whether files beginning with dots should not be matched against wildcards.
static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const wchar_t *wc, static enum fuzzy_match_type_t wildcard_match_internal(const wchar_t *str, const wchar_t *wc,
bool leading_dots_fail_to_match, bool leading_dots_fail_to_match) {
bool is_first) {
if (*str == 0 && *wc == 0) {
return fuzzy_match_exact; // we're done
}
// Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow // Hackish fix for issue #270. Prevent wildcards from matching . or .., but we must still allow
// literal matches. // literal matches.
if (leading_dots_fail_to_match && is_first && (!wcscmp(str, L".") || !wcscmp(str, L".."))) { if (leading_dots_fail_to_match && (!wcscmp(str, L".") || !wcscmp(str, L".."))) {
// The string is '.' or '..'. Return true if the wildcard exactly matches. // The string is '.' or '..'. Return true if the wildcard exactly matches.
return wcscmp(str, wc) ? fuzzy_match_none : fuzzy_match_exact; return wcscmp(str, wc) ? fuzzy_match_none : fuzzy_match_exact;
} }
// Near Linear implementation as proposed here https://research.swtch.com/glob.
const wchar_t *wc_x = wc;
const wchar_t *str_x = str;
const wchar_t *restart_wc_x = wc;
const wchar_t *restart_str_x = str;
bool restart_is_out_of_str = false;
for (; *wc_x != 0 || *str_x != 0;) {
bool is_first = (str_x == str);
if (*wc_x != 0) {
if (*wc_x == ANY_STRING || *wc_x == ANY_STRING_RECURSIVE) {
// Ignore hidden file
if (leading_dots_fail_to_match && is_first && *str == L'.') {
return fuzzy_match_none;
}
if (*wc == ANY_STRING || *wc == ANY_STRING_RECURSIVE) { // Common case of * at the end. In that case we can early out since we know it will match.
// Ignore hidden file if (wc_x[1] == L'\0') {
if (leading_dots_fail_to_match && is_first && *str == L'.') { return fuzzy_match_exact;
return fuzzy_match_none; }
} // Try to match at str_x.
// If that doesn't work out, restart at str_x+1 next.
// Common case of * at the end. In that case we can early out since we know it will match. restart_wc_x = wc_x;
if (wc[1] == L'\0') { restart_str_x = str_x + 1;
return fuzzy_match_exact; restart_is_out_of_str = (*str_x == 0);
} wc_x++;
continue;
// Try all submatches. } else if (*wc_x == ANY_CHAR && *str_x != 0) {
do { if (is_first && *str_x == L'.') {
enum fuzzy_match_type_t subresult = return fuzzy_match_none;
wildcard_match_internal(str, wc + 1, leading_dots_fail_to_match, false); }
if (subresult != fuzzy_match_none) { wc_x++;
return subresult; str_x++;
continue;
} else if (*str_x != 0 && *str_x == *wc_x) { // ordinary character
wc_x++;
str_x++;
continue;
} }
} while (*str++ != 0);
return fuzzy_match_none;
} else if (*str == 0) {
// End of string, but not end of wildcard, and the next wildcard element is not a '*', so
// this is not a match.
return fuzzy_match_none;
} else if (*wc == ANY_CHAR) {
if (is_first && *str == L'.') {
return fuzzy_match_none;
} }
// Mismatch. Maybe restart.
return wildcard_match_internal(str + 1, wc + 1, leading_dots_fail_to_match, false); if (restart_str_x != str && !restart_is_out_of_str) {
} else if (*wc == *str) { wc_x = restart_wc_x;
return wildcard_match_internal(str + 1, wc + 1, leading_dots_fail_to_match, false); str_x = restart_str_x;
continue;
}
return fuzzy_match_none;
} }
// Matched all of pattern to all of name. Success.
return fuzzy_match_none; return fuzzy_match_exact;
} }
// This does something horrible refactored from an even more horrible function. // This does something horrible refactored from an even more horrible function.
@ -312,7 +321,7 @@ bool wildcard_complete(const wcstring &str, const wchar_t *wc, const wchar_t *de
bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_fail_to_match) { bool wildcard_match(const wcstring &str, const wcstring &wc, bool leading_dots_fail_to_match) {
enum fuzzy_match_type_t match = wildcard_match_internal( enum fuzzy_match_type_t match = wildcard_match_internal(
str.c_str(), wc.c_str(), leading_dots_fail_to_match, true /* first */); str.c_str(), wc.c_str(), leading_dots_fail_to_match);
return match != fuzzy_match_none; return match != fuzzy_match_none;
} }