Merge branch 'master' of github-as-renaud:obiwankennedy/DiceParser

6 files changed, 55 insertions, 58 deletions

diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp
index 8eecf0d..1fd1a2f 100644
--- a/node/dicerollernode.cpp
+++ b/node/dicerollernode.cpp
@@ -8,24 +8,24 @@
 #include <QTime>
 
 
-DiceRoller::DiceRoller(QMutex* mutex,DiceResult* diceResult,int faces,int count)
-    : m_mutex(mutex),m_sharedDiceResult(diceResult),m_faces(faces),m_diceCount(count)
-{
+//DiceRoller::DiceRoller(QMutex* mutex,DiceResult* diceResult,int faces,int count)
+//    : m_mutex(mutex),m_sharedDiceResult(diceResult),m_faces(faces),m_diceCount(count)
+//{
 
-}
+//}
 
-void DiceRoller::run()
-{
-    for(quint64 i=0; i < m_diceCount ; ++i)
-    {
-        Die* die = new Die();
-        die->setFaces(m_faces);
-        die->roll();
-        m_mutex->lock();
-        m_sharedDiceResult->insertResult(die);
-        m_mutex->unlock();
-    }
-}
+//void DiceRoller::run()
+//{
+//    for(quint64 i=0; i < m_diceCount ; ++i)
+//    {
+//        Die* die = new Die();
+//        die->setFaces(m_faces);
+//        die->roll();
+//        m_mutex->lock();
+//        m_sharedDiceResult->insertResult(die);
+//        m_mutex->unlock();
+//    }
+//}
 
 
 
diff --git a/node/dicerollernode.h b/node/dicerollernode.h
index 472a5d8..d50fe95 100644
--- a/node/dicerollernode.h
+++ b/node/dicerollernode.h
@@ -7,17 +7,17 @@
 
 #include "executionnode.h"
 #include "result/diceresult.h"
-class DiceRoller : public QRunnable
-{
-public:
-    DiceRoller(QMutex* mutex,DiceResult* diceResult,int faces,int count);
-    virtual void run ();
-private:
-    QMutex* m_mutex;
-    DiceResult* m_sharedDiceResult;
-    int m_faces;
-    quint64 m_diceCount;
-};
+//class DiceRoller : public QRunnable
+//{
+//public:
+//    DiceRoller(QMutex* mutex,DiceResult* diceResult,int faces,int count);
+//    virtual void run ();
+//private:
+//    QMutex* m_mutex;
+//    DiceResult* m_sharedDiceResult;
+//    int m_faces;
+//    quint64 m_diceCount;
+//};
 
 /**
  * @brief The DiceRollerNode class
diff --git a/node/executionnode.h b/node/executionnode.h
index e0fc563..cf1514f 100644
--- a/node/executionnode.h
+++ b/node/executionnode.h
@@ -9,7 +9,7 @@
 class ExecutionNode
 {
 public:
-    enum ERROR_CODE {NO_ERROR,DIE_RESULT_EXPECTED,BAD_SYNTAXE};
+    enum ERROR_CODE {NO_ERROR,DIE_RESULT_EXPECTED,BAD_SYNTAXE,ENDLESS_LOOP_ERROR};
     /**
      * @brief ExecutionNode
      */
diff --git a/node/helpnode.cpp b/node/helpnode.cpp
index 82f44f8..f31fac1 100644
--- a/node/helpnode.cpp
+++ b/node/helpnode.cpp
@@ -30,7 +30,7 @@ void HelpNode::run(ExecutionNode* previous)
 }
 QString HelpNode::toString()const
 {
-    return QObject::tr("Rolisteam Dice Parser: Full documentation at: https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md\n");
+    return QObject::tr("Rolisteam Dice Parser: Full documentation at: <a href=\"https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md\">https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md</a> \n");
 }
 
 qint64 HelpNode::getPriority() const
diff --git a/node/node.pri b/node/node.pri
index 7424c0b..d7f5c7c 100644
--- a/node/node.pri
+++ b/node/node.pri
@@ -1,33 +1,33 @@
 HEADERS += \
-    node/dicerollernode.h \
-    node/executionnode.h \
-    node/rerolldicenode.h \
-    node/startingnode.h \
-    node/scalaroperatornode.h \
-    node/numbernode.h \
-    node/sortresult.h \
-    node/keepdiceexecnode.h \
-    node/countexecutenode.h \
-    node/explosedicenode.h \
-    node/parenthesesnode.h \
-    node/helpnode.h \
+    $$PWD/dicerollernode.h \
+    $$PWD/executionnode.h \
+    $$PWD/rerolldicenode.h \
+    $$PWD/startingnode.h \
+    $$PWD/scalaroperatornode.h \
+    $$PWD/numbernode.h \
+    $$PWD/sortresult.h \
+    $$PWD/keepdiceexecnode.h \
+    $$PWD/countexecutenode.h \
+    $$PWD/explosedicenode.h \
+    $$PWD/parenthesesnode.h \
+    $$PWD/helpnode.h \
     $$PWD/jumpbackwardnode.h \
-    node/listsetrollnode.h \
+    $$PWD/listsetrollnode.h
     $$PWD/listaliasnode.h
 
 SOURCES += \
-    node/dicerollernode.cpp \
-    node/executionnode.cpp \
-    node/startingnode.cpp \
-    node/rerolldicenode.cpp \
-    node/scalaroperatornode.cpp \
-    node/numbernode.cpp \
-    node/sortresult.cpp \
-    node/keepdiceexecnode.cpp \
-    node/countexecutenode.cpp \
-    node/explosedicenode.cpp \
-    node/parenthesesnode.cpp \
-    node/helpnode.cpp \
+    $$PWD/dicerollernode.cpp \
+    $$PWD/executionnode.cpp \
+    $$PWD/startingnode.cpp \
+    $$PWD/rerolldicenode.cpp \
+    $$PWD/scalaroperatornode.cpp \
+    $$PWD/numbernode.cpp \
+    $$PWD/sortresult.cpp \
+    $$PWD/keepdiceexecnode.cpp \
+    $$PWD/countexecutenode.cpp \
+    $$PWD/explosedicenode.cpp \
+    $$PWD/parenthesesnode.cpp \
+    $$PWD/helpnode.cpp \
     $$PWD/jumpbackwardnode.cpp \
-    node/listsetrollnode.cpp \
+    $$PWD/listsetrollnode.cpp
     $$PWD/listaliasnode.cpp
diff --git a/node/sortresult.cpp b/node/sortresult.cpp
index 5d7f142..46e6eb8 100644
--- a/node/sortresult.cpp
+++ b/node/sortresult.cpp
@@ -72,9 +72,6 @@ void SortResultNode::run(ExecutionNode* node)
             }
 
         }
-
-
-
         m_diceResult->setResultList(diceList2);
         if(NULL!=m_nextNode)
         {