Update scalaroperatornode.cpp

getPriority

1 files changed, 13 insertions, 8 deletions

diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index 076e3b3..d08532c 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -18,10 +18,9 @@ ScalarOperatorNode::ScalarOperatorNode()
 
 void ScalarOperatorNode::run(ExecutionNode* previous)
 {
-
     if(NULL!=m_internalNode)
     {
-        m_internalNode->run(this);
+            m_internalNode->run(this);
     }
     if(NULL!=previous)
     {
@@ -30,17 +29,16 @@ void ScalarOperatorNode::run(ExecutionNode* previous)
         if(NULL!=previousResult)
         {
             ExecutionNode* internal = m_internalNode;
-            while(NULL != internal->getNextNode() )
-            {
-                internal = internal->getNextNode();
-            }
+             while(NULL != internal->getNextNode() )
+             {
+                    internal = internal->getNextNode();
+             }
+
 
             Result* internalResult = internal->getResult();
             m_result->setPrevious(internalResult);
             m_internalNode->getResult()->setPrevious(previousResult);
 
-            //qDebug() << "ScalarOperatorNode node" << m_myOperator;
-
             switch(m_myOperator)
             {
                 case PLUS:
@@ -106,3 +104,10 @@ QString ScalarOperatorNode::toString() const
 {
     return "ScalarOperatorNode";
 }
+qint64 ScalarOperatorNode::getPriority() const
+{
+    if((m_myOperator==PLUS)||(m_myOperator==MINUS))
+        return 1;
+    else
+        return 2;
+}