src: expr: add expression etype

Temporary kludge to remove all the expr->ops->type == ... patterns.
Followup patch will remove expr->ops, and make expr_ops() lookup
the correct expr_ops struct instead to reduce struct expr size.

Signed-off-by: Florian Westphal <fw@strlen.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/rule.c b/src/rule.c
index 73b78c75..a3b2dbdb 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -2613,11 +2613,11 @@ static void payload_try_merge(const struct rule *rule)
 		if (stmt->ops->type != STMT_EXPRESSION)
 			goto do_merge;
 
-		if (stmt->expr->ops->type != EXPR_RELATIONAL)
+		if (stmt->expr->etype != EXPR_RELATIONAL)
 			continue;
-		if (stmt->expr->left->ops->type != EXPR_PAYLOAD)
+		if (stmt->expr->left->etype != EXPR_PAYLOAD)
 			continue;
-		if (stmt->expr->right->ops->type != EXPR_VALUE)
+		if (stmt->expr->right->etype != EXPR_VALUE)
 			continue;
 		switch (stmt->expr->op) {
 		case OP_EQ: