dav: comparison libidav/davqlparser.c

-:8822f7c08843
+:8ed7d8df6427
 }
 if (stmt->errorcode) {
 printf("\nError code: %d\nError: %s\n",
 stmt->errorcode, stmt->errormessage);
 }
+// order by clause
+printf("Order by: ");
+if (stmt->orderby) {
+UCX_FOREACH(crit, stmt->orderby) {
+DavQLOrderCriterion *critdata = crit->data;
+printf("%.*s %s%s", sfmtarg(critdata->column->srctext),
+critdata->ascending ? "asc" : "desc",
+crit->next ? ", " : "\n");
+}
+} else {
+printf("nothing\n");
+}
 }
 static int dav_debug_ql_expr_selected(DavQLExpression *expr) {
 if (!expr) {
 printf("Currently no expression selected.\n");
 sfmtarg(*token_sstr(token)),
 sfmtarg(token->next?*token_sstr(token->next):emptystring));
 stmt->errormessage = errormsg.ptr;
 }
+#define _step_fieldlist_    10 // field list
+#define _step_FROM_         20 // FROM clause
+#define _step_expect_WWO_  530 // expecting WITH, WHERE or ORDER BY clause
+#define _step_WITH_         30 // WITH clause
+#define _step_expect_WO    540 // expecting WHERE or ORDER BY clause
+#define _step_WHERE_        40 // WHERE clause
+#define _step_expect_O     550 // expecting ORDER BY clause
+#define _step_expect_BY    551 // expecting the BY token for the ORDER BY clause
+#define _step_ORDER_BY_     50 // ORDER BY clause
+#define _step_end_         500 // expect end
 static int dav_parse_with_clause(DavQLStatement *stmt, UcxList *token) {
 sstr_t tokendata = *token_sstr(token);
 /*
 * 0: key
 * 1: =
 * 2: value
-* TODO: commas
+* 3: comma or new clause
 */
 static int parsestate = 0;
 /*
 * 1: depth
 stmt->errormessage = ucx_sprintf(_duplicated_attribute,
 sfmtarg(tokendata)).ptr;
 } else {
 keymask |= key;
 }
-return 0;
+return _step_WITH_; // continue parsing WITH clause
 case 1:
 if (sstrcmp(tokendata, S("="))) {
 stmt->errorcode = DAVQL_ERROR_UNEXPECTED_TOKEN;
 stmt->errormessage = ucx_sprintf(_expected_token,
 "=", sfmtarg(tokendata)).ptr;
 } else {
 parsestate = 2;
 }
-return 0;
+return _step_WITH_; // continue parsing WITH clause
 case 2:
 switch (key) {
 case 1: /* depth */
 if (!sstrcasecmp(tokendata, S("infinity"))) {
 stmt->depth = DAV_DEPTH_INFINITY;
 }
 free(conv);
 }
 break;
 }
-parsestate = 0;
+parsestate = 3;
-return 1;
+return _step_WITH_; // continue parsing WITH clause
+case 3:
+// a with clause may be continued with a comma
+// or another clause may follow
+if (!sstrcmp(tokendata, S(","))) {
+parsestate = 0; // reset clause parser
+return _step_WITH_;
+} else if (!sstrcasecmp(tokendata, S("where"))) {
+return _step_WHERE_;
+} else if (!sstrcasecmp(tokendata, S("order"))) {
+return _step_expect_BY;
+} else {
+dav_parse_unexpected_token(stmt, token);
+return 0;
+}
 default:
-return -1;
+stmt->errorcode = DAVQL_ERROR_INVALID;
-}
+stmt->errormessage = strdup(_parser_state);
+return 0;
+}
+}
+static int dav_parse_orderby_clause(DavQLStatement *stmt, UcxList *token) {
+// TODO: implement
+return _step_end_;
+}
+static void dav_free_order_criterion(DavQLOrderCriterion *crit) {
+if (crit->column) { // do it null-safe though column is expected to be set
+dav_free_expression(crit->column);
+}
+free(crit);
 }
 static void dav_parse_get_statement(DavQLStatement *stmt, UcxList *tokens) {
 stmt->type = DAVQL_GET;
-#define _step_fieldlist_    10 // field list
-#define _step_FROM_         20 // FROM clause
-#define _step_expect_WWO_  530 // expecting WITH, WHERE or ORDER BY clause
-#define _step_comma_WITH_  531 // expecting comma for WITH clause
-#define _step_WITH_         30 // WITH clause
-#define _step_expect_WO    540 // expecting WHERE or ORDER BY clause
-#define _step_WHERE_        40 // WHERE clause
-#define _step_expect_O     550 // expecting ORDER BY clause
-#define _step_expect_BY    551 // expecting the BY token for the ORDER BY clause
-#define _step_ORDER_BY_     50 // ORDER BY clause
-#define _step_end_         500 // expect end
 int step = _step_fieldlist_;
 // Variables for token sublists for expressions
 UcxList *exprstart = NULL;
 step = _step_ORDER_BY_;
 } else {
 stmt->errorcode = DAVQL_ERROR_UNEXPECTED_TOKEN;
 stmt->errormessage = ucx_sprintf(_expected_by,
 sfmtarg(tokendata)).ptr;
-}
-break;
-case _step_comma_WITH_:
-// a with clause may be continued with a comma
-// or another clause may follow
-if (!sstrcmp(tokendata, S(","))) {
-step = _step_WITH_;
-} if (!sstrcasecmp(tokendata, S("where"))) {
-step = _step_WHERE_;
-} else if (!sstrcasecmp(tokendata, S("order"))) {
-step = _step_expect_BY;
-} else {
-dav_parse_unexpected_token(stmt, token);
 }
 break;
 // field list
 case _step_fieldlist_: {
 _Bool fromkeyword = !sstrcasecmp(tokendata, S("from"));
 step = _step_expect_WWO_;
 break;
 }
 // with clause
 case _step_WITH_: {
-int withclause_result = dav_parse_with_clause(stmt, token);
+step = dav_parse_with_clause(stmt, token);
-if (withclause_result < 0) {
-stmt->errorcode = DAVQL_ERROR_INVALID;
-stmt->errormessage = strdup(_parser_state);
-} else if (withclause_result > 0) {
-step = _step_comma_WITH_;
-}
 break;
 }
 // where clause
 case _step_WHERE_:
 // TODO: implement
 step = _step_end_;
 break;
 // order by clause
 case _step_ORDER_BY_:
-// TODO: implement
+step = dav_parse_orderby_clause(stmt, token);
-step = _step_end_;
 break;
 default:
 stmt->errorcode = DAVQL_ERROR_INVALID;
 stmt->errormessage = strdup(_parser_state);
 }
 dav_free_expression(stmt->where);
 }
 if (stmt->errormessage) {
 free(stmt->errormessage);
 }
+UCX_FOREACH(crit, stmt->orderby) {
+dav_free_order_criterion(crit->data);
+}
+ucx_list_free(stmt->orderby);
 free(stmt);
 }

Mercurial > hg > dav / file comparison

comparison: libidav/davqlparser.c

libidav/davqlparser.c