- ::findPlainArgs was only being run in debug mode. Not a good idea.
This commit is contained in:
Paul Beckingham 2014-05-31 12:27:56 -04:00
parent 190b6fe635
commit 30fee92914

View file

@ -1353,31 +1353,28 @@ void Parser::findModifications ()
// are not otherwise recognized, and potentially promote them to patterns. // are not otherwise recognized, and potentially promote them to patterns.
void Parser::findPlainArgs () void Parser::findPlainArgs ()
{ {
if (context.config.getBoolean ("debug")) std::vector <Tree*>::iterator i;
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
{ {
std::vector <Tree*>::iterator i; if ((*i)->hasTag ("FILTER") &&
for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i) (*i)->hasTag ("ORIGINAL") && // TODO Wrong, can come in through alias/filter
(*i)->countTags () <= 2)
{ {
if ((*i)->hasTag ("FILTER") && // This tag also prevents further expanѕion.
(*i)->hasTag ("ORIGINAL") && // TODO Wrong, can come in through alias/filter (*i)->tag ("PATTERN");
(*i)->countTags () <= 2)
{
// This tag also prevents further expanѕion.
(*i)->tag ("PATTERN");
std::string pattern = (*i)->attribute ("raw"); std::string pattern = (*i)->attribute ("raw");
Tree* branch = (*i)->addBranch (new Tree ("argPat")); Tree* branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "description"); branch->attribute ("raw", "description");
branch = (*i)->addBranch (new Tree ("argPat")); branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", "~"); branch->attribute ("raw", "~");
branch->tag ("OP"); branch->tag ("OP");
branch = (*i)->addBranch (new Tree ("argPat")); branch = (*i)->addBranch (new Tree ("argPat"));
branch->attribute ("raw", pattern); branch->attribute ("raw", pattern);
branch->tag ("STRING"); branch->tag ("STRING");
}
} }
} }
} }