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 
- Converted ::findTerminator to use the recursive scanner.
This commit is contained in:
Paul Beckingham 2014-08-17 00:41:11 -04:00
parent fb32b160b8
commit 3c612a8551
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/Parser.cpp
View file

@ -170,13 +170,12 @@ Tree* Parser::tree ()
Tree* Parser::parse ()
{
findBinary ();
findTerminator ();
scan (&Parser::findTerminator);
resolveAliases ();
findOverrides ();
applyOverrides ();
findSubstitution ();
findPattern ();
findTag ();
@ -331,27 +330,26 @@ void Parser::findBinary ()
////////////////////////////////////////////////////////////////////////////////
// The parser override operator terminates all subsequent cleverness, leaving
// all args in the raw state.
void Parser::findTerminator ()
void Parser::findTerminator (Tree* t)
{
bool found = false;
std::vector <Tree*>::iterator i;
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
// Mark the terminator.
static bool found = false;
if (! found &&
t->attribute ("raw") == "--")
{
if (!found &&
(*i)->attribute ("raw") == "--")
{
(*i)->unTag ("?");
(*i)->removeAllBranches ();
(*i)->tag ("TERMINATOR");
found = true;
}
else if (found)
{
(*i)->unTag ("?");
(*i)->removeAllBranches ();
(*i)->tag ("WORD");
(*i)->tag ("TERMINATED");
}
t->unTag ("?");
t->removeAllBranches ();
t->tag ("TERMINATOR");
found = true;
}
// Mark subsequent nodes.
else if (found)
{
t->unTag ("?");
t->removeAllBranches ();
t->tag ("WORD");
t->tag ("TERMINATED");
}
}