Parser

- Converted ::findTerminator to use the recursive scanner.

src/Parser.cpp

@@ -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;
+  // Mark the terminator.
-  std::vector <Tree*>::iterator i;
+  static bool found = false;
-  for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
+  if (! found &&
+      t->attribute ("raw") == "--")
   {
-    if (!found &&
+    t->unTag ("?");
-        (*i)->attribute ("raw") == "--")
+    t->removeAllBranches ();
-    {
+    t->tag ("TERMINATOR");
-      (*i)->unTag ("?");
-      (*i)->removeAllBranches ();
-      (*i)->tag ("TERMINATOR");
     found = true;
   }
+
+  // Mark subsequent nodes.
   else if (found)
   {
-      (*i)->unTag ("?");
+    t->unTag ("?");
-      (*i)->removeAllBranches ();
+    t->removeAllBranches ();
-      (*i)->tag ("WORD");
+    t->tag ("WORD");
-      (*i)->tag ("TERMINATED");
+    t->tag ("TERMINATED");
-    }
   }
 }
 

src/Parser.h

@@ -68,8 +68,8 @@ public:
   std::string getCommand () const;
 
 private:
-  void findTerminator ();
   void scan (void (Parser::*callback)(Tree*), Tree* tree = NULL);
+  void findTerminator (Tree*);
   void findPattern ();
   void findSubstitution ();
   void findTag ();