QueryParser: Fix some debug macros

This commit is contained in:
Ingo Weinhold 2013-06-01 02:40:08 +02:00
parent 118028674c
commit d055934e36
1 changed files with 5 additions and 5 deletions

View File

@ -1108,7 +1108,7 @@ template<typename QueryPolicy>
void void
Operator<QueryPolicy>::PrintToStream() Operator<QueryPolicy>::PrintToStream()
{ {
D(__out("( ")); QUERY_D(__out("( "));
if (fLeft != NULL) if (fLeft != NULL)
fLeft->PrintToStream(); fLeft->PrintToStream();
@ -1118,12 +1118,12 @@ Operator<QueryPolicy>::PrintToStream()
case OP_AND: op = "AND"; break; case OP_AND: op = "AND"; break;
default: op = "?"; break; default: op = "?"; break;
} }
D(__out(" %s ", op)); QUERY_D(__out(" %s ", op));
if (fRight != NULL) if (fRight != NULL)
fRight->PrintToStream(); fRight->PrintToStream();
D(__out(" )")); QUERY_D(__out(" )"));
} }
@ -1140,7 +1140,7 @@ Equation<QueryPolicy>::PrintToStream()
case OP_LESS_THAN: symbol = "<"; break; case OP_LESS_THAN: symbol = "<"; break;
case OP_LESS_THAN_OR_EQUAL: symbol = "<="; break; case OP_LESS_THAN_OR_EQUAL: symbol = "<="; break;
} }
D(__out("[\"%s\" %s \"%s\"]", fAttribute, symbol, fString)); QUERY_D(__out("[\"%s\" %s \"%s\"]", fAttribute, symbol, fString));
} }
#endif // DEBUG_QUERY #endif // DEBUG_QUERY
@ -1162,7 +1162,7 @@ Expression<QueryPolicy>::Expression(char* expr)
} }
QUERY_D(if (fTerm != NULL) { QUERY_D(if (fTerm != NULL) {
fTerm->PrintToStream(); fTerm->PrintToStream();
D(__out("\n")); QUERY_D(__out("\n"));
if (*expr != '\0') if (*expr != '\0')
PRINT(("Unexpected end of string: \"%s\"!\n", expr)); PRINT(("Unexpected end of string: \"%s\"!\n", expr));
}); });