summaryrefslogtreecommitdiff
path: root/filter/config.Y
diff options
context:
space:
mode:
authorJan Maria Matejka <mq@ucw.cz>2018-12-17 13:51:11 +0100
committerMaria Matejka <mq@ucw.cz>2019-02-20 22:30:54 +0100
commit7afa1438866fa94454ba133608b6877171f71d37 (patch)
treebcf0fb0cfed9ff191fe3e07c28f3a8d87a78760c /filter/config.Y
parentf62a369fb48be066560d6e8f0df82eef9c464ef0 (diff)
Filter refactoring: Passing the resulting struct f_val as a pointer.
This also drops the multiplexing of errors with the f_val itself together with the T_RETURN f_val type flag.
Diffstat (limited to 'filter/config.Y')
-rw-r--r--filter/config.Y2
1 files changed, 1 insertions, 1 deletions
diff --git a/filter/config.Y b/filter/config.Y
index c1e74531..200c1f41 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -653,7 +653,7 @@ set_atom:
| VPN_RD { $$.type = T_RD; $$.val.ec = $1; }
| ENUM { $$.type = pair_a($1); $$.val.i = pair_b($1); }
| '(' term ')' {
- $$ = f_eval($2, cfg_mem);
+ if (f_eval($2, cfg_mem, &($$)) > F_RETURN) cf_error("Runtime error");
if (!f_valid_set_type($$.type)) cf_error("Set-incompatible type");
}
| SYM {