Parser

- Removed parser upgrade diagnostics, as tw is now stable.

src/Parser.cpp

@@ -391,8 +391,6 @@ void Parser::findTerminator ()
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::resolveAliases ()
 {
-//  context.debug ("Parse::resolveAliases");
-
   bool something;
   int safety_valve = safetyValveDefault;
 
@@ -422,9 +420,6 @@ void Parser::resolveAliases ()
 
   if (safety_valve <= 0)
     context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault));
-
-//  if (something)
-//    context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -848,8 +843,6 @@ void Parser::findPattern ()
 // /from/to/[g]
 void Parser::findSubstitution ()
 {
-//  context.debug ("Parser::findSubstitution");
-
   std::vector <Tree*> prune;
   std::vector <Tree*> nodes;
   collect (nodes);
@@ -885,16 +878,12 @@ void Parser::findSubstitution ()
   // Prune branches outside the loop.
   for (i = prune.begin (); i != prune.end (); ++i)
     (*i)->removeAllBranches ();
-
-//  if (prune.size ())
-//    context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // +tag
 void Parser::findTag ()
 {
-//  context.debug ("Parser::findTag");
   bool action = true;
 
   do
@@ -943,8 +932,6 @@ void Parser::findTag ()
     }
   }
   while (action);
-
-//  context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1052,7 +1039,6 @@ void Parser::findAttribute ()
 // <name>.<mod>[:=]['"]<value>['"]
 void Parser::findAttributeModifier ()
 {
-//  context.debug ("Parser::findAttributeModifier");
   bool action = true;
 
   do
@@ -1249,8 +1235,6 @@ void Parser::findAttributeModifier ()
     }
   }
   while (action);
-
-//  context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1264,7 +1248,6 @@ void Parser::findAttributeModifier ()
 //
 void Parser::findIdSequence ()
 {
-//  context.debug ("Parser::findIdSequence");
   bool action = true;
 
   do
@@ -1429,14 +1412,11 @@ void Parser::findIdSequence ()
     }
   }
   while (action);
-
-//   context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::findUUIDList ()
 {
-//   context.debug ("Parser::findUUIDList");
   bool action = true;
 
   do
@@ -1514,15 +1494,11 @@ void Parser::findUUIDList ()
     }
   }
   while (action);
-
-//   context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::findOperator ()
 {
-//   context.debug ("Parser::findOperator");
-
   // Find the category.
   std::pair <std::multimap <std::string, std::string>::const_iterator, std::multimap <std::string, std::string>::const_iterator> c;
   c = _entities.equal_range ("operator");
@@ -1550,9 +1526,6 @@ void Parser::findOperator ()
   // Prune branches outside the loop.
   for (i = prune.begin (); i != prune.end (); ++i)
     (*i)->removeAllBranches ();
-
-//   if (prune.size ())
-//     context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1560,9 +1533,7 @@ 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;
 
@@ -1603,15 +1574,11 @@ void Parser::findFilter ()
       action = true;
     }
   }
-
-//   if (action)
-//     context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::findModifications ()
 {
-//   context.debug ("Parser::findModifications");
   bool after_writecmd = false;
 
   std::vector <Tree*> prune;
@@ -1640,16 +1607,11 @@ void Parser::findModifications ()
   // Prune branches outside the loop.
   for (i = prune.begin (); i != prune.end (); ++i)
     (*i)->removeAllBranches ();
-
-//   if (prune.size ())
-//     context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::findStrayModifications ()
 {
-//   context.debug ("Parser::findStrayModifications");
-
   std::string command = getCommand ();
   if (command == "add" ||
       command == "log")
@@ -1671,9 +1633,6 @@ void Parser::findStrayModifications ()
     // Prune branches outside the loop.
     for (i = prune.begin (); i != prune.end (); ++i)
       (*i)->removeAllBranches ();
-
-//     if (prune.size ())
-//       context.debug (_tree->dump ());
   }
 }
 
@@ -1682,7 +1641,6 @@ void Parser::findStrayModifications ()
 // are not otherwise recognized, and potentially promote them to patterns.
 void Parser::findPlainArgs ()
 {
-//   context.debug ("Parser::findPlainArgs");
   bool action = false;
 
   std::vector <Tree*> nodes;
@@ -1726,15 +1684,11 @@ void Parser::findPlainArgs ()
       }
     }
   }
-
-//   if (action)
-//     context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void Parser::findMissingOperators ()
 {
-//   context.debug ("Parser::findMissingOperators");
   bool action = false;
 
   while (insertOr ())
@@ -1742,9 +1696,6 @@ void Parser::findMissingOperators ()
 
   while (insertAnd ())
     action = true;
-
-//   if (action)
-//     context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////