From d4adf13b6997ad883a4800a343a9cf40d10b8b51 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 22 Aug 2014 22:37:53 -0400 Subject: [PATCH] Parser - Made use of the other ::collect variants. --- src/Parser.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/Parser.cpp b/src/Parser.cpp index 6c72ecd59..ee5341581 100644 --- a/src/Parser.cpp +++ b/src/Parser.cpp @@ -537,14 +537,10 @@ void Parser::getOverrides ( File& rc) { std::vector nodes; - collect (nodes, collectTerminated); + collect (nodes, collectLeaf); std::vector ::iterator i; for (i = nodes.begin (); i != nodes.end (); ++i) { - // Parser override operator. - if ((*i)->attribute ("raw") == "--") - break; - if ((*i)->hasTag ("RC")) { rc = File ((*i)->attribute ("file")); @@ -597,14 +593,10 @@ void Parser::applyOverrides () context.debug ("Parse::applyOverrides"); std::vector nodes; - collect (nodes, collectTerminated); + collect (nodes, collectLeaf); std::vector ::iterator i; for (i = nodes.begin (); i != nodes.end (); ++i) { - // Parser override operator. - if ((*i)->attribute ("raw") == "--") - break; - if ((*i)->hasTag ("CONFIG")) { std::string name = (*i)->attribute ("name");