![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index e9e1d138c80c9bd5177caa7f4d38b02f30a173b3..62bae1c134904af8a84ede0d7906912fe3704f3e 100644 (file)
--- a/src/frontend/analyzer.c
+++ b/src/frontend/analyzer.c
} /* iter_error */
static void
-iter_array_error(sdb_strbuf_t *errbuf, int op,
- int array_type, int cmp, int value_type)
+iter_op_error(sdb_strbuf_t *errbuf, int op,
+ int iter_type, int cmp, int value_type)
{
- sdb_strbuf_sprintf(errbuf, "Invalid array iterator %s %s %s %s",
- MATCHER_SYM(op), SDB_TYPE_TO_STRING(array_type),
+ sdb_strbuf_sprintf(errbuf, "Invalid iterator %s %s %s %s",
+ MATCHER_SYM(op), SDB_TYPE_TO_STRING(iter_type),
MATCHER_SYM(cmp), SDB_TYPE_TO_STRING(value_type));
- if ((array_type & 0xff) != value_type)
+ if ((iter_type & 0xff) != value_type)
sdb_strbuf_append(errbuf, " (type mismatch)");
else
sdb_strbuf_append(errbuf, " (invalid operator)");
-} /* iter_array_error */
+} /* iter_op_error */
static void
cmp_error(sdb_strbuf_t *errbuf, int op, int left, int right)
} /* analyze_expr */
static int
-analyze_matcher(int context, sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
+analyze_matcher(int context, int parent_type,
+ sdb_store_matcher_t *m, sdb_strbuf_t *errbuf)
{
if (! m)
return 0;
case MATCHER_OR:
case MATCHER_AND:
assert(OP_M(m)->left && OP_M(m)->right);
- if (analyze_matcher(context, OP_M(m)->left, errbuf))
+ if (analyze_matcher(context, m->type, OP_M(m)->left, errbuf))
return -1;
- if (analyze_matcher(context, OP_M(m)->right, errbuf))
+ if (analyze_matcher(context, m->type, OP_M(m)->right, errbuf))
return -1;
break;
case MATCHER_NOT:
assert(UOP_M(m)->op);
- if (analyze_matcher(context, UOP_M(m)->op, errbuf))
+ if (analyze_matcher(context, m->type, UOP_M(m)->op, errbuf))
return -1;
break;
iter_error(errbuf, m->type, ITER_M(m)->type, context);
return -1;
}
+ /* any ary operator will do but these are the once
+ * we currently support */
+ if ((ITER_M(m)->m->type != MATCHER_LT)
+ && (ITER_M(m)->m->type != MATCHER_LE)
+ && (ITER_M(m)->m->type != MATCHER_EQ)
+ && (ITER_M(m)->m->type != MATCHER_NE)
+ && (ITER_M(m)->m->type != MATCHER_GE)
+ && (ITER_M(m)->m->type != MATCHER_GT)
+ && (ITER_M(m)->m->type != MATCHER_REGEX)
+ && (ITER_M(m)->m->type != MATCHER_NREGEX)) {
+ iter_op_error(errbuf, m->type,
+ CMP_M(ITER_M(m)->m)->left->data_type,
+ ITER_M(m)->m->type,
+ CMP_M(ITER_M(m)->m)->right->data_type);
+ return -1;
+ }
if (ITER_M(m)->type == SDB_FIELD_BACKEND) {
- /* array iterators only support simple comparison atm */
- if ((ITER_M(m)->m->type != MATCHER_LT)
- && (ITER_M(m)->m->type != MATCHER_LE)
- && (ITER_M(m)->m->type != MATCHER_EQ)
- && (ITER_M(m)->m->type != MATCHER_NE)
- && (ITER_M(m)->m->type != MATCHER_GE)
- && (ITER_M(m)->m->type != MATCHER_GT)
- && (ITER_M(m)->m->type != MATCHER_REGEX)
- && (ITER_M(m)->m->type != MATCHER_NREGEX)) {
- iter_array_error(errbuf, m->type,
- CMP_M(ITER_M(m)->m)->left->data_type,
- ITER_M(m)->m->type,
- CMP_M(ITER_M(m)->m)->right->data_type);
- return -1;
- }
if (CMP_M(ITER_M(m)->m)->right->data_type < 0)
return 0; /* skip further type checks */
if (CMP_M(ITER_M(m)->m)->right->data_type & SDB_TYPE_ARRAY) {
- iter_array_error(errbuf, m->type,
+ iter_op_error(errbuf, m->type,
CMP_M(ITER_M(m)->m)->left->data_type,
ITER_M(m)->m->type,
CMP_M(ITER_M(m)->m)->right->data_type);
}
if ((CMP_M(ITER_M(m)->m)->left->data_type & 0xff)
!= CMP_M(ITER_M(m)->m)->right->data_type) {
- iter_array_error(errbuf, m->type,
+ iter_op_error(errbuf, m->type,
CMP_M(ITER_M(m)->m)->left->data_type,
ITER_M(m)->m->type,
CMP_M(ITER_M(m)->m)->right->data_type);
return -1;
}
}
- else if (analyze_matcher(ITER_M(m)->type, ITER_M(m)->m, errbuf))
+ else if (analyze_matcher(ITER_M(m)->type, m->type,
+ ITER_M(m)->m, errbuf))
return -1;
break;
case MATCHER_NE:
case MATCHER_GE:
case MATCHER_GT:
- assert(CMP_M(m)->left && CMP_M(m)->right);
+ assert(CMP_M(m)->right);
+ if ((parent_type == MATCHER_ALL)
+ || (parent_type == MATCHER_ANY)) {
+ // TODO: assert(! CMP_M(m)->left);
+ }
+ else {
+ assert(CMP_M(m)->left);
+ }
+
if (analyze_expr(context, CMP_M(m)->left, errbuf))
return -1;
if (analyze_expr(context, CMP_M(m)->right, errbuf))
break;
case MATCHER_IN:
+ case MATCHER_NIN:
if (analyze_expr(context, CMP_M(m)->left, errbuf))
return -1;
if (analyze_expr(context, CMP_M(m)->right, errbuf))
return -1;
- if ((CMP_M(m)->left->data_type > 0)
- && (CMP_M(m)->left->data_type & SDB_TYPE_ARRAY)) {
- cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
- CMP_M(m)->right->data_type);
- return -1;
- }
+ /* the left operand may be a scalar or an array but the element
+ * type has to match */
if ((CMP_M(m)->right->data_type > 0)
&& (! (CMP_M(m)->right->data_type & SDB_TYPE_ARRAY))) {
cmp_error(errbuf, m->type, CMP_M(m)->left->data_type,
CMP_M(m)->right->data_type);
return -1;
}
-
if ((CMP_M(m)->left->data_type > 0)
&& (CMP_M(m)->right->data_type > 0)) {
if ((CMP_M(m)->left->data_type & 0xff)
return -1;
}
- if (analyze_matcher(context, m, errbuf))
+ if (analyze_matcher(context, -1, m, errbuf))
status = -1;
- if (analyze_matcher(-1, filter, errbuf))
+ if (analyze_matcher(-1, -1, filter, errbuf))
status = -1;
return status;
} /* sdb_fe_analyze */