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

Task

Browse source 
- Added detailed modification pipeline diagnostics.
This commit is contained in:
Paul Beckingham 2014-05-26 12:18:11 -04:00
parent bba0b75a3b
commit 0857b82618
1 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/Task.cpp
View file

@ -1938,6 +1938,12 @@ void Task::modify (modType type)
{ {
std::string text = ""; std::string text = "";
Tree* tree = context.parser.tree (); Tree* tree = context.parser.tree ();
if (tree)
context.debug (tree->dump ());
context.debug ("Task::modify");
std::string label = " MODIFICATION ";
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)
{ {
@ -1945,14 +1951,15 @@ void Task::modify (modType type)
{ {
if ((*i)->hasTag ("ATTRIBUTE")) if ((*i)->hasTag ("ATTRIBUTE"))
{ {
// 'name' is canonicalized. // 'name' is canonical.
// 'value' needs eval. // 'value' requires eval.
std::string name = (*i)->attribute ("name"); std::string name = (*i)->attribute ("name");
std::string value = (*i)->attribute ("raw"); std::string value = (*i)->attribute ("raw");
if (value == "") if (value == "")
{ {
// Remove attribute if the value is blank. // Remove attribute if the value is blank.
(*this).remove (name); (*this).remove (name);
context.debug (label + name + " <-- ''");
} }
else else
{ {
@ -2007,6 +2014,7 @@ void Task::modify (modType type)
Variant v; Variant v;
e.evaluateInfixExpression (value, v); e.evaluateInfixExpression (value, v);
context.debug (label + name + " <-- " + format ("{1}", v.get_date ()) + " <-- " + (std::string) v + " <-- " + value);
// TODO If v is duration and < 5y, add to now, else store as date. // TODO If v is duration and < 5y, add to now, else store as date.
// TODO Not sure if the above still holds true. // TODO Not sure if the above still holds true.
@ -2026,6 +2034,8 @@ void Task::modify (modType type)
Variant v; Variant v;
e.evaluateInfixExpression (value, v); e.evaluateInfixExpression (value, v);
context.debug (label + name + " <-- " + v.get_string () + " <-- " + value);
v.cast (Variant::type_duration); v.cast (Variant::type_duration);
v.cast (Variant::type_string); v.cast (Variant::type_string);
set (name, v); set (name, v);
@ -2041,6 +2051,8 @@ void Task::modify (modType type)
Variant v; Variant v;
e.evaluateInfixExpression (value, v); e.evaluateInfixExpression (value, v);
context.debug (label + name + " <-- " + v.get_string () + " <-- " + value);
v.cast (Variant::type_real); v.cast (Variant::type_real);
v.cast (Variant::type_string); v.cast (Variant::type_string);
set (name, v); set (name, v);
@ -2052,7 +2064,11 @@ void Task::modify (modType type)
// column->modify () contains the logic for the specific column // column->modify () contains the logic for the specific column
// and returns the appropriate value for (*this).set () // and returns the appropriate value for (*this).set ()
if (column->validate (value)) if (column->validate (value))
(*this).set (name, column->modify (value)); {
std::string col_value = column->modify (value);
context.debug (label + name + " <-- " + col_value + " <-- " + value);
(*this).set (name, col_value);
}
else else
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
} }
@ -2060,7 +2076,10 @@ void Task::modify (modType type)
{ {
// Final default action // Final default action
if (column->validate (value)) if (column->validate (value))
{
context.debug (label + name + " <-- " + value);
(*this).set (name, value); (*this).set (name, value);
}
else else
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
} }
@ -2073,6 +2092,7 @@ void Task::modify (modType type)
// arg7 from='from' global='1' raw='/from/to/g' to='to' ORIGINAL SUBSTITUTION MODIFICATION // arg7 from='from' global='1' raw='/from/to/g' to='to' ORIGINAL SUBSTITUTION MODIFICATION
else if ((*i)->hasTag ("SUBSTITUTION")) else if ((*i)->hasTag ("SUBSTITUTION"))
{ {
context.debug (label + "substitute " + (*i)->attribute ("raw"));
substitute ((*i)->attribute ("from"), substitute ((*i)->attribute ("from"),
(*i)->attribute ("to"), (*i)->attribute ("to"),
((*i)->attribute ("global") == "1")); ((*i)->attribute ("global") == "1"));
@ -2083,6 +2103,7 @@ void Task::modify (modType type)
// appropriate. // appropriate.
else if ((*i)->hasTag ("TAG")) else if ((*i)->hasTag ("TAG"))
{ {
context.debug (label + "tags " + (*i)->attribute ("raw"));
if ((*i)->attribute ("sign") == "+") if ((*i)->attribute ("sign") == "+")
{ {
std::string tag = (*i)->attribute ("tag"); std::string tag = (*i)->attribute ("tag");
@ -2118,10 +2139,25 @@ void Task::modify (modType type)
{ {
switch (type) switch (type)
{ {
case modReplace: set ("description", text); break; case modReplace:
case modPrepend: set ("description", text + " " + get ("description")); break; context.debug (label + "description <-- '" + text + "'");
case modAppend: set ("description", get ("description") + " " + text); break; set ("description", text);
case modAnnotate: addAnnotation (text); break; break;
case modPrepend:
context.debug (label + "description <-- '" + text + "' + description");
set ("description", text + " " + get ("description"));
break;
case modAppend:
context.debug (label + "description <-- description + '" + text + "'");
set ("description", get ("description") + " " + text);
break;
case modAnnotate:
context.debug (label + "new annotation <-- '" + text + "'");
addAnnotation (text);
break;
} }
} }
} }