summaryrefslogtreecommitdiffstats
path: root/src/evaluate.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-01-16 20:01:56 +0000
committerPatrick McHardy <kaber@trash.net>2014-01-16 20:01:56 +0000
commitbea7aab38f305bb8c2e400d575e6bd0a3c6bbc1f (patch)
treea78c4144d756cd54fdb75c143be51a307884af22 /src/evaluate.c
parent11884cfb1c0432cc455ff8e3269500e819e0c434 (diff)
set: make set initializer parsable
If a set contains elements, the output is not parsable since the elements = { ... } is not understood by the parser. Fix this and also add support for creating constant sets (which only makes sense when using an initializer). Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'src/evaluate.c')
-rw-r--r--src/evaluate.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c
index 94fee64b..21ca5581 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1210,6 +1210,12 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
return set_error(ctx, set, "unqualified key data type "
"specified in %s definition", type);
+ if (set->init != NULL) {
+ expr_set_context(&ctx->ectx, set->keytype, set->keylen);
+ if (expr_evaluate(ctx, &set->init) < 0)
+ return -1;
+ }
+
if (!(set->flags & SET_F_MAP))
return 0;