GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-29 17:07:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CLI

Browse source 
- Code cleanup of argument handling loops, ::categorize.
This commit is contained in:
Paul Beckingham 2014-11-09 12:01:10 -05:00
parent 8f60a106f7
commit b801358599
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/CLI.cpp
View file

@ -221,7 +221,7 @@ const std::string A::dump () const
void CLI::getOverride (int argc, const char** argv, std::string& home, File& rc) void CLI::getOverride (int argc, const char** argv, std::string& home, File& rc)
{ {
bool terminated = false; bool terminated = false;
for (int i = 1; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
std::string raw = argv[i]; std::string raw = argv[i];
@ -256,7 +256,7 @@ void CLI::getDataLocation (int argc, const char** argv, Path& data)
data = location; data = location;
bool terminated = false; bool terminated = false;
for (int i = 1; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
std::string raw = argv[i]; std::string raw = argv[i];
@ -280,7 +280,7 @@ void CLI::getDataLocation (int argc, const char** argv, Path& data)
void CLI::applyOverrides (int argc, const char** argv) void CLI::applyOverrides (int argc, const char** argv)
{ {
bool terminated = false; bool terminated = false;
for (int i = 1; i < argc; ++i) for (int i = 0; i < argc; ++i)
{ {
std::string raw = argv[i]; std::string raw = argv[i];
@ -349,7 +349,6 @@ void CLI::initialize (int argc, const char** argv)
_uuid_list.clear (); _uuid_list.clear ();
_original_args.push_back (argv[0]); _original_args.push_back (argv[0]);
for (int i = 1; i < argc; ++i) for (int i = 1; i < argc; ++i)
addArg (argv[i]); addArg (argv[i]);
@ -384,14 +383,15 @@ void CLI::analyze (bool parse /* = true */, bool strict /* = false */)
for (int i = 0; i < _original_args.size (); ++i) for (int i = 0; i < _original_args.size (); ++i)
{ {
std::string raw = _original_args[i];
A a ("arg", raw);
if (i == 0) if (i == 0)
{ {
A a ("arg", _original_args[i]);
a.tag ("ORIGINAL"); a.tag ("ORIGINAL");
a.tag ("BINARY"); a.tag ("BINARY");
std::string basename = "task"; std::string basename = "task";
std::string raw = _original_args[i];
std::string::size_type slash = raw.rfind ('/'); std::string::size_type slash = raw.rfind ('/');
if (slash != std::string::npos) if (slash != std::string::npos)
basename = raw.substr (slash + 1); basename = raw.substr (slash + 1);
@ -401,15 +401,14 @@ void CLI::analyze (bool parse /* = true */, bool strict /* = false */)
a.tag ("CALENDAR"); a.tag ("CALENDAR");
else if (basename == "task" || basename == "tw" || basename == "t") else if (basename == "task" || basename == "tw" || basename == "t")
a.tag ("TW"); a.tag ("TW");
_args.push_back (a);
} }
else else
{ {
A a ("arg", _original_args[i]); A a ("arg", raw);
a.tag ("ORIGINAL"); a.tag ("ORIGINAL");
_args.push_back (a);
} }
_args.push_back (a);
} }
if (context.config.getInteger ("debug.parser") >= 3) if (context.config.getInteger ("debug.parser") >= 3)