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

A3t

Browse source 
- Default and assumed commands are tagged accordingly.
This commit is contained in:
Paul Beckingham 2014-04-20 09:30:55 -04:00
parent ca887131a4
commit 3d2dd05332
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/A3t.cpp
View file

@ -401,14 +401,21 @@ void A3t::apply_overrides ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void A3t::inject_defaults () void A3t::inject_defaults ()
{ {
//std::cout << "#####################\n";
//std::cout << _tree->dump ();
// Scan the top-level branches for evidence of ID, UUID, overrides and other
// arguments.
bool found_command = false; bool found_command = false;
bool found_sequence = false; bool found_sequence = false;
bool found_other = false; bool found_other = false;
std::vector <Tree*>::iterator i; std::vector <Tree*>::iterator i;
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i) for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
{ {
if ((*i)->hasTag ("CMD")) if ((*i)->hasTag ("BINARY"))
;
else if ((*i)->hasTag ("CMD"))
found_command = true; found_command = true;
else if ((*i)->hasTag ("ID") || (*i)->hasTag ("UUID")) else if ((*i)->hasTag ("ID") || (*i)->hasTag ("UUID"))
@ -433,9 +440,10 @@ void A3t::inject_defaults ()
std::string defaultCommand = context.config.get ("default.command"); std::string defaultCommand = context.config.get ("default.command");
if (defaultCommand != "") if (defaultCommand != "")
{ {
//std::cout << "# defaultCommand\n"; //std::cout << "# default_command\n";
context.debug ("No command or sequence found - assuming default.command."); context.debug ("No command or sequence found - assuming default.command.");
capture_first (defaultCommand); Tree* t = capture_first (defaultCommand);
t->tag ("DEFAULT");
std::string combined; std::string combined;
std::vector <Tree*>::iterator i; std::vector <Tree*>::iterator i;
@ -451,35 +459,32 @@ void A3t::inject_defaults ()
} }
else else
{ {
//std::cout << "# ! defaultCommand\n";
throw std::string (STRING_TRIVIAL_INPUT); throw std::string (STRING_TRIVIAL_INPUT);
} }
} }
else else
{ {
//std::cout << "# found_sequence\n"; //std::cout << "# found_sequence\n";
/*
// Modify command. // TODO There is a problem, in that this block is not run.
if (found_other)
{
std::cout << "# found_other\n";
context.debug ("Sequence and filter, but no command found - assuming 'modify' command.");
capture_first ("modify");
}
// Information command. // Information command.
else if (! found_other)
{ {
*/
//std::cout << "# ! found_other\n"; //std::cout << "# ! found_other\n";
context.debug ("Sequence but no command found - assuming 'information' command."); context.debug ("Sequence but no command found - assuming 'information' command.");
context.header (STRING_ASSUME_INFO); context.header (STRING_ASSUME_INFO);
capture_first ("information"); Tree* t = capture_first ("information");
/* t->tag ("ASSUMED");
} }
*/
} }
} }
//else
// std::cout << "# found_command\n";
//std::cout << _tree->dump ();
//std::cout << "#####################\n";
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////