particle/map: make eval_map_condition() more readable

This commit is contained in:
Daniel Eklöf 2023-07-04 11:36:35 +02:00
parent 7c5ea4fed6
commit d236b9c1b9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F

View file

@ -118,12 +118,20 @@ eval_comparison(const struct map_condition* map_cond, const struct tag_set *tags
static bool
eval_map_condition(const struct map_condition* map_cond, const struct tag_set *tags)
{
switch(map_cond->op)
{
case MAP_OP_NOT: return !eval_map_condition(map_cond->cond1, tags);
case MAP_OP_AND: return eval_map_condition(map_cond->cond1, tags) && eval_map_condition(map_cond->cond2, tags);
case MAP_OP_OR: return eval_map_condition(map_cond->cond1, tags) || eval_map_condition(map_cond->cond2, tags);
default: return eval_comparison(map_cond, tags);
switch(map_cond->op) {
case MAP_OP_NOT:
return !eval_map_condition(map_cond->cond1, tags);
case MAP_OP_AND:
return eval_map_condition(map_cond->cond1, tags) &&
eval_map_condition(map_cond->cond2, tags);
case MAP_OP_OR:
return eval_map_condition(map_cond->cond1, tags) ||
eval_map_condition(map_cond->cond2, tags);
default:
return eval_comparison(map_cond, tags);
}
}