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

Parser

Browse source 
- Modified ::findAttributeModifier to use collect.
This commit is contained in:
Paul Beckingham 2014-08-17 12:33:30 -04:00
parent 56ab8e7920
commit a13c816919
2 changed files with 159 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/Parser.cpp
View file

@ -182,8 +182,8 @@ Tree* Parser::parse ()
findPattern (); findPattern ();
findTag (); findTag ();
findAttribute (); findAttribute ();
findAttributeModifier ();
// GOOD ^^^ // GOOD ^^^
scan (&Parser::findAttributeModifier);
scan (&Parser::findOperator); scan (&Parser::findOperator);
findCommand (); findCommand ();
findUUIDList (); findUUIDList ();
@ -1049,12 +1049,17 @@ void Parser::findAttribute ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// <name>.<mod>[:=]['"]<value>['"] // <name>.<mod>[:=]['"]<value>['"]
void Parser::findAttributeModifier (Tree* t) void Parser::findAttributeModifier ()
{ {
context.debug ("findAttributeModifier"); context.debug ("Parser::findAttributeModifier");
context.debug (t->dump ()); bool action = false;
std::string raw = t->attribute ("raw"); std::vector <Tree*> nodes;
collect (nodes, false);
std::vector <Tree*>::iterator i;
for (i = nodes.begin (); i != nodes.end (); ++i)
{
std::string raw = (*i)->attribute ("raw");
Nibbler n (raw); Nibbler n (raw);
std::string name; std::string name;
@ -1085,114 +1090,115 @@ void Parser::findAttributeModifier (Tree* t)
if (value == "") if (value == "")
value = "''"; value = "''";
t->unTag ("?"); (*i)->unTag ("?");
t->removeAllBranches (); (*i)->removeAllBranches ();
t->tag ("ATTMOD"); (*i)->tag ("ATTMOD");
t->attribute ("name", canonical); (*i)->attribute ("name", canonical);
t->attribute ("raw", value); (*i)->attribute ("raw", value);
t->attribute ("modifier", modifier); (*i)->attribute ("modifier", modifier);
t->attribute ("sense", sense); (*i)->attribute ("sense", sense);
action = true;
Tree* branch = t->addBranch (new Tree ("argAttmod")); Tree* branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", canonical); branch->attribute ("raw", canonical);
if (modifier == "before" || modifier == "under" || modifier == "below") if (modifier == "before" || modifier == "under" || modifier == "below")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "<"); branch->attribute ("raw", "<");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "after" || modifier == "over" || modifier == "above") else if (modifier == "after" || modifier == "over" || modifier == "above")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", ">"); branch->attribute ("raw", ">");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "none") else if (modifier == "none")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "=="); branch->attribute ("raw", "==");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "''"); branch->attribute ("raw", "''");
} }
else if (modifier == "any") else if (modifier == "any")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!="); branch->attribute ("raw", "!=");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "''"); branch->attribute ("raw", "''");
} }
else if (modifier == "is" || modifier == "equals") else if (modifier == "is" || modifier == "equals")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "=="); branch->attribute ("raw", "==");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "isnt" || modifier == "not") else if (modifier == "isnt" || modifier == "not")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!="); branch->attribute ("raw", "!=");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "has" || modifier == "contains") else if (modifier == "has" || modifier == "contains")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "hasnt") else if (modifier == "hasnt")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!~"); branch->attribute ("raw", "!~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "startswith" || modifier == "left") else if (modifier == "startswith" || modifier == "left")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "'^" + value + "'"); branch->attribute ("raw", "'^" + value + "'");
} }
else if (modifier == "endswith" || modifier == "right") else if (modifier == "endswith" || modifier == "right")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "'" + value + "$'"); branch->attribute ("raw", "'" + value + "$'");
} }
else if (modifier == "word") else if (modifier == "word")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
#if defined (DARWIN) #if defined (DARWIN)
branch->attribute ("raw", value); branch->attribute ("raw", value);
@ -1204,11 +1210,11 @@ void Parser::findAttributeModifier (Tree* t)
} }
else if (modifier == "noword") else if (modifier == "noword")
{ {
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!~"); branch->attribute ("raw", "!~");
branch->tag ("OP"); branch->tag ("OP");
branch = t->addBranch (new Tree ("argAttmod")); branch = (*i)->addBranch (new Tree ("argAttmod"));
#if defined (DARWIN) #if defined (DARWIN)
branch->attribute ("raw", value); branch->attribute ("raw", value);
@ -1226,13 +1232,17 @@ void Parser::findAttributeModifier (Tree* t)
if (col != context.columns.end () && if (col != context.columns.end () &&
col->second->modifiable ()) col->second->modifiable ())
{ {
t->tag ("MODIFIABLE"); (*i)->tag ("MODIFIABLE");
} }
} }
} }
} }
} }
} }
}
if (action)
context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
src/Parser.h
View file

@ -76,7 +76,7 @@ private:
void findSubstitution (); void findSubstitution ();
void findTag (); void findTag ();
void findAttribute (); void findAttribute ();
void findAttributeModifier (Tree*); void findAttributeModifier ();
void findOperator (Tree*); void findOperator (Tree*);
void findFilter (); void findFilter ();
void findModifications (); void findModifications ();