expr: kill EXPR_F_PRIMARY

Not used anymore, kill it.

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/expression.h b/include/expression.h
index 66c215a2a479590df09cb5d9b52759dfc91fe394..f0eb7993570b4e5b9f933bfba3b530114af6ef06 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -133,16 +133,14 @@ struct expr_ops {
 /**
  * enum expr_flags
  *
- * @EXPR_F_PRIMARY:            primary expression
  * @EXPR_F_CONSTANT:           constant expression
  * @EXPR_F_SINGLETON:          singleton (implies primary and constant)
  * @EXPR_F_INTERVAL_END:       set member ends an open interval
  */
 enum expr_flags {
-       EXPR_F_PRIMARY          = 0x1,
-       EXPR_F_CONSTANT         = 0x2,
-       EXPR_F_SINGLETON        = 0x4,
-       EXPR_F_INTERVAL_END     = 0x8,
+       EXPR_F_CONSTANT         = 0x1,
+       EXPR_F_SINGLETON        = 0x2,
+       EXPR_F_INTERVAL_END     = 0x4,
 };
 
 #include <payload.h>
@@ -269,11 +267,6 @@ extern int expr_binary_error(struct eval_ctx *ctx,
 #define expr_error(ctx, expr, fmt, args...) \
        expr_binary_error(ctx, expr, NULL, fmt, ## args)
 
-static inline bool expr_is_primary(const struct expr *expr)
-{
-       return expr->flags & EXPR_F_PRIMARY ? true : false;
-}
-
 static inline bool expr_is_constant(const struct expr *expr)
 {
        return expr->flags & EXPR_F_CONSTANT ? true : false;

diff --git a/src/evaluate.c b/src/evaluate.c
index 7aee41b3c17d6bf51cad7c726487472084974efc..638a0fcbc0965a13c012ce09ba36e13abb1a55d3 100644 (file)
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -253,9 +253,7 @@ static int expr_evaluate_value(struct eval_ctx *ctx, struct expr **expr)
  */
 static int expr_evaluate_primary(struct eval_ctx *ctx, struct expr **expr)
 {
-       ctx->ectx.dtype = (*expr)->dtype;
-       ctx->ectx.len   = (*expr)->len;
-       (*expr)->flags |= EXPR_F_PRIMARY;
+       expr_set_context(&ctx->ectx, (*expr)->dtype, (*expr)->len);
        return 0;
 }