GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-04 19:47:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Parser

Browse source 
- Converted ::findAttributeModifier to use the recursive scanner.
This commit is contained in:
Paul Beckingham 2014-08-17 00:49:20 -04:00
parent 24c2c0cbee
commit 3a8d42dae7
2 changed files with 150 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/Parser.cpp
View file

@ -182,7 +182,7 @@ Tree* Parser::parse ()
findPattern (); findPattern ();
findTag (); findTag ();
findAttribute (); findAttribute ();
findAttributeModifier (); scan (&Parser::findAttributeModifier);
findOperator (); findOperator ();
findCommand (); findCommand ();
findUUIDList (); findUUIDList ();
@ -998,20 +998,12 @@ void Parser::findAttribute ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// <name>.<mod>[:=]['"]<value>['"] // <name>.<mod>[:=]['"]<value>['"]
void Parser::findAttributeModifier () void Parser::findAttributeModifier (Tree* t)
{ {
std::vector <Tree*>::iterator i; context.debug ("findAttributeModifier");
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i) context.debug (t->dump ());
{
// Parser override operator.
if ((*i)->attribute ("raw") == "--")
break;
// Skip known args. std::string raw = t->attribute ("raw");
if (! (*i)->hasTag ("?"))
continue;
std::string raw = (*i)->attribute ("raw");
Nibbler n (raw); Nibbler n (raw);
std::string name; std::string name;
@ -1042,114 +1034,114 @@ void Parser::findAttributeModifier ()
if (value == "") if (value == "")
value = "''"; value = "''";
(*i)->unTag ("?"); t->unTag ("?");
(*i)->removeAllBranches (); t->removeAllBranches ();
(*i)->tag ("ATTMOD"); t->tag ("ATTMOD");
(*i)->attribute ("name", canonical); t->attribute ("name", canonical);
(*i)->attribute ("raw", value); t->attribute ("raw", value);
(*i)->attribute ("modifier", modifier); t->attribute ("modifier", modifier);
(*i)->attribute ("sense", sense); t->attribute ("sense", sense);
Tree* branch = (*i)->addBranch (new Tree ("argAttmod")); Tree* branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "<"); branch->attribute ("raw", "<");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", ">"); branch->attribute ("raw", ">");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "none") else if (modifier == "none")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "=="); branch->attribute ("raw", "==");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "''"); branch->attribute ("raw", "''");
} }
else if (modifier == "any") else if (modifier == "any")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!="); branch->attribute ("raw", "!=");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "''"); branch->attribute ("raw", "''");
} }
else if (modifier == "is" || modifier == "equals") else if (modifier == "is" || modifier == "equals")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "=="); branch->attribute ("raw", "==");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!="); branch->attribute ("raw", "!=");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", value); branch->attribute ("raw", value);
} }
else if (modifier == "hasnt") else if (modifier == "hasnt")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!~"); branch->attribute ("raw", "!~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->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 = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "'" + value + "$'"); branch->attribute ("raw", "'" + value + "$'");
} }
else if (modifier == "word") else if (modifier == "word")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
#if defined (DARWIN) #if defined (DARWIN)
branch->attribute ("raw", value); branch->attribute ("raw", value);
@ -1161,11 +1153,11 @@ void Parser::findAttributeModifier ()
} }
else if (modifier == "noword") else if (modifier == "noword")
{ {
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
branch->attribute ("raw", "!~"); branch->attribute ("raw", "!~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argAttmod")); branch = t->addBranch (new Tree ("argAttmod"));
#if defined (DARWIN) #if defined (DARWIN)
branch->attribute ("raw", value); branch->attribute ("raw", value);
@ -1183,8 +1175,7 @@ void Parser::findAttributeModifier ()
if (col != context.columns.end () && if (col != context.columns.end () &&
col->second->modifiable ()) col->second->modifiable ())
{ {
(*i)->tag ("MODIFIABLE"); t->tag ("MODIFIABLE");
}
} }
} }
} }

2
src/Parser.h
View file

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