summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/evaluate.c34
1 files changed, 25 insertions, 9 deletions
diff --git a/src/evaluate.c b/src/evaluate.c
index fcd4ecda..3afb8ead 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1381,16 +1381,32 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr)
switch (rel->op) {
case OP_LOOKUP:
- /* A literal set expression implicitly declares the set */
- if (right->ops->type == EXPR_SET)
+ switch (right->ops->type) {
+ case EXPR_SET:
+ /* A literal set expression implicitly declares
+ * the set
+ */
right = rel->right =
- implicit_set_declaration(ctx, left->dtype, left->len, right);
- else if (!datatype_equal(left->dtype, right->dtype))
- return expr_binary_error(ctx->msgs, right, left,
- "datatype mismatch, expected %s, "
- "set has type %s",
- left->dtype->desc,
- right->dtype->desc);
+ implicit_set_declaration(ctx, left->dtype,
+ left->len, right);
+ break;
+ case EXPR_SET_REF:
+ if (right->dtype == NULL)
+ return expr_binary_error(ctx->msgs, right,
+ left, "the referenced"
+ " set does not "
+ "exist");
+ if (!datatype_equal(left->dtype, right->dtype))
+ return expr_binary_error(ctx->msgs, right,
+ left, "datatype "
+ "mismatch, expected "
+ "%s, set has type %s",
+ left->dtype->desc,
+ right->dtype->desc);
+ break;
+ default:
+ BUG("Unknown expression %s\n", right->ops->name);
+ }
/* Data for range lookups needs to be in big endian order */
if (right->set->flags & SET_F_INTERVAL &&