GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Code Cleanup

Browse source 
- Consolidated two forms of guess ().
This commit is contained in:
Paul Beckingham 2009-06-03 01:22:02 -04:00
parent 4ede817ead
commit 98978c7c00
1 changed files with 12 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/parse.cpp
View file

@ -156,12 +156,11 @@ static const char* commands[] =
static std::vector <std::string> customReports;
////////////////////////////////////////////////////////////////////////////////
void guess (const std::string& type, const char** list, std::string& candidate)
void guess (
const std::string& type,
std::vector<std::string>& options,
std::string& candidate)
{
std::vector <std::string> options;
for (int i = 0; list[i][0]; ++i)
options.push_back (list[i]);
std::vector <std::string> matches;
autoComplete (candidate, options, matches);
if (1 == matches.size ())
@ -189,32 +188,16 @@ void guess (const std::string& type, const char** list, std::string& candidate)
}
////////////////////////////////////////////////////////////////////////////////
void guess (const std::string& type, std::vector<std::string>& options, std::string& candidate)
void guess (
const std::string& type,
const char** list,
std::string& candidate)
{
std::vector <std::string> matches;
autoComplete (candidate, options, matches);
if (1 == matches.size ())
candidate = matches[0];
std::vector <std::string> options;
for (int i = 0; list[i][0]; ++i)
options.push_back (list[i]);
else if (0 == matches.size ())
candidate = "";
else
{
std::string error = "Ambiguous ";
error += type;
error += " '";
error += candidate;
error += "' - could be either of ";
for (size_t i = 0; i < matches.size (); ++i)
{
if (i)
error += ", ";
error += matches[i];
}
throw error;
}
guess (type, options, candidate);
}
////////////////////////////////////////////////////////////////////////////////