dav: comparison libidav/davqlparser.c

-:95a215337b53
+:e9ae1318a559
 case DAVQL_LIKE: return "LIKE"; case DAVQL_UNLIKE: return "UNLIKE";
 default: return "unknown";
 }
 }
+static void dav_debug_ql_fnames_print(DavQLStatement *stmt) {
+printf("Field names: ");
+UCX_FOREACH(field, stmt->fields) {
+DavQLField *f = field->data;
+printf("%.*s, ", sfmtarg(f->name));
+}
+printf("\b\b  \b\b\n");
+}
 static void dav_debug_ql_stmt_print(DavQLStatement *stmt) {
 // Basic information
 size_t fieldcount = ucx_list_size(stmt->fields);
 int specialfield = 0;
 if (stmt->fields) {
 }
 }
 if (specialfield) {
 fieldcount--;
 }
-printf("Statement: %.*s\nType: %s\nField count: %zu %s\nPath: %.*s\n"
+printf("Statement: %.*s\nType: %s\nField count: %zu %s\n",
-"Has where clause: %s\n",
 sfmtarg(stmt->srctext),
 _map_querytype(stmt->type),
 fieldcount,
-_map_specialfield(specialfield),
+_map_specialfield(specialfield));
+dav_debug_ql_fnames_print(stmt);
+printf("Path: %.*s\nHas where clause: %s\n",
 sfmtarg(stmt->path),
 stmt->where ? "yes" : "no");
 // WITH attributes
 if (stmt->depth == DAV_DEPTH_INFINITY) {
 }
 #define DQLD_CMD_Q     0
 #define DQLD_CMD_PS    1
 #define DQLD_CMD_PE    2
+#define DQLD_CMD_PF    3
 #define DQLD_CMD_F    10
 #define DQLD_CMD_W    11
 #define DQLD_CMD_O    12
 #define DQLD_CMD_L    21
 #define DQLD_CMD_R    22
 return DQLD_CMD_Q;
 } else if (!strcmp(buffer, "ps\n")) {
 return DQLD_CMD_PS;
 } else if (!strcmp(buffer, "pe\n")) {
 return DQLD_CMD_PE;
+} else if (!strcmp(buffer, "pf\n")) {
+return DQLD_CMD_PF;
 } else if (!strcmp(buffer, "l\n")) {
 return DQLD_CMD_L;
 } else if (!strcmp(buffer, "r\n")) {
 return DQLD_CMD_R;
 } else if (!strcmp(buffer, "h\n")) {
 int cmd = dav_debug_ql_command();
 switch (cmd) {
 case DQLD_CMD_Q: return;
 case DQLD_CMD_PS: dav_debug_ql_stmt_print(stmt); break;
 case DQLD_CMD_PE: dav_debug_ql_expr_print(examineexpr); break;
+case DQLD_CMD_PF: dav_debug_ql_fnames_print(stmt); break;
 case DQLD_CMD_F:
 if (examineclause != DQLD_CMD_F) {
 examineclause = DQLD_CMD_F;
 examineelem = stmt->fields;
 examineexpr = stmt->fields ?
 printf(
 "\nCommands:\n"
 "ps:  print statement information\n"
 "o:   examine order by clause\n"
 "f:   examine field list\n"
+"pf:  print field names\n"
 "w:   examine where clause\n"
 "n:   examine next expression "
 "(in order by clause or field list)\n"
 "p:   examine previous expression "
 "(in order by clause or field list)\n"
 }
 #define _step_fieldlist_    10 // field list
 #define _step_FROM_         20 // FROM clause
 #define _step_WITH_         30 // WITH clause
+#define _step_WITHopt_     530 // expecting more WITH details or end
 #define _step_WHERE_        40 // WHERE clause
-#define _step_ORDER_BYopt_ 552 // expecting more ORDER BY details or end
 #define _step_ORDER_BY_     50 // ORDER BY clause
+#define _step_ORDER_BYopt_ 550 // expecting more ORDER BY details or end
 #define _step_end_         500 // expect end
 struct fieldlist_parser_state {
 UcxList *expr_firsttoken;
 DavQLField *currentfield;
 struct with_parser_state {
 /*
 * 0: key
 * 1: =
 * 2: value
-* 3: comma or new clause
+* 3: comma or new clause or end
 */
 int step;
 /*
 * 1: depth
 */
 dav_free_expression(depthexpr);
 }
 break;
 }
 state->step = 3;
-return _step_WITH_; // continue parsing WITH clause
+return _step_WITHopt_; // continue parsing WITH clause
 case 3:
 // a with clause may be continued with a comma
 // or another clause may follow
 if (!sstrcmp(tokendata, S(","))) {
 state->step = 0; // reset clause parser
 dav_free_expression(crit->column);
 }
 free(crit);
 }
+/**
+* Semantic analysis of a get statement.
+* @param stmt the statement to analyze.
+*/
+static void dav_analyze_get_statement(DavQLStatement *stmt) {
+// TODO: make it so
+}
+/**
+* Parser of a get statement.
+* @param stmt the statement object that shall contain the syntax tree
+* @param tokens the token list
+*/
 static void dav_parse_get_statement(DavQLStatement *stmt, UcxList *tokens) {
 stmt->type = DAVQL_GET;
 int step = _step_fieldlist_;
 case _step_FROM_: {
 step = dav_parse_from(stmt, token);
 break;
 }
 // with clause
-case _step_WITH_: {
+case _step_WITH_:
+case _step_WITHopt_: {
 step = dav_parse_with_clause(stmt, token, &state_with);
 break;
 }
 // where clause
 case _step_WHERE_:
 if (stmt->errorcode) {
 break;
 }
 }
-if (!stmt->errorcode && step < _step_end_) {
+if (!stmt->errorcode) {
-stmt->errorcode = DAVQL_ERROR_UNEXPECTED_END;
+if (step < _step_end_) {
-stmt->errormessage = strdup(_unexpected_end_msg);
+stmt->errorcode = DAVQL_ERROR_UNEXPECTED_END;
+stmt->errormessage = strdup(_unexpected_end_msg);
+} else {
+dav_analyze_get_statement(stmt);
+}
 }
 }
 static void dav_parse_set_statement(DavQLStatement *stmt, UcxList *tokens) {
 stmt->type = DAVQL_SET;

Mercurial > hg > dav / file comparison

comparison: libidav/davqlparser.c

libidav/davqlparser.c