Merge branch 'master' of github.com:Rolisteam/DiceParser

1 files changed, 49 insertions, 1 deletions

diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 7a52c65..7950e4d 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -24,6 +24,7 @@
 #include "parsingtoolbox.h"
 #include "node/sortresult.h"
 
+QHash<QString,QString>*  ParsingToolBox::m_variableHash = NULL;
 
 ParsingToolBox::ParsingToolBox()
 {
@@ -279,7 +280,9 @@ bool ParsingToolBox::readNumber(QString& str, qint64& myNumber)
     }
 
     if(number.isEmpty())
-        return false;
+    {
+        return readVariable(str,myNumber);
+    }
 
     bool ok;
     myNumber = number.toLongLong(&ok);
@@ -288,8 +291,43 @@ bool ParsingToolBox::readNumber(QString& str, qint64& myNumber)
         str=str.remove(0,number.size());
         return true;
     }
+
     return false;
 }
+
+bool ParsingToolBox::readVariable(QString &str, qint64 &myNumber)
+{
+    if(str.isEmpty())
+        return false;
+    if(str.startsWith("${"))
+    {
+        str=str.remove(0,2);
+    }
+    QString key;
+    int post = str.indexOf('}');
+    key = str.left(post);
+
+    if(NULL!=m_variableHash)
+    {
+        if(m_variableHash->contains(key))
+        {
+            QString value = m_variableHash->value(key);
+            bool ok;
+            int valueInt = value.toInt(&ok);
+            if(ok)
+            {
+                myNumber = valueInt;
+                str=str.remove(0,post+1);
+                return true;
+            }
+
+        }
+    }
+
+
+    return false;
+
+}
 bool ParsingToolBox::readOpenParentheses(QString& str)
 {
     if(str.startsWith("("))
@@ -436,6 +474,16 @@ void ParsingToolBox::readPainterParameter(PainterNode* painter,QString& str)
     }
 }
 
+QHash<QString, QString> *ParsingToolBox::getVariableHash()
+{
+    return m_variableHash;
+}
+
+void ParsingToolBox::setVariableHash(QHash<QString, QString> *variableHash)
+{
+    m_variableHash = variableHash;
+}
+
 void ParsingToolBox::readProbability(QStringList& str,QList<Range>& ranges)
 {
     quint64 totalDistance=0;