From 37bf45b696c3eb04f2353647fb572d7374d2b02e Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 17 Aug 2014 15:53:49 -0400
Subject: [PATCH] Parser

- ::insertOr and ::insertAnd must use nodes, not _tree->_branches.
---
 src/Parser.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Parser.cpp b/src/Parser.cpp
index 2bcf94035..cff8730a9 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -1707,7 +1707,7 @@ bool Parser::insertOr ()
   {
     if ((*i)->hasTag ("FILTER") && ! (*i)->hasTag ("PSEUDO"))
     {
-      if (prev != _tree->_branches.begin () &&
+      if (prev != nodes.begin () &&
           ((*prev)->hasTag ("ID") || (*prev)->hasTag ("UUID")) &&
           ((*i)->hasTag ("ID") || (*i)->hasTag ("UUID")))
       {
@@ -1752,7 +1752,7 @@ bool Parser::insertAnd ()
         for (sub = (*i)->_branches.begin (); sub != (*i)->_branches.end (); ++sub)
         {
           if (sub != prev &&
-              prev != _tree->_branches.begin () &&
+              prev != nodes.begin () &&
               (! (*prev)->hasTag ("OP") || (*prev)->attribute ("raw") == ")") &&
               (! (*sub)->hasTag ("OP") || (*sub)->attribute ("raw") == "("))
           {
@@ -1770,7 +1770,7 @@ bool Parser::insertAnd ()
       else
       {
         if (i != prev &&
-            prev != _tree->_branches.begin () &&
+            prev != nodes.begin () &&
             (! (*prev)->hasTag ("OP") || (*prev)->attribute ("raw") == ")") &&
             (! (*i)->hasTag ("OP") || (*i)->attribute ("raw") == "("))
         {