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 ::findPattern to use collect.
This commit is contained in:
Paul Beckingham 2014-08-17 12:22:03 -04:00
parent a4f558ee1c
commit 6dd359e900
2 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/Parser.cpp
View file

@ -179,8 +179,8 @@ Tree* Parser::parse ()
applyOverrides ();
findSubstitution ();
findPattern ();
// GOOD ^^^
scan (&Parser::findPattern);
scan (&Parser::findTag);
scan (&Parser::findAttribute);
scan (&Parser::findAttributeModifier);
@ -830,39 +830,49 @@ std::string Parser::getCommand () const
////////////////////////////////////////////////////////////////////////////////
// /pattern/ --> description ~ pattern
void Parser::findPattern (Tree* t)
void Parser::findPattern ()
{
context.debug ("findPattern");
context.debug (t->dump ());
context.debug ("Parser::findPattern");
bool action = false;
Nibbler n (t->attribute ("raw"));
std::string pattern;
if (n.getQuoted ('/', pattern) &&
n.depleted () &&
pattern.length () > 0)
std::vector <Tree*> nodes;
collect (nodes, false);
std::vector <Tree*>::iterator i;
for (i = nodes.begin (); i != nodes.end (); ++i)
{
t->unTag ("?");
t->removeAllBranches ();
t->tag ("PATTERN");
Nibbler n ((*i)->attribute ("raw"));
std::string pattern;
if (n.getQuoted ('/', pattern) &&
n.depleted () &&
pattern.length () > 0)
{
(*i)->unTag ("?");
(*i)->removeAllBranches ();
(*i)->tag ("PATTERN");
Tree* branch = t->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "description");
Tree* branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "description");
branch = t->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "~");
branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "~");
branch->tag ("OP");
branch = t->addBranch (new Tree ("argPat"));
branch->attribute ("raw", pattern);
branch->tag ("STRING");
branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", pattern);
branch->tag ("STRING");
action = true;
}
}
if (action)
context.debug (_tree->dump ());
}
////////////////////////////////////////////////////////////////////////////////
// /from/to/[g]
void Parser::findSubstitution ()
{
context.debug ("Parse::findSubstitution");
context.debug ("Parser::findSubstitution");
bool action = false;
std::vector <Tree*> nodes;

2
src/Parser.h
View file

@ -72,7 +72,7 @@ public:
private:
void scan (void (Parser::*callback)(Tree*), Tree* tree = NULL);
void findTerminator ();
void findPattern (Tree*);
void findPattern ();
void findSubstitution ();
void findTag (Tree*);
void findAttribute (Tree*);