diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-06-27 11:04:57 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-06-27 12:32:47 +0200 |
| commit | 0f2f5ac58c8bc487ad62d153bfc5ebdb97d54fbd (patch) | |
| tree | 500184bc92b68223a8f77150fb5d5ccf2f963499 /filter | |
| parent | dfb61dfceaa72dda477a5433a193da316dccef7f (diff) | |
Fixed minor bugs in handling some route attributes
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/config.Y | 11 | ||||
| -rw-r--r-- | filter/f-inst.c | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/filter/config.Y b/filter/config.Y index ca792593..8cecf936 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -27,6 +27,9 @@ static inline u32 pair_b(u32 p) { return p & 0xFFFF; } cf_error("Can't empty %s: not an attribute", sym->name); \ f_generate_complex(fi_code, sym->attribute, arg); \ }) + +#define f_generate_complex_default(fi_code, da, arg, def) \ + f_new_inst(FI_EA_SET, f_new_inst(fi_code, f_new_inst(FI_DEFAULT, f_new_inst(FI_EA_GET, da), f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = def })), arg), da) /* @@ -902,10 +905,10 @@ cmd: } | attr_bit '=' term ';' { $$ = f_new_inst(FI_CONDITION, $3, - f_generate_complex(FI_BITOR, $1.class, - f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)})), - f_generate_complex(FI_BITAND, $1.class, - f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)})) + f_generate_complex_default(FI_BITOR, $1.class, + f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = (1U << $1.bit)}), 0), + f_generate_complex_default(FI_BITAND, $1.class, + f_new_inst(FI_CONSTANT, (struct f_val) { .type = T_INT, .val.i = ~(1U << $1.bit)}), 0) ); } | break_command print_list ';' { diff --git a/filter/f-inst.c b/filter/f-inst.c index 9ff5f79a..e7b642ab 100644 --- a/filter/f-inst.c +++ b/filter/f-inst.c @@ -768,6 +768,18 @@ ea_unset_attr(fs->eattrs, 1, da); } + INST(FI_DEFAULT, 2, 1) { + ARG_ANY(1); + ARG_ANY(2); + + log(L_INFO "Type of arg 1 is: %d", v1.type); + + if (v1.type == T_VOID) + RESULT_VAL(v2); + else + RESULT_VAL(v1); + } + INST(FI_LENGTH, 1, 1) { /* Get length of */ ARG_ANY(1); switch(v1.type) { |