From 4425f5e1420153ccfdc9ee968c58eb71e5c1b8fe Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 17 Aug 2014 13:20:56 -0400
Subject: [PATCH] Parser

- Modified ::findFilter to use collect.
---
 src/Parser.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Parser.cpp b/src/Parser.cpp
index 840ea0a59..036c17426 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -188,8 +188,8 @@ Tree* Parser::parse ()
   findCommand ();
   findUUIDList ();
   findIdSequence ();
-  // GOOD ^^^
   findFilter ();
+  // GOOD ^^^
   findModifications ();
   findStrayModifications ();
 
@@ -1226,7 +1226,7 @@ void Parser::findAttributeModifier ()
 //
 void Parser::findIdSequence ()
 {
-  context.debug ("Parser::findAttributeModifier");
+  context.debug ("Parser::findIdSequence");
   bool action = false;
 
   std::vector <Tree*> nodes;
@@ -1494,10 +1494,16 @@ void Parser::findOperator ()
 // Anything after READCMD, but not BINARY, RC or CONFIG --> FILTER
 void Parser::findFilter ()
 {
+  context.debug ("Parser::findFilter");
+  bool action = false;
+
   bool before_cmd = true;
   bool after_readcmd = false;
+
+  std::vector <Tree*> nodes;
+  collect (nodes, false);
   std::vector <Tree*>::iterator i;
-  for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
+  for (i = nodes.begin (); i != nodes.end (); ++i)
   {
     // Parser override operator.
     if ((*i)->attribute ("raw") == "--")
@@ -1517,6 +1523,7 @@ void Parser::findFilter ()
     {
       (*i)->unTag ("?");
       (*i)->tag ("FILTER");
+      action = true;
     }
 
     if (after_readcmd &&
@@ -1527,8 +1534,12 @@ void Parser::findFilter ()
     {
       (*i)->unTag ("?");
       (*i)->tag ("FILTER");
+      action = true;
     }
   }
+
+  if (action)
+    context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////