Remove getLatestNode to getLeafNode

4 files changed, 13 insertions, 22 deletions

diff --git a/include/parsingtoolbox.h b/include/parsingtoolbox.h
index a58aabd..1817704 100644
--- a/include/parsingtoolbox.h
+++ b/include/parsingtoolbox.h
@@ -191,7 +191,6 @@ public:
 
     // Traversal functions
     static QString number(qreal value);
-    static ExecutionNode* getLatestNode(ExecutionNode* node);
     static ExecutionNode* getLeafNode(ExecutionNode* start);
     const std::vector<ExecutionNode*>& getStartNodes();
     static void setStartNodes(std::vector<ExecutionNode*>* startNodes);
diff --git a/node/rerolldicenode.cpp b/node/rerolldicenode.cpp
index 370e95e..e7bf0f0 100644
--- a/node/rerolldicenode.cpp
+++ b/node/rerolldicenode.cpp
@@ -56,7 +56,7 @@ void RerollDiceNode::run(ExecutionNode* previous)
                     if(m_instruction != nullptr)
                     {
                         m_instruction->run(this);
-                        auto lastNode= ParsingToolBox::getLatestNode(m_instruction);
+                        auto lastNode= ParsingToolBox::getLeafNode(m_instruction);
                         if(lastNode != nullptr)
                         {
                             auto lastResult= dynamic_cast<DiceResult*>(lastNode->getResult());
diff --git a/node/variablenode.cpp b/node/variablenode.cpp
index e286a95..f48c254 100644
--- a/node/variablenode.cpp
+++ b/node/variablenode.cpp
@@ -8,7 +8,7 @@ void VariableNode::run(ExecutionNode* previous)
     if((nullptr != m_data) && (m_data->size() > m_index))
     {
         auto value= (*m_data)[m_index];
-        value= ParsingToolBox::getLatestNode(value);
+        value= ParsingToolBox::getLeafNode(value);
         if(nullptr != value)
         {
             auto result= value->getResult();
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 0b8a3d2..47405a5 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -139,15 +139,7 @@ ExecutionNode* ParsingToolBox::addSort(ExecutionNode* e, bool b)
     e->setNextNode(nodeSort);
     return nodeSort;
 }
-ExecutionNode* ParsingToolBox::getLeafNode(ExecutionNode* start)
-{
-    ExecutionNode* next= start;
-    while(nullptr != next->getNextNode())
-    {
-        next= next->getNextNode();
-    }
-    return next;
-}
+
 void ParsingToolBox::addError(Dice::ERROR_CODE code, const QString& msg)
 {
     m_errorMap.insert(code, msg);
@@ -477,12 +469,12 @@ bool ParsingToolBox::readDynamicVariable(QString& str, qint64& index)
     return false;
 }
 
-ExecutionNode* ParsingToolBox::getLatestNode(ExecutionNode* node)
+ExecutionNode* ParsingToolBox::getLeafNode(ExecutionNode* start)
 {
-    if(nullptr == node)
+    if(nullptr == start)
         return nullptr;
 
-    ExecutionNode* next= node;
+    ExecutionNode* next= start;
     while(nullptr != next->getNextNode())
     {
         next= next->getNextNode();
@@ -1432,12 +1424,12 @@ bool ParsingToolBox::readExpression(QString& str, ExecutionNode*& node)
         }
         node= operandNode;
 
-        operandNode= ParsingToolBox::getLatestNode(operandNode);
+        operandNode= ParsingToolBox::getLeafNode(operandNode);
         // ExecutionNode* operatorNode=nullptr;
         while(readOperator(str, operandNode))
         {
             // operandNode->setNextNode(operatorNode);
-            operandNode= ParsingToolBox::getLatestNode(operandNode);
+            operandNode= ParsingToolBox::getLeafNode(operandNode);
         }
         return true;
     }
@@ -1992,7 +1984,7 @@ bool ParsingToolBox::readDice(QString& str, ExecutionNode*& node)
                 ExecutionNode* current= drNode;
                 while(readOption(str, current))
                 {
-                    current= ParsingToolBox::getLatestNode(current);
+                    current= ParsingToolBox::getLeafNode(current);
                 }
                 return true;
             }
@@ -2008,7 +2000,7 @@ bool ParsingToolBox::readDice(QString& str, ExecutionNode*& node)
                 ExecutionNode* current= drNode;
                 while(readOption(str, current))
                 {
-                    current= ParsingToolBox::getLatestNode(current);
+                    current= ParsingToolBox::getLeafNode(current);
                 }
                 return true;
             }
@@ -2177,7 +2169,7 @@ bool ParsingToolBox::readOperator(QString& str, ExecutionNode* previous)
     {
         while(readOption(str, previous))
         {
-            previous= ParsingToolBox::getLatestNode(previous);
+            previous= ParsingToolBox::getLeafNode(previous);
         }
     }
     return false;
@@ -2272,14 +2264,14 @@ std::vector<ExecutionNode*> ParsingToolBox::readInstructionList(QString& str, bo
             auto latest= startNode;
             if(keepParsing)
             {
-                latest= ParsingToolBox::getLatestNode(latest);
+                latest= ParsingToolBox::getLeafNode(latest);
                 keepParsing= !str.isEmpty();
                 while(keepParsing)
                 {
                     auto before= str;
                     if(readOperator(str, latest))
                     {
-                        latest= ParsingToolBox::getLatestNode(latest);
+                        latest= ParsingToolBox::getLeafNode(latest);
                     }
                     keepParsing= (!str.isEmpty() && (before != str));
                 }