gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Expressions

Browse Source 
- Reclassified attr (name:value) and attmod (name.mod:value) values
  as "exp", to be tokenized.
This commit is contained in:
Paul Beckingham
2011-07-17 14:25:49 -04:00
parent 137b00a14a
commit ddbf9d374e
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Expression.cpp
View File

@@ -761,8 +761,14 @@ void Expression::expand_pattern ()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Convert: <name>[:=]<value> // +----------------+ +----------+ +------+ +---------+
// To: <name> = lex<value> // | <name>:<value> | | <name> | | = | | <value> |
// +----------------+ +----------+ +------+ +---------+
// | | --> | <lvalue> | | op | | exp |
// +----------------+ +----------+ +------+ +---------+
// | attr | | attr | | attr | | attr |
// +----------------+ +----------+ +------+ +---------+
//
void Expression::expand_attr () void Expression::expand_attr ()
{ {
Arguments temp; Arguments temp;
@@ -786,7 +792,7 @@ void Expression::expand_attr ()
temp.push_back (Triple (name, "lvalue", arg->_third)); temp.push_back (Triple (name, "lvalue", arg->_third));
temp.push_back (Triple ("=", "op", arg->_third)); temp.push_back (Triple ("=", "op", arg->_third));
temp.push_back (Triple (value, "rvalue", arg->_third)); temp.push_back (Triple (value, "exp", arg->_third));
delta = true; delta = true;
} }
else else
@@ -801,8 +807,14 @@ void Expression::expand_attr ()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Convert: <name>.<mod>[:=]<value> // +----------------------+ +----------+ +-------+ +---------------+
// To: <name> <op> lex<value> // | <name>.<mod>:<value> | | <name> | | <mod> | | <value> |
// +----------------------+ +----------+ +-------+ +---------------+
// | | --> | <lvalue> | | op | | exp/string/rx |
// +----------------------+ +----------+ +-------+ +---------------+
// | attr | | attr | | attr | | attr |
// +----------------------+ +----------+ +-------+ +---------------+
//
void Expression::expand_attmod () void Expression::expand_attmod ()
{ {
Arguments temp; Arguments temp;
@@ -830,13 +842,13 @@ void Expression::expand_attmod ()
{ {
temp.push_back (Triple (name, "lvalue", arg->_third)); temp.push_back (Triple (name, "lvalue", arg->_third));
temp.push_back (Triple ("<", "op", arg->_third)); temp.push_back (Triple ("<", "op", arg->_third));
temp.push_back (Triple (value, "rvalue", arg->_third)); temp.push_back (Triple (value, "exp", arg->_third));
} }
else if (mod == "after" || mod == "over" || mod == "above") else if (mod == "after" || mod == "over" || mod == "above")
{ {
temp.push_back (Triple (name, "lvalue", arg->_third)); temp.push_back (Triple (name, "lvalue", arg->_third));
temp.push_back (Triple (">", "op", arg->_third)); temp.push_back (Triple (">", "op", arg->_third));
temp.push_back (Triple (value, "rvalue", arg->_third)); temp.push_back (Triple (value, "exp", arg->_third));
} }
else if (mod == "none") else if (mod == "none")
{ {
@@ -854,13 +866,13 @@ void Expression::expand_attmod ()
{ {
temp.push_back (Triple (name, "lvalue", arg->_third)); temp.push_back (Triple (name, "lvalue", arg->_third));
temp.push_back (Triple ("=", "op", arg->_third)); temp.push_back (Triple ("=", "op", arg->_third));
temp.push_back (Triple (value, "rvalue", arg->_third)); temp.push_back (Triple (value, "exp", arg->_third));
} }
else if (mod == "isnt" || mod == "not") else if (mod == "isnt" || mod == "not")
{ {
temp.push_back (Triple (name, "lvalue", arg->_third)); temp.push_back (Triple (name, "lvalue", arg->_third));
temp.push_back (Triple ("!=", "op", arg->_third)); temp.push_back (Triple ("!=", "op", arg->_third));
temp.push_back (Triple (value, "rvalue", arg->_third)); temp.push_back (Triple (value, "exp", arg->_third));
} }
else if (mod == "has" || mod == "contains") else if (mod == "has" || mod == "contains")
{ {