update diceparser

1 files changed, 21 insertions, 28 deletions

diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index a9a19e3..f4884c8 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -38,44 +38,37 @@ ScalarOperatorNode::ScalarOperatorNode()
 }
 ScalarOperatorNode::~ScalarOperatorNode()
 {
-	if(nullptr!=m_internalNode)
-	{
-		delete m_internalNode;
-		m_internalNode = nullptr;
-	}
+    if(nullptr!=m_internalNode)
+    {
+        delete m_internalNode;
+        m_internalNode = nullptr;
+    }
 }
 
 void ScalarOperatorNode::run(ExecutionNode* previous)
 {
     m_previousNode = previous;
-    if(nullptr!=m_internalNode)
+    if(NULL!=m_internalNode)
     {
             m_internalNode->run(this);
     }
-    if(nullptr!=previous)
+    if(NULL!=previous)
     {
         DiceResult* previousResult = static_cast<DiceResult*>(previous->getResult());
 
-        if(nullptr!=previousResult)
+        if(NULL!=previousResult)
         {
             ExecutionNode* internal = m_internalNode;
-            if(nullptr != internal)
+            if(NULL != internal)
             {
-             while(nullptr != internal->getNextNode() )
-             {
+                while(nullptr != internal->getNextNode() )
+                {
                     internal = internal->getNextNode();
              }
 
 
-            Result* internalResult = internal->getResult();
-            m_result->setPrevious(internalResult);
-            if(nullptr!=m_internalNode->getResult())
-            {
-                m_internalNode->getResult()->setPrevious(previousResult);
-            }
-
-            switch(m_arithmeticOperator)
-            {
+                switch(m_arithmeticOperator)
+                {
                 case Die::PLUS:
                     m_scalarResult->setValue(add(previousResult->getResult(Result::SCALAR).toReal(),internalResult->getResult(Result::SCALAR).toReal()));
                     break;
@@ -94,7 +87,7 @@ void ScalarOperatorNode::run(ExecutionNode* previous)
             }
             }
 
-            if(nullptr!=m_nextNode)
+            if(NULL!=m_nextNode)
             {
                 m_nextNode->run(this);
             }
@@ -193,7 +186,7 @@ void ScalarOperatorNode::generateDotTree(QString& s)
 	s.append(toString(true));
 	s.append(";\n");
 
-    if(nullptr!=m_nextNode)
+    if(NULL!=m_nextNode)
     {
 		s.append(toString(false));
         s.append(" -> ");
@@ -205,12 +198,12 @@ void ScalarOperatorNode::generateDotTree(QString& s)
     {
 		s.append(toString(false));
         s.append(" -> ");
-		s.append("nullptr");
-		s.append(" [label=\"nextNode\"];\n");
+        s.append("nullptr");
+        s.append(" [label=\"nextNode\"];\n");
     }
     QString str;
     str.append("\n");
-    if(nullptr!=m_internalNode)
+    if(NULL!=m_internalNode)
     {
 		str.append(toString(false));
         str.append(" -> ");
@@ -222,14 +215,14 @@ void ScalarOperatorNode::generateDotTree(QString& s)
 }
 QMap<ExecutionNode::DICE_ERROR_CODE,QString> ScalarOperatorNode::getExecutionErrorMap()
 {
-    if(nullptr!=m_internalNode)
+    if(NULL!=m_internalNode)
     {
         for (ExecutionNode::DICE_ERROR_CODE key: m_internalNode->getExecutionErrorMap().keys())
         {
             m_errors.insert(key,m_internalNode->getExecutionErrorMap().value(key));
         }
     }
-    if(nullptr!=m_nextNode)
+    if(NULL!=m_nextNode)
     {
         for (ExecutionNode::DICE_ERROR_CODE key: m_nextNode->getExecutionErrorMap().keys())
         {
@@ -243,7 +236,7 @@ ExecutionNode* ScalarOperatorNode::getCopy() const
     ScalarOperatorNode* node = new ScalarOperatorNode();
     node->setInternalNode(m_internalNode->getCopy());
     node->setArithmeticOperator(m_arithmeticOperator);
-    if(nullptr!=m_nextNode)
+    if(NULL!=m_nextNode)
     {
         node->setNextNode(m_nextNode->getCopy());
     }