From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 27 Mar 2015 14:14:47 +0000 (+0000)
Subject: Optimize expressions earlier.
X-Git-Tag: 0.9.0~405
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7476eadbf9642b0044f27f4bdabd7ec5df107a47;p=rspamd.git

Optimize expressions earlier.
---

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;
 	}