diff options
| author | 2017-11-23 17:25:54 +0100 | |
|---|---|---|
| committer | 2017-11-23 17:25:54 +0100 | |
| commit | 95db07d62e7f9808ce3ed42335c5175db0f10f11 (patch) | |
| tree | 0cdb541cc7d17d255ab5316b0a964fecbbe3d713 /diceparser.cpp | |
| parent | 59c256f110dcd5301edc48e3d81576af65df2c2c (diff) | |
| download | OneRoll-95db07d62e7f9808ce3ed42335c5175db0f10f11.tar.gz OneRoll-95db07d62e7f9808ce3ed42335c5175db0f10f11.zip | |
clean source code
Diffstat (limited to 'diceparser.cpp')
| -rw-r--r-- | diceparser.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/diceparser.cpp b/diceparser.cpp index 8838171..b4ea3be 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -254,6 +254,8 @@ bool DiceParser::readExpression(QString& str,ExecutionNode* & node) { NumberNode* numberNode=new NumberNode(); numberNode->setNumber(1); + ExecutionNode* previous = diceNode->getPreviousNode(); + numberNode->setPreviousNode(previous); numberNode->setNextNode(diceNode); node = numberNode; } @@ -869,6 +871,7 @@ bool DiceParser::readOperator(QString& str,ExecutionNode* previous) } previous->setNextNode(nullptr); m_startNodes.append(nodeExec); + auto test = dynamic_cast<DiceRollerNode*>(nodeExec); m_currentTreeHasSeparator = true; return true; } @@ -925,11 +928,6 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//, { case Keep: { - qDebug() << "keep " << previous->toString(true) << str; - if(str == "4+7") - { - qDebug() << "nauteanuit"; - } qint64 myNumber=0; bool ascending = m_parsingToolbox->readAscending(str); @@ -937,7 +935,7 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//, { node = m_parsingToolbox->addSort(previous,ascending); KeepDiceExecNode* nodeK = new KeepDiceExecNode(); - qDebug() << "nodeK " << previous->toString(true) << str; + //qDebug() << "nodeK " << previous->toString(true) << str; nodeK->setDiceKeepNumber(myNumber); node->setNextNode(nodeK); node = nodeK; |