From d236b9c1b929262e2ae3215425aa698f2eb5b3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Tue, 4 Jul 2023 11:36:35 +0200 Subject: [PATCH] particle/map: make eval_map_condition() more readable --- particles/map.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/particles/map.c b/particles/map.c index 5912f9c..1c1cc9a 100644 --- a/particles/map.c +++ b/particles/map.c @@ -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); } }