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

CLI

Browse source 
- Converted _command from std::string to A.
This commit is contained in:
Paul Beckingham 2014-10-15 01:43:27 -04:00
parent e5780474da
commit 698c801dbc
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/CLI.cpp
View file

@ -205,7 +205,6 @@ const std::string A::dump () const
////////////////////////////////////////////////////////////////////////////////
CLI::CLI ()
: _rc ("")
, _command ("")
, _readOnly (false)
{
}
@ -237,7 +236,7 @@ void CLI::initialize (int argc, const char** argv)
_args.clear ();
_rc = "";
_overrides.clear ();
_command = "";
_command.clear ();
_readOnly = false;
_filter.clear ();
_modifications.clear ();
@ -272,7 +271,7 @@ void CLI::add (const std::string& arg)
_args.clear ();
_rc = "";
_overrides.clear ();
_command = "";
_command.clear ();
_readOnly = false;
_filter.clear ();
_modifications.clear ();
@ -411,10 +410,15 @@ void CLI::categorize ()
for (i = _args.begin (); i != _args.end (); ++i)
{
std::string raw = i->attribute ("raw");
if (canonicalize (_command, "cmd", raw))
std::string command;
if (canonicalize (command, "cmd", raw))
{
_command._name = "argCmd";
_command.attribute ("raw", raw);
_command.attribute ("canonical", command);
_readOnly = ! exactMatch ("writecmd", command);
_command.tag (_readOnly ? "READCMD" : "WRITECMD");
foundCommand = true;
_readOnly = ! exactMatch ("writecmd", _command);
}
else if (foundCommand && ! _readOnly)
{
@ -564,7 +568,8 @@ void CLI::dump (const std::string& label) const
std::cout << " " << a->dump () << "\n";
}
std::cout << " _command " << _command << " " << (_readOnly ? "(read)" : "(write)") << "\n";
std::cout << " _command\n"
<< " " << _command.dump () << "\n";
if (_modifications.size ())
{

2
src/CLI.h
View file

@ -87,7 +87,7 @@ public:
std::vector <A> _args;
std::string _rc;
std::map <std::string, std::string> _overrides;
std::string _command;
A _command;
bool _readOnly;
std::vector <A> _filter;
std::vector <A> _modifications;