From 993a636818d237feaca1870a65b72ab1d4ead31d Mon Sep 17 00:00:00 2001 From: Renaud G Date: Fri, 10 Mar 2017 01:15:13 +0100 Subject: -fix @ operator. --- diceparser.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/diceparser.cpp b/diceparser.cpp index 4c51d55..b40d5e9 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -770,10 +770,15 @@ bool DiceParser::readOperator(QString& str,ExecutionNode* previous) nodeExecOrChild = nodeExecOrChild->getNextNode(); } - if((nullptr != nodeExecOrChild)&&(nodeExec != nodeExecOrChild)) + // management of operator priority + if((nullptr != nodeExecOrChild)&&(nodeExec != nodeExecOrChild)) { - node->setNextNode(nodeExecOrChild); - parent->setNextNode(NULL); + // good 1 1 2 ; bad 1 0 4 + if(nodeExecOrChild->getPriority()>=node->getPriority()) + { + node->setNextNode(nodeExecOrChild); + parent->setNextNode(NULL); + } } else if(node->getPriority()>=nodeExec->getPriority()) { -- cgit v1.2.3-70-g09d2