- Commented out all diagnostics, as we converge on stable.
This commit is contained in:
Paul Beckingham 2014-08-24 14:06:50 -04:00
parent 06210056f8
commit bf533df39c

View file

@ -391,7 +391,7 @@ void Parser::findTerminator ()
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::resolveAliases () void Parser::resolveAliases ()
{ {
context.debug ("Parse::resolveAliases"); // context.debug ("Parse::resolveAliases");
bool something; bool something;
int safety_valve = safetyValveDefault; int safety_valve = safetyValveDefault;
@ -423,8 +423,8 @@ void Parser::resolveAliases ()
if (safety_valve <= 0) if (safety_valve <= 0)
context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault)); context.debug (format (STRING_PARSER_ALIAS_NEST, safetyValveDefault));
if (something) // if (something)
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -805,7 +805,7 @@ std::string Parser::getCommand () const
// /pattern/ --> description ~ pattern // /pattern/ --> description ~ pattern
void Parser::findPattern () void Parser::findPattern ()
{ {
context.debug ("Parser::findPattern"); // context.debug ("Parser::findPattern");
std::vector <Tree*> prune; std::vector <Tree*> prune;
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
@ -840,15 +840,15 @@ void Parser::findPattern ()
for (i = prune.begin (); i != prune.end (); ++i) for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
if (prune.size ()) // if (prune.size ())
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// /from/to/[g] // /from/to/[g]
void Parser::findSubstitution () void Parser::findSubstitution ()
{ {
context.debug ("Parser::findSubstitution"); // context.debug ("Parser::findSubstitution");
std::vector <Tree*> prune; std::vector <Tree*> prune;
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
@ -886,15 +886,15 @@ void Parser::findSubstitution ()
for (i = prune.begin (); i != prune.end (); ++i) for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
if (prune.size ()) // if (prune.size ())
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// +tag // +tag
void Parser::findTag () void Parser::findTag ()
{ {
context.debug ("Parser::findTag"); // context.debug ("Parser::findTag");
bool action = true; bool action = true;
do do
@ -944,14 +944,14 @@ void Parser::findTag ()
} }
while (action); while (action);
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// <name>:['"][<value>]['"] // <name>:['"][<value>]['"]
void Parser::findAttribute () void Parser::findAttribute ()
{ {
context.debug ("Parser::findAttribute"); // context.debug ("Parser::findAttribute");
bool action = true; bool action = true;
do do
@ -1042,14 +1042,14 @@ void Parser::findAttribute ()
} }
while (action); while (action);
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// <name>.<mod>[:=]['"]<value>['"] // <name>.<mod>[:=]['"]<value>['"]
void Parser::findAttributeModifier () void Parser::findAttributeModifier ()
{ {
context.debug ("Parser::findAttributeModifier"); // context.debug ("Parser::findAttributeModifier");
bool action = true; bool action = true;
do do
@ -1247,7 +1247,7 @@ void Parser::findAttributeModifier ()
} }
while (action); while (action);
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1261,7 +1261,7 @@ void Parser::findAttributeModifier ()
// //
void Parser::findIdSequence () void Parser::findIdSequence ()
{ {
context.debug ("Parser::findIdSequence"); // context.debug ("Parser::findIdSequence");
bool action = true; bool action = true;
do do
@ -1427,13 +1427,13 @@ void Parser::findIdSequence ()
} }
while (action); while (action);
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findUUIDList () void Parser::findUUIDList ()
{ {
context.debug ("Parser::findUUIDList"); // context.debug ("Parser::findUUIDList");
bool action = true; bool action = true;
do do
@ -1512,13 +1512,13 @@ void Parser::findUUIDList ()
} }
while (action); while (action);
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findOperator () void Parser::findOperator ()
{ {
context.debug ("Parser::findOperator"); // context.debug ("Parser::findOperator");
// Find the category. // Find the category.
std::pair <std::multimap <std::string, std::string>::const_iterator, std::multimap <std::string, std::string>::const_iterator> c; std::pair <std::multimap <std::string, std::string>::const_iterator, std::multimap <std::string, std::string>::const_iterator> c;
@ -1548,8 +1548,8 @@ void Parser::findOperator ()
for (i = prune.begin (); i != prune.end (); ++i) for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
if (prune.size ()) // if (prune.size ())
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1557,7 +1557,7 @@ void Parser::findOperator ()
// Anything after READCMD, but not BINARY, RC or CONFIG --> FILTER // Anything after READCMD, but not BINARY, RC or CONFIG --> FILTER
void Parser::findFilter () void Parser::findFilter ()
{ {
context.debug ("Parser::findFilter"); // context.debug ("Parser::findFilter");
bool action = false; bool action = false;
bool before_cmd = true; bool before_cmd = true;
@ -1601,14 +1601,14 @@ void Parser::findFilter ()
} }
} }
if (action) // if (action)
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findModifications () void Parser::findModifications ()
{ {
context.debug ("Parser::findModifications"); // context.debug ("Parser::findModifications");
bool after_writecmd = false; bool after_writecmd = false;
std::vector <Tree*> prune; std::vector <Tree*> prune;
@ -1638,14 +1638,14 @@ void Parser::findModifications ()
for (i = prune.begin (); i != prune.end (); ++i) for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
if (prune.size ()) // if (prune.size ())
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findStrayModifications () void Parser::findStrayModifications ()
{ {
context.debug ("Parser::findStrayModifications"); // context.debug ("Parser::findStrayModifications");
std::string command = getCommand (); std::string command = getCommand ();
if (command == "add" || if (command == "add" ||
@ -1669,8 +1669,8 @@ void Parser::findStrayModifications ()
for (i = prune.begin (); i != prune.end (); ++i) for (i = prune.begin (); i != prune.end (); ++i)
(*i)->removeAllBranches (); (*i)->removeAllBranches ();
if (prune.size ()) // if (prune.size ())
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
} }
@ -1679,7 +1679,7 @@ void Parser::findStrayModifications ()
// are not otherwise recognized, and potentially promote them to patterns. // are not otherwise recognized, and potentially promote them to patterns.
void Parser::findPlainArgs () void Parser::findPlainArgs ()
{ {
context.debug ("Parser::findPlainArgs"); // context.debug ("Parser::findPlainArgs");
bool action = false; bool action = false;
std::vector <Tree*> nodes; std::vector <Tree*> nodes;
@ -1724,14 +1724,14 @@ void Parser::findPlainArgs ()
} }
} }
if (action) // if (action)
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Parser::findMissingOperators () void Parser::findMissingOperators ()
{ {
context.debug ("Parser::findMissingOperators"); // context.debug ("Parser::findMissingOperators");
bool action = false; bool action = false;
while (insertOr ()) while (insertOr ())
@ -1740,8 +1740,8 @@ void Parser::findMissingOperators ()
while (insertAnd ()) while (insertAnd ())
action = true; action = true;
if (action) // if (action)
context.debug (_tree->dump ()); // context.debug (_tree->dump ());
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////