analyzer: Improve some error messages.

[sysdb.git] / src / frontend / analyzer.c

diff --git a/src/frontend/analyzer.c b/src/frontend/analyzer.c
index c96f81b61fa6cc121f19e9d48ff98f9cffda57c5..cf077de41174df7e913ae46b835fd429218b535c 100644 (file)
--- a/src/frontend/analyzer.c
+++ b/src/frontend/analyzer.c
@@ -45,7 +45,7 @@ iter_error(sdb_strbuf_t *errbuf, int op, sdb_store_expr_t *iter, int context)
        sdb_strbuf_sprintf(errbuf, "Invalid %s iterator: %s %s "
                        "not iterable in %s context", MATCHER_SYM(op),
                        EXPR_TO_STRING(iter), SDB_STORE_TYPE_TO_NAME(iter->data_type),
-                       SDB_STORE_TYPE_TO_NAME(context));
+                       context == -1 ? "generic" : SDB_STORE_TYPE_TO_NAME(context));
 } /* iter_error */
 
 static void
@@ -155,16 +155,35 @@ analyze_matcher(int context, int parent_type,
                {
                        int child_context = -1;
                        int left_type = -1;
+                       int type = -1;
 
                        assert(ITER_M(m)->m);
 
-                       if (! sdb_store_expr_iterable(ITER_M(m)->iter, context)) {
+                       if ((ITER_M(m)->iter->type == TYPED_EXPR)
+                                       || (ITER_M(m)->iter->type == FIELD_VALUE))
+                               type = ITER_M(m)->iter->data.data.integer;
+
+                       if (context == -1) { /* inside a filter */
+                               /* attributes are always iterable */
+                               if ((ITER_M(m)->iter->type == TYPED_EXPR)
+                                               && (type != SDB_ATTRIBUTE)) {
+                                       iter_error(errbuf, m->type, ITER_M(m)->iter, context);
+                                       return -1;
+                               }
+                               /* backends are always iterable */
+                               if ((ITER_M(m)->iter->type == FIELD_VALUE)
+                                               && (! (type != SDB_FIELD_BACKEND))) {
+                                       iter_error(errbuf, m->type, ITER_M(m)->iter, context);
+                                       return -1;
+                               }
+                       }
+                       else if (! sdb_store_expr_iterable(ITER_M(m)->iter, context)) {
                                iter_error(errbuf, m->type, ITER_M(m)->iter, context);
                                return -1;
                        }
 
                        if (ITER_M(m)->iter->type == TYPED_EXPR) {
-                               child_context = (int)ITER_M(m)->iter->data.data.integer;
+                               child_context = type;
                                left_type = ITER_M(m)->iter->data_type;
                        }
                        else if (ITER_M(m)->iter->type == FIELD_VALUE) {
@@ -206,6 +225,13 @@ analyze_matcher(int context, int parent_type,
                                        return -1;
                                }
                        }
+                       if (child_context <= 0) {
+                               sdb_strbuf_sprintf(errbuf, "Unable to determine the context "
+                                               "(object type) of iterator %s %s %s %s",
+                                               MATCHER_SYM(m->type), SDB_TYPE_TO_STRING(left_type),
+                                               MATCHER_SYM(ITER_M(m)->m->type),
+                                               SDB_TYPE_TO_STRING(CMP_M(ITER_M(m)->m)->right->data_type));
+                       }
                        if (analyze_matcher(child_context, m->type, ITER_M(m)->m, errbuf))
                                return -1;
                        break;
@@ -366,10 +392,17 @@ sdb_fe_analyze(sdb_conn_node_t *node, sdb_strbuf_t *errbuf)
        }
        else {
                sdb_strbuf_sprintf(errbuf,
-                               "Don't know how to analyze command %#x", node->cmd);
+                               "Don't know how to analyze %s command (id=%#x)",
+                               SDB_CONN_MSGTYPE_TO_STRING(node->cmd), node->cmd);
                return -1;
        }
 
+       if (context <= 0) {
+               sdb_strbuf_sprintf(errbuf, "Unable to determine the context "
+                               "(object type) for %s command (id=%#x)",
+                               SDB_CONN_MSGTYPE_TO_STRING(node->cmd), node->cmd);
+               return -1;
+       }
        if (analyze_matcher(context, -1, m, errbuf))
                status = -1;
        if (analyze_matcher(-1, -1, filter, errbuf))