external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-20 03:35:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particle/map: make eval_map_condition() more readable

Browse source
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
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
particles/map.c
View file

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