diff options
| -rw-r--r-- | include/datatype.h | 6 | ||||
| -rw-r--r-- | src/evaluate.c | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/datatype.h b/include/datatype.h index eab505ba..f7092f06 100644 --- a/include/datatype.h +++ b/include/datatype.h @@ -171,6 +171,12 @@ static inline bool datatype_equal(const struct datatype *d1, return d1->type == d2->type; } +static inline const struct datatype * +datatype_basetype(const struct datatype *dtype) +{ + return dtype->basetype ? dtype->basetype : dtype; +} + /** * struct symbolic_constant - symbol <-> constant mapping * diff --git a/src/evaluate.c b/src/evaluate.c index db49a18d..1880578b 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1854,7 +1854,17 @@ static int stmt_evaluate_arg(struct eval_ctx *ctx, struct stmt *stmt, if (expr_evaluate(ctx, expr) < 0) return -1; - if (!datatype_equal((*expr)->dtype, dtype)) + if ((*expr)->ops->type == EXPR_PAYLOAD && + (*expr)->dtype->type == TYPE_INTEGER && + ((*expr)->dtype->type != datatype_basetype(dtype)->type || + (*expr)->len != len)) + return stmt_binary_error(ctx, *expr, stmt, + "datatype mismatch: expected %s, " + "expression has type %s with length %d", + dtype->desc, (*expr)->dtype->desc, + (*expr)->len); + else if ((*expr)->dtype->type != TYPE_INTEGER && + !datatype_equal((*expr)->dtype, dtype)) return stmt_binary_error(ctx, *expr, stmt, "datatype mismatch: expected %s, " "expression has type %s", |