aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node
diff options
context:
space:
mode:
Diffstat (limited to 'node')
-rw-r--r--node/countexecutenode.cpp8
-rw-r--r--node/helpnode.cpp2
-rw-r--r--node/ifnode.cpp95
-rw-r--r--node/ifnode.h50
-rw-r--r--node/keepdiceexecnode.cpp2
5 files changed, 151 insertions, 6 deletions
diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index 55b278e..89b21e5 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -27,11 +27,11 @@ void CountExecuteNode::run(ExecutionNode *previous)
{
return;
}
- DiceResult* previous_result = dynamic_cast<DiceResult*>(previous->getResult());
- if(NULL!=previous_result)
+ DiceResult* previousResult = dynamic_cast<DiceResult*>(previous->getResult());
+ if(NULL!=previousResult)
{
- m_result->setPrevious(previous_result);
- QList<Die*> diceList=previous_result->getResultList();
+ m_result->setPrevious(previousResult);
+ QList<Die*> diceList=previousResult->getResultList();
qint64 sum = 0;
foreach(Die* dice,diceList)
{
diff --git a/node/helpnode.cpp b/node/helpnode.cpp
index 6f3916a..76ddf50 100644
--- a/node/helpnode.cpp
+++ b/node/helpnode.cpp
@@ -20,7 +20,7 @@
#include "helpnode.h"
HelpNode::HelpNode()
- : m_path("https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md")
+ : m_path("https://github.com/Rolisteam/DiceParser/blob/master/HelpMe.md")
{
m_result = new StringResult();
}
diff --git a/node/ifnode.cpp b/node/ifnode.cpp
new file mode 100644
index 0000000..80e5264
--- /dev/null
+++ b/node/ifnode.cpp
@@ -0,0 +1,95 @@
+/***************************************************************************
+ * Copyright (C) 2016 by Renaud Guezennec *
+ * http://renaudguezennec.homelinux.org/accueil,3.html *
+ * *
+ * rolisteam is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+#include "ifnode.h"
+#include "result/diceresult.h"
+
+IfNode::IfNode()
+{
+ m_result = new DiceResult();
+}
+
+IfNode::~IfNode()
+{
+
+}
+
+void IfNode::run(ExecutionNode *previous)
+{
+ m_previousNode = previous;
+ if(NULL==previous)
+ {
+ return;
+ }
+ Result* previousResult = previous->getResult();
+ DiceResult* previousDiceResult = dynamic_cast<DiceResult*>(previousResult);
+
+ if(NULL!=previousDiceResult)
+ {
+ qreal value = previousResult->getResult(Result::SCALAR).toReal();
+ QList<Die*> diceList=previousDiceResult->getResultList();
+ if(NULL!=m_validator)
+ {
+ if(!diceList.isEmpty())
+ {
+ foreach(Die* dice,diceList)
+ {
+ m_validator->hasValid(dice,true,true);
+ }
+ }
+ else
+ {
+ Die* dice = new Die();
+ dice->setValue(value);
+ dice->setFaces(value);
+ m_validator->hasValid(dice,true,true);
+ }
+ }
+ }
+
+ if(NULL!=m_nextNode)
+ {
+ m_nextNode->run(this);
+ }
+}
+
+void IfNode::setValidator(Validator* val)
+{
+ m_validator = val;
+}
+void IfNode::setInstructionTrue(ExecutionNode* node)
+{
+ m_true = node;
+}
+
+void IfNode::setInstructionFalse(ExecutionNode* node)
+{
+ m_false = node;
+}
+
+QString IfNode::toString(bool) const
+{
+
+}
+
+qint64 IfNode::getPriority() const
+{
+ return 4;
+}
+
diff --git a/node/ifnode.h b/node/ifnode.h
new file mode 100644
index 0000000..ec962a2
--- /dev/null
+++ b/node/ifnode.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+ * Copyright (C) 2016 by Renaud Guezennec *
+ * http://renaudguezennec.homelinux.org/accueil,3.html *
+ * *
+ * rolisteam is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+#ifndef IFNODE_H
+#define IFNODE_H
+
+#include "executionnode.h"
+#include "result/diceresult.h"
+#include "validator.h"
+#include <QDebug>
+
+/**
+ * @brief The ifNode class explose dice while is valid by the validator.
+ */
+class IfNode : public ExecutionNode
+{
+public:
+ IfNode();
+ virtual ~IfNode();
+ virtual void run(ExecutionNode* previous = NULL);
+ virtual void setValidator(Validator* );
+ virtual void setInstructionTrue(ExecutionNode*);
+ virtual void setInstructionFalse(ExecutionNode*);
+ virtual QString toString(bool )const;
+ virtual qint64 getPriority() const;
+
+protected:
+ DiceResult* m_diceResult;
+ Validator* m_validator;
+
+ ExecutionNode* m_true;
+ ExecutionNode* m_false;
+};
+#endif
diff --git a/node/keepdiceexecnode.cpp b/node/keepdiceexecnode.cpp
index 64d53f0..40a3fce 100644
--- a/node/keepdiceexecnode.cpp
+++ b/node/keepdiceexecnode.cpp
@@ -32,7 +32,7 @@ KeepDiceExecNode::KeepDiceExecNode()
void KeepDiceExecNode::run(ExecutionNode* previous)
{
-m_previousNode = previous;
+ m_previousNode = previous;
if(NULL==previous)
{
return;