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

Slight refactoring of expander's return code implementation

Browse source
This commit is contained in:
ridiculousfish 2015-08-03 15:58:37 -07:00
parent 83322f63c6
commit d2049edcab
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/wildcard.cpp
View file

@ -717,6 +717,16 @@ class wildcard_expander_t
*/ */
void expand_last_segment(const wcstring &base_dir, DIR *base_dir_fp, const wcstring &wc); void expand_last_segment(const wcstring &base_dir, DIR *base_dir_fp, const wcstring &wc);
/* Indicate whether we should cancel wildcard expansion. This latches 'interrupt' */
bool interrupted()
{
if (! did_interrupt)
{
did_interrupt = (is_main_thread() ? reader_interrupted() : reader_thread_job_is_stale());
}
return did_interrupt;
}
/* Helper to resolve an empty base directory */ /* Helper to resolve an empty base directory */
static DIR *open_dir(const wcstring &base_dir) static DIR *open_dir(const wcstring &base_dir)
{ {
@ -739,21 +749,16 @@ public:
/* Do wildcard expansion. This is recursive. */ /* Do wildcard expansion. This is recursive. */
void expand(const wcstring &base_dir, const wchar_t *wc); void expand(const wcstring &base_dir, const wchar_t *wc);
int status_code() const
/* Indicate whether we should cancel wildcard expansion. This latches 'interrupt' */
bool interrupted()
{ {
if (! did_interrupt) if (this->did_interrupt)
{ {
did_interrupt = (is_main_thread() ? reader_interrupted() : reader_thread_job_is_stale()); return -1;
}
else
{
return this->did_add ? 1 : 0;
} }
return did_interrupt;
}
/* Indicates whether something was added */
bool added() const
{
return this->did_add;
} }
}; };
@ -1309,14 +1314,7 @@ static int wildcard_expand(const wchar_t *wc,
c.prepend_token_prefix(base_dir); c.prepend_token_prefix(base_dir);
} }
} }
if (expander.interrupted()) return expander.status_code();
{
return -1;
}
else
{
return expander.added() ? 1 : 0;
}
} }
int wildcard_expand_string(const wcstring &wc, const wcstring &base_dir, expand_flags_t flags, std::vector<completion_t> *output) int wildcard_expand_string(const wcstring &wc, const wcstring &base_dir, expand_flags_t flags, std::vector<completion_t> *output)