@cryptotaxi247 / netdata-1 / commits / 47f84046d

operator ? has higher precedence over all others

Costa Tsaousis (ktsaou) committed Sep 15, 2016 at 00:21 UTC 47f84046d8c002d72cb8c83b1fd296f9ee80c9fc
1 file changed +3 -3
src/eval.c
+3 -3
@@ -328,7 +328,6 @@ static struct operator {
328 // this is a random access array
329 // we always access it with a known EVAL_OPERATOR_X
330
331 - [EVAL_OPERATOR_IF_THEN_ELSE] = { "?", 1, 3, 0, eval_if_then_else },
331 [EVAL_OPERATOR_AND] = { "&&", 2, 2, 0, eval_and },
332 [EVAL_OPERATOR_OR] = { "||", 2, 2, 0, eval_or },
333 [EVAL_OPERATOR_GREATER_THAN_OR_EQUAL] = { ">=", 3, 2, 0, eval_greater_than_or_equal },
@@ -345,8 +344,9 @@ static struct operator {
344 [EVAL_OPERATOR_SIGN_PLUS] = { "+", 6, 1, 0, eval_sign_plus },
345 [EVAL_OPERATOR_SIGN_MINUS] = { "-", 6, 1, 0, eval_sign_minus },
346 [EVAL_OPERATOR_ABS] = { "abs(",6,1, 1, eval_abs },
348 - [EVAL_OPERATOR_NOP] = { NULL, 7, 1, 0, eval_nop },
349 - [EVAL_OPERATOR_EXPRESSION_OPEN] = { NULL, 7, 1, 0, eval_nop },
347 + [EVAL_OPERATOR_IF_THEN_ELSE] = { "?", 7, 3, 0, eval_if_then_else },
348 + [EVAL_OPERATOR_NOP] = { NULL, 8, 1, 0, eval_nop },
349 + [EVAL_OPERATOR_EXPRESSION_OPEN] = { NULL, 8, 1, 0, eval_nop },
350
351 // this should exist in our evaluation list
352 [EVAL_OPERATOR_EXPRESSION_CLOSE] = { NULL, 99, 1, 0, eval_nop }