aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--diceparser.cpp17
-rw-r--r--diceparser.h2
-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
-rw-r--r--parsingtoolbox.cpp8
-rw-r--r--parsingtoolbox.h3
10 files changed, 176 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977d1f6..11821d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,7 @@ add_executable(
booleancondition.cpp
validator.cpp
compositevalidator.cpp
+ operationcondition.cpp
die.cpp
parsingtoolbox.cpp
dicealias.cpp
@@ -49,6 +50,7 @@ add_executable(
node/scalaroperatornode.cpp
node/sortresult.cpp
node/startingnode.cpp
+ node/ifnode.cpp
cli/main.cpp
)
diff --git a/diceparser.cpp b/diceparser.cpp
index 7fcf267..6e63eec 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -39,6 +39,7 @@
#include "node/listsetrollnode.h"
#include "node/listaliasnode.h"
#include "node/mergenode.h"
+#include "node/ifnode.h"
#define DEFAULT_FACES_NUMBER 10
@@ -60,14 +61,9 @@ DiceParser::DiceParser()
m_OptionOp->insert(QStringLiteral("r"),Reroll);
m_OptionOp->insert(QStringLiteral("e"),Explosing);
m_OptionOp->insert(QStringLiteral("a"),RerollAndAdd);
- //m_OptionOp->insert(QObject::tr("@"),JumpBackward);
-
+ m_OptionOp->insert(QStringLiteral("i"),ifOperator);
m_aliasList = new QList<DiceAlias*>();
- /*m_aliasList->append(new DiceAlias("l5r","D10k"));
- m_aliasList->append(new DiceAlias("l5R","D10K"));
- m_aliasList->append(new DiceAlias("nwod","D10e10c[>7]"));
- m_aliasList->append(new DiceAlias("(.*)wod(.*)","\\1d10e[=10]c[>=\\2]-@c[=1]",false));*/
m_nodeActionMap = new QMap<QString,NodeAction>();
m_nodeActionMap->insert(QStringLiteral("@"),JumpBackward);
@@ -952,6 +948,15 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous, bool hasDice)/
}
break;
+ case ifOperator:
+ {
+ IfNode* nodeif = new IfNode();
+ Validator* validator = m_parsingToolbox->readCompositeValidator(str);
+ if(NULL!=validator)
+ {
+
+ }
+ }
}
}
diff --git a/diceparser.h b/diceparser.h
index bc92034..ae21ebc 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -77,7 +77,7 @@ public:
/**
* @brief The OptionOperator enum gathering all options availables for result.
*/
- enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge};
+ enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd,Merge,ifOperator};
/**
* @brief The CommandOperator enum
*/
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;
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 7646970..a7220a0 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -378,6 +378,14 @@ ParsingToolBox::LIST_OPERATOR ParsingToolBox::readListOperator(QString& str)
}
return NONE;
}
+bool ParsingToolBox::readIfInstruction(QString& str,ExecutionNode* trueNode,ExecutionNode* falseNode)
+{
+ if(str.startsWith('{'))
+ {
+
+ }
+}
+
void ParsingToolBox::readProbability(QStringList& str,QList<Range>& ranges)
{
quint64 totalDistance=0;
diff --git a/parsingtoolbox.h b/parsingtoolbox.h
index bf59c5c..04a46c4 100644
--- a/parsingtoolbox.h
+++ b/parsingtoolbox.h
@@ -143,6 +143,9 @@ public:
bool readLogicOperation(QString& str,CompositeValidator::LogicOperation& op);
bool readDiceLogicOperator(QString &str, OperationCondition::ConditionOperator &op);
+
+
+ bool readIfInstruction(QString& str,ExecutionNode* trueNode,ExecutionNode* falseNode);
private:
QMap<QString,BooleanCondition::LogicOperator>* m_logicOp;
QMap<QString,CompositeValidator::LogicOperation>* m_logicOperation;