From b94eced787742cf218dbc57f73dcbdfee26e500d Mon Sep 17 00:00:00 2001 From: obiwankennedy Date: Tue, 18 Mar 2014 11:27:49 +0100 Subject: Update diceparser.cpp adding support of default dice value: 4k3 .... --- diceparser.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/diceparser.cpp b/diceparser.cpp index f8fb477..6bec12d 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -14,6 +14,8 @@ #include "node/explosedicenode.h" #include "node/parenthesesnode.h" +#define DEFAULT_FACES_NUMBER 10 + DiceParser::DiceParser() { m_parsingToolbox = new ParsingToolBox(); @@ -319,6 +321,24 @@ bool DiceParser::readOperator(QString& str,ExecutionNode* previous) else { delete node; + ExecutionNode* nodeExec = new DiceRollerNode(DEFAULT_FACES_NUMBER); + ExecutionNode* nodeExec2 = nodeExec; + bool readOptionSuccessed=false; + while(readOption(str,nodeExec)) + { + nodeExec = getLatestNode(nodeExec); + readOptionSuccessed = true; + } + if(readOptionSuccessed) + { + previous->setNextNode(nodeExec2); + } + else + { + delete nodeExec; + nodeExec = NULL; + nodeExec2 = NULL; + } } return false; } -- cgit v1.2.3-70-g09d2