--- a/libidav/davqlparser.h Tue Mar 31 13:00:17 2015 +0200 +++ b/libidav/davqlparser.h Wed Apr 01 11:42:38 2015 +0200 @@ -54,11 +54,12 @@ * Enumeration of possible expression operators. */ typedef enum { - ADD, SUB, MUL, DIV, - AND, OR, XOR, NEG, - NOT, LAND, LOR, LXOR, - EQ, NEQ, LT, GT, LE, GE, - LIKE, UNLIKE + DAVQL_NOOP, + DAVQL_ADD, DAVQL_SUB, DAVQL_MUL, DAVQL_DIV, + DAVQL_AND, DAVQL_OR, DAVQL_XOR, DAVQL_NEG, + DAVQL_NOT, DAVQL_LAND, DAVQL_LOR, DAVQL_LXOR, + DAVQL_EQ, DAVQL_NEQ, DAVQL_LT, DAVQL_GT, DAVQL_LE, DAVQL_GE, + DAVQL_LIKE, DAVQL_UNLIKE } davqloperator_t; /** @@ -110,7 +111,7 @@ * | "(", Expression, ")"; * * FunctionCall = Identifier, "(", Expression, ")"; - * Identifier = IdentifierChar, {IdentifierChar} + * Identifier = IdentifierChar - ?Digit?, {IdentifierChar} * | "`", ?Character?, {?Character?}, "`"; * IdentifierChar = ?Character - (" "|",")?; * Literal = ?Digit?, {?Digit?} | String;