dav: comparison libidav/davqlparser.h

-:ee0de2b1872e
+:9cec78f23cbf
 * Enumeration of possible statement types.
 */
 typedef enum {DAVQL_ERROR, DAVQL_GET, DAVQL_SET} davqltype_t;
 /**
+* Enumeration of possible token classes.
+*/
+typedef enum {
+DAVQL_TOKEN_INVALID, DAVQL_TOKEN_KEYWORD,
+DAVQL_TOKEN_IDENTIFIER, DAVQL_TOKEN_FMTSPEC,
+DAVQL_TOKEN_STRING, DAVQL_TOKEN_NUMBER, DAVQL_TOKEN_TIMESTAMP,
+DAVQL_TOKEN_COMMA, DAVQL_TOKEN_OPENP, DAVQL_TOKEN_CLOSEP,
+DAVQL_TOKEN_EQ, DAVQL_TOKEN_LT, DAVQL_TOKEN_GT, DAVQL_TOKEN_EXCLAIM,
+DAVQL_TOKEN_OPERATOR
+} davqltokenclass_t;
+/**
 * Enumeration of possible expression types.
 */
 typedef enum {
-DAVQL_UNDEFINED_TYP,
+DAVQL_UNDEFINED_TYPE,
 DAVQL_NUMBER, DAVQL_STRING, DAVQL_TIMESTAMP, DAVQL_IDENTIFIER,
 DAVQL_UNARY, DAVQL_BINARY, DAVQL_LOGICAL, DAVQL_FUNCCALL
 } davqlexprtype_t;
 /**
 DAVQL_NOT, DAVQL_LAND, DAVQL_LOR, DAVQL_LXOR, // logical
 DAVQL_EQ, DAVQL_NEQ, DAVQL_LT, DAVQL_GT, DAVQL_LE, DAVQL_GE,
 DAVQL_LIKE, DAVQL_UNLIKE // comparisons
 } davqloperator_t;
+typedef struct {
+davqltokenclass_t tokenclass;
+sstr_t value;
+} DavQLToken;
 /**
 * An expression within a DAVQL query.
 */
 typedef struct _davqlexpr DavQLExpression;
 * <pre>
 * Expression        = AddExpression;
 * AddExpression     = MultExpression, [AddOperator, AddExpression];
 * MultExpression    = BitwiseExpression, [MultOperator, MultExpression];
 * BitwiseExpression = UnaryExpression, [BitwiseOperator, BitwiseExpression];
-* UnaryExpression   = [UnaryOperator], (AtomicExpression | ParExpression);
+* UnaryExpression   = [UnaryOperator], (ParExpression | AtomicExpression);
 * AtomicExpression  = FunctionCall | Identifier | Literal;
 * ParExpression     = "(", Expression, ")";
 *
 * BitwiseOperator = "&" | "|" | "^";
 * MultOperator    = "*" | "/";
 *                   | FunctionCall | Identifier;
 *
 * LogicalOperator = " and " | " or " | " xor ";
 * Comparison      = | "=" | "<" | ">" | "<=" | ">=" | "!=";
 *
-* FieldExpressions = "*", {",", Expression, " as ", Identifier}
+* FieldExpressions = "-"
-*                  | FieldExpression, {",", FieldExpression}
+*                  | "*", {",", Expression, " as ", Identifier}
-*                  | "-";
+*                  | FieldExpression, {",", FieldExpression};
 * FieldExpression  = Identifier
 *                  | Expression, " as ", Identifier;
 * SetExpressions   = SetExpression, {",", SetExpression};
 * SetExpression    = Identifier, "=", Expression;
 *
 #define DAV_DEPTH_INFINITY -1
 /** Depth needs to be specified at runtime. */
 #define DAV_DEPTH_PLACEHOLDER -2
-/** Invalid path. */
+/** Unexpected token. */
-#define DAVQL_ERROR_INVALID_PATH 1
+#define DAVQL_ERROR_UNEXPECTED_TOKEN 1
-/** Expected an identifier, but found something else. */
+/** A token has been found, for which no token class is applicable. */
-#define DAVQL_ERROR_IDENTIFIER_EXPECTED 10
+#define DAVQL_ERROR_INVALID_TOKEN 2
-/** Expected an identifier or literal, but found something else. */
+/** A token that has been expected was not found. */
-#define DAVQL_ERROR_IDORLIT_EXPECTED 11
+#define DAVQL_ERROR_MISSING_TOKEN 11
-/** Expected an identifier or number, but found something else. */
+/** An expression has been expected, but was not found. */
-#define DAVQL_ERROR_IDORNUM_EXPECTED 12
+#define DAVQL_ERROR_MISSING_EXPR 12
-/** Expected an identifier or string, but found something else. */
+/** An operator has been found for a unary expression, but it is invalid. */
-#define DAVQL_ERROR_IDORSTR_EXPECTED 13
+#define DAVQL_ERROR_INVALID_UNARY_OP 21
-/** Expected an identifier or timestamp, but found something else. */
+/** The depth is invalid. */
-#define DAVQL_ERROR_IDORTS_EXPECTED 14
+#define DAVQL_ERROR_INVALID_DEPTH 101
-/** The with-clause contains an unknown attribute. */
-#define DAVQL_ERROR_UNKNOWN_ATTRIBUTE 20
-/** Depth must be greater than zero or infinity. */
-#define DAVQL_ERROR_INVALID_DEPTH 21
-/** The with-clause contains an attribute more than once. */
-#define DAVQL_ERROR_DUPLICATED_ATTRIBUTE 29
-/** The format specifier is missing. */
-#define DAVQL_ERROR_MISSING_FMTSPEC 30
-/** The format specifier is unknown. */
-#define DAVQL_ERROR_UNKNOWN_FMTSPEC 31
-/** The format specifier is invalid. */
-#define DAVQL_ERROR_INVALID_FMTSPEC 39
-/** A quote symbol (' or `) is missing. */
-#define DAVQL_ERROR_MISSING_QUOTE 50
-/** No more tokens to parse, but the parser expected more. */
-#define DAVQL_ERROR_UNEXPECTED_END 100
-/** A token was found, which has not been expected. */
-#define DAVQL_ERROR_UNEXPECTED_TOKEN 101
 /** Nothing about the statement seems legit. */
 #define DAVQL_ERROR_INVALID -1
+/** Unhandled error */
+#define DAVQL_ERROR_UNHANDLED -2
 /**
 * Starts an interactive debugger for a DavQLStatement.
 *
 * @param stmt the statement to debug

Mercurial > hg > dav / file comparison

comparison: libidav/davqlparser.h

libidav/davqlparser.h