From 7476eadbf9642b0044f27f4bdabd7ec5df107a47 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 27 Mar 2015 14:14:47 +0000 Subject: [PATCH] Optimize expressions earlier. --- src/libutil/expression.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libutil/expression.c b/src/libutil/expression.c index ed52226ee..8696c1cc6 100644 --- a/src/libutil/expression.c +++ b/src/libutil/expression.c @@ -848,16 +848,15 @@ rspamd_ast_process_node (struct rspamd_expression *expr, GNode *node, /* Save limit if we've found it */ val = rspamd_ast_process_node (expr, cld, data); - if (acc != G_MININT || cld->next == NULL) { - acc = rspamd_ast_do_op (elt, val, acc); - - if (rspamd_ast_node_done (elt, parelt, acc, lim)) { - return acc; - } - } - else { + if (acc == G_MININT) { acc = val; } + + acc = rspamd_ast_do_op (elt, val, acc); + + if (rspamd_ast_node_done (elt, parelt, acc, lim)) { + return acc; + } } break; } -- 2.39.5