diff options
Diffstat (limited to 'src/libparser')
48 files changed, 83 insertions, 347 deletions
diff --git a/src/libparser/node/allsamenode.cpp b/src/libparser/node/allsamenode.cpp index 2303b78..6830fa4 100644 --- a/src/libparser/node/allsamenode.cpp +++ b/src/libparser/node/allsamenode.cpp @@ -1,6 +1,6 @@ #include "allsamenode.h" -AllSameNode::AllSameNode() : m_diceResult(new DiceResult()) +AllSameNode::AllSameNode() : ExecutionNode("%1 [label=\"AllSameNode\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -52,18 +52,6 @@ void AllSameNode::run(ExecutionNode* previous) } } -QString AllSameNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"AllSameNode\"]").arg(m_id); - } - else - { - return m_id; - } -} - qint64 AllSameNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/allsamenode.h b/src/libparser/node/allsamenode.h index ea67c14..87f6a70 100644 --- a/src/libparser/node/allsamenode.h +++ b/src/libparser/node/allsamenode.h @@ -13,11 +13,7 @@ public: // virtual ~AllSameNode(); virtual void run(ExecutionNode* previous); - /** - * @brief toString - * @return - */ - virtual QString toString(bool withLabel) const; + /** * @brief getPriority * @return diff --git a/src/libparser/node/bind.cpp b/src/libparser/node/bind.cpp index 9c502df..aaf3191 100644 --- a/src/libparser/node/bind.cpp +++ b/src/libparser/node/bind.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "bind.h" -BindNode::BindNode() : m_diceResult(new DiceResult()) +BindNode::BindNode() : ExecutionNode("%1 [label=\"Bind Node\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -80,17 +80,7 @@ ExecutionNode* BindNode::getLatestNode(ExecutionNode* node) } return next; } -QString BindNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"Bind Node\"]").arg(m_id); - } - else - { - return m_id; - } -} + qint64 BindNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/bind.h b/src/libparser/node/bind.h index b13c2bd..65f6c09 100644 --- a/src/libparser/node/bind.h +++ b/src/libparser/node/bind.h @@ -33,7 +33,6 @@ class BindNode : public ExecutionNode public: BindNode(); void run(ExecutionNode* previous); - virtual QString toString(bool withLabel) const; virtual qint64 getPriority() const; virtual ExecutionNode* getCopy() const; std::vector<ExecutionNode*>* getStartList() const; diff --git a/src/libparser/node/countexecutenode.cpp b/src/libparser/node/countexecutenode.cpp index a7e490a..8fcb664 100644 --- a/src/libparser/node/countexecutenode.cpp +++ b/src/libparser/node/countexecutenode.cpp @@ -39,14 +39,8 @@ void CountExecuteNode::run(ExecutionNode* previous) } QString CountExecuteNode::toString(bool withlabel) const { - if(withlabel) - { - return QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id, m_validatorList->toString()); - } - else - { - return m_id; - } + return withlabel ? QString("%1 [label=\"CountExecuteNode %2\"]").arg(m_id, m_validatorList->toString()) : + ExecutionNode::toString(withlabel); } qint64 CountExecuteNode::getPriority() const { diff --git a/src/libparser/node/dicerollernode.cpp b/src/libparser/node/dicerollernode.cpp index 8ef0164..f3e0887 100644 --- a/src/libparser/node/dicerollernode.cpp +++ b/src/libparser/node/dicerollernode.cpp @@ -66,16 +66,10 @@ std::pair<qint64, qint64> DiceRollerNode::getRange() const { return std::make_pair(m_min, m_max); } -QString DiceRollerNode::toString(bool wl) const +QString DiceRollerNode::toString(bool withlabel) const { - if(wl) - { - return QString("%1 [label=\"DiceRollerNode faces: %2\"]").arg(m_id).arg(getFaces()); - } - else - { - return m_id; - } + return withlabel ? QString("%1 [label=\"DiceRollerNode faces: %2\"]").arg(m_id).arg(getFaces()) : + ExecutionNode::toString(withlabel); } qint64 DiceRollerNode::getPriority() const { diff --git a/src/libparser/node/executionnode.cpp b/src/libparser/node/executionnode.cpp index b231416..e909e3f 100644 --- a/src/libparser/node/executionnode.cpp +++ b/src/libparser/node/executionnode.cpp @@ -12,12 +12,13 @@ constexpr int WaitingTime{30 * 60 * 1000}; } // namespace -ExecutionNode::ExecutionNode() +ExecutionNode::ExecutionNode(const QString& label) : m_previousNode(nullptr) , m_result(nullptr) , m_nextNode(nullptr) , m_errors(QMap<Dice::ERROR_CODE, QString>()) , m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())) + , m_label(label) { } ExecutionNode::~ExecutionNode() @@ -46,6 +47,19 @@ void ExecutionNode::setPreviousNode(ExecutionNode* node) { m_previousNode= node; } + +QString ExecutionNode::toString(bool withLabel) const +{ + if(withLabel) + { + return m_label.arg(m_id); + } + else + { + return m_id; + } +} + ExecutionNode* ExecutionNode::getNextNode() { return m_nextNode; diff --git a/src/libparser/node/executionnode.h b/src/libparser/node/executionnode.h index cacd307..7036b96 100644 --- a/src/libparser/node/executionnode.h +++ b/src/libparser/node/executionnode.h @@ -17,7 +17,7 @@ public: /** * @brief ExecutionNode */ - ExecutionNode(); + ExecutionNode(const QString& label= QString()); /** * @brief ~ExecutionNode */ @@ -53,7 +53,7 @@ public: * @brief toString * @return */ - virtual QString toString(bool withLabel) const= 0; + virtual QString toString(bool withLabel) const; /** * @brief getPriority * @return @@ -105,6 +105,7 @@ protected: QMap<Dice::ERROR_CODE, QString> m_errors; QMap<Dice::ERROR_CODE, QString> m_warnings; QString m_id; + QString m_label; }; #endif // EXECUTIONNODE_H diff --git a/src/libparser/node/explodedicenode.cpp b/src/libparser/node/explodedicenode.cpp index f4c699d..bdc7e00 100644 --- a/src/libparser/node/explodedicenode.cpp +++ b/src/libparser/node/explodedicenode.cpp @@ -124,14 +124,8 @@ void ExplodeDiceNode::setValidatorList(ValidatorList* val) } QString ExplodeDiceNode::toString(bool withlabel) const { - if(withlabel) - { - return QString("%1 [label=\"ExplodeDiceNode %2\"]").arg(m_id, m_validatorList->toString()); - } - else - { - return m_id; - } + return withlabel ? QString("%1 [label=\"ExplodeDiceNode %2\"]").arg(m_id, m_validatorList->toString()) : + ExecutionNode::toString(withlabel); } qint64 ExplodeDiceNode::getPriority() const { diff --git a/src/libparser/node/filternode.cpp b/src/libparser/node/filternode.cpp index 3274e15..30d48d7 100644 --- a/src/libparser/node/filternode.cpp +++ b/src/libparser/node/filternode.cpp @@ -1,7 +1,7 @@ #include "filternode.h" #include "validatorlist.h" -FilterNode::FilterNode() : m_diceResult(new DiceResult()) +FilterNode::FilterNode() : ExecutionNode("%1 [label=\"FilterNode\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -54,17 +54,6 @@ void FilterNode::run(ExecutionNode* previous) m_diceResult->setResultList(diceList2); } -QString FilterNode::toString(bool wl) const -{ - if(wl) - { - return QString("%1 [label=\"FilterNode\"]").arg(m_id); - } - else - { - return m_id; - } -} qint64 FilterNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/filternode.h b/src/libparser/node/filternode.h index 4022aa3..d5012a3 100644 --- a/src/libparser/node/filternode.h +++ b/src/libparser/node/filternode.h @@ -19,11 +19,6 @@ public: */ virtual void setValidatorList(ValidatorList*); /** - * @brief toString - * @return - */ - virtual QString toString(bool withLabel) const; - /** * @brief getPriority * @return */ diff --git a/src/libparser/node/groupnode.cpp b/src/libparser/node/groupnode.cpp index e6ad550..556a432 100644 --- a/src/libparser/node/groupnode.cpp +++ b/src/libparser/node/groupnode.cpp @@ -62,7 +62,10 @@ void DieGroup::setExceptedValue(qint64 exceptedValue) //--------------------- GroupNode::GroupNode(bool complexOutput) - : m_scalarResult(new ScalarResult), m_stringResult(new StringResult), m_complexOutput(complexOutput) + : ExecutionNode("%1 [label=\"SplitNode Node\"]") + , m_scalarResult(new ScalarResult) + , m_stringResult(new StringResult) + , m_complexOutput(complexOutput) { } @@ -77,6 +80,9 @@ void GroupNode::run(ExecutionNode* previous) if(isValid(!m_previousNode, Dice::ERROR_CODE::NO_PREVIOUS_ERROR, tr("No Previous node"))) return; + if(!m_result) + return; + m_result->setPrevious(previous->getResult()); Result* tmpResult= previous->getResult(); @@ -130,17 +136,6 @@ void GroupNode::run(ExecutionNode* previous) m_stringResult->addText(QStringLiteral("%1 (%2)").arg(die.size()).arg(list.join(","))); } -QString GroupNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"SplitNode Node\"]").arg(m_id); - } - else - { - return m_id; - } -} qint64 GroupNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/groupnode.h b/src/libparser/node/groupnode.h index 982eb6d..f9886f7 100644 --- a/src/libparser/node/groupnode.h +++ b/src/libparser/node/groupnode.h @@ -51,7 +51,6 @@ class GroupNode : public ExecutionNode public: GroupNode(bool complexOutput= false); void run(ExecutionNode* previous) override; - virtual QString toString(bool withLabel) const override; virtual qint64 getPriority() const override; virtual ExecutionNode* getCopy() const override; diff --git a/src/libparser/node/helpnode.cpp b/src/libparser/node/helpnode.cpp index e8edc9c..7716ce6 100644 --- a/src/libparser/node/helpnode.cpp +++ b/src/libparser/node/helpnode.cpp @@ -51,14 +51,9 @@ void HelpNode::run(ExecutionNode* previous) } QString HelpNode::toString(bool wl) const { - if(wl) - { - return QString("%1 [label=\"%3 : %2\"]").arg(m_id, m_path, tr("Rolisteam Dice Parser:\nFull documentation at")); - } - else - { - return m_id; - } + return wl ? QString("%1 [label=\"%3 : %2\"]") + .arg(m_id, m_path, tr("Rolisteam Dice Parser:\nFull documentation at")) : + ExecutionNode::toString(wl); } qint64 HelpNode::getPriority() const diff --git a/src/libparser/node/ifnode.cpp b/src/libparser/node/ifnode.cpp index 62821ae..a448ab1 100644 --- a/src/libparser/node/ifnode.cpp +++ b/src/libparser/node/ifnode.cpp @@ -21,7 +21,8 @@ #include "result/diceresult.h" #include "validatorlist.h" -PartialDiceRollNode::PartialDiceRollNode() : m_diceResult(new DiceResult) +PartialDiceRollNode::PartialDiceRollNode() + : ExecutionNode("%1 [label=\"PartialDiceRollNode \"]"), m_diceResult(new DiceResult) { m_result= m_diceResult; } @@ -54,18 +55,6 @@ qint64 PartialDiceRollNode::getPriority() const return priority; } -QString PartialDiceRollNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"PartialDiceRollNode \"]").arg(m_id); - } - else - { - return m_id; - } -} - DiceResult* getFirstDiceResult(Result* result) { DiceResult* found= nullptr; @@ -81,7 +70,8 @@ DiceResult* getFirstDiceResult(Result* result) return found; } -IfNode::IfNode() : m_conditionType(Dice::AllOfThem), m_true(nullptr), m_false(nullptr) +IfNode::IfNode() + : ExecutionNode("%1 [label=\"IfNode\"]"), m_conditionType(Dice::AllOfThem), m_true(nullptr), m_false(nullptr) { // m_result = new DiceResult(); } @@ -292,18 +282,6 @@ void IfNode::generateDotTree(QString& s) } } -QString IfNode::toString(bool wl) const -{ - if(wl) - { - return QString("%1 [label=\"IfNode\"]").arg(m_id); - } - else - { - return m_id; - } -} - qint64 IfNode::getPriority() const { return 0; diff --git a/src/libparser/node/ifnode.h b/src/libparser/node/ifnode.h index 912d65c..716ff10 100644 --- a/src/libparser/node/ifnode.h +++ b/src/libparser/node/ifnode.h @@ -34,7 +34,6 @@ public: virtual void run(ExecutionNode* previous= nullptr) override; virtual qint64 getPriority() const override; virtual ExecutionNode* getCopy() const override; - virtual QString toString(bool withLabel) const override; private: DiceResult* m_diceResult; @@ -72,11 +71,6 @@ public: */ virtual void setInstructionFalse(ExecutionNode*); /** - * @brief toString - * @return - */ - virtual QString toString(bool) const; - /** * @brief getPriority * @return */ diff --git a/src/libparser/node/jumpbackwardnode.cpp b/src/libparser/node/jumpbackwardnode.cpp index 3e2f4c1..5e871d2 100644 --- a/src/libparser/node/jumpbackwardnode.cpp +++ b/src/libparser/node/jumpbackwardnode.cpp @@ -21,7 +21,7 @@ #include "jumpbackwardnode.h" #include <QDebug> -JumpBackwardNode::JumpBackwardNode() +JumpBackwardNode::JumpBackwardNode() : ExecutionNode("%1 [label=\"JumpBackwardNode\"]") { m_previousNode= nullptr; m_backwardNode= nullptr; @@ -38,17 +38,7 @@ qint64 JumpBackwardNode::getPriority() const { return 4; } -QString JumpBackwardNode::toString(bool wl) const -{ - if(wl) - { - return QString("%1 [label=\"JumpBackwardNode\"]").arg(m_id); - } - else - { - return m_id; - } -} + void JumpBackwardNode::generateDotTree(QString& s) { s.append(toString(true)); diff --git a/src/libparser/node/jumpbackwardnode.h b/src/libparser/node/jumpbackwardnode.h index 4de2a05..aee7e48 100644 --- a/src/libparser/node/jumpbackwardnode.h +++ b/src/libparser/node/jumpbackwardnode.h @@ -39,12 +39,6 @@ public: * @param previous */ virtual void run(ExecutionNode* previous= nullptr) override; - - /** - * @brief toString - * @return - */ - virtual QString toString(bool) const override; /** * @brief getPriority * @return diff --git a/src/libparser/node/keepdiceexecnode.cpp b/src/libparser/node/keepdiceexecnode.cpp index b4547c3..15e2fa1 100644 --- a/src/libparser/node/keepdiceexecnode.cpp +++ b/src/libparser/node/keepdiceexecnode.cpp @@ -23,7 +23,7 @@ #include "diceparser/parsingtoolbox.h" #include "keepdiceexecnode.h" -KeepDiceExecNode::KeepDiceExecNode() : m_diceResult(new DiceResult()) +KeepDiceExecNode::KeepDiceExecNode() : ExecutionNode("%1 [label=\"KeepDiceExecNode\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -89,18 +89,7 @@ void KeepDiceExecNode::setDiceKeepNumber(ExecutionNode* n) { m_numberOfDiceNode= n; } -QString KeepDiceExecNode::toString(bool wl) const -{ - if(wl) - { - // auto param= m_numberOfDiceNode->toString(wl); - return QString("%1 [label=\"KeepDiceExecNode\"]").arg(m_id); - } - else - { - return m_id; - } -} + qint64 KeepDiceExecNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/keepdiceexecnode.h b/src/libparser/node/keepdiceexecnode.h index e6bd998..7442bb7 100644 --- a/src/libparser/node/keepdiceexecnode.h +++ b/src/libparser/node/keepdiceexecnode.h @@ -35,7 +35,6 @@ public: virtual void run(ExecutionNode* previous); virtual void setDiceKeepNumber(ExecutionNode* valueNode); - virtual QString toString(bool) const; virtual qint64 getPriority() const; virtual ExecutionNode* getCopy() const; diff --git a/src/libparser/node/listsetrollnode.cpp b/src/libparser/node/listsetrollnode.cpp index adb02ec..9ef2cc2 100644 --- a/src/libparser/node/listsetrollnode.cpp +++ b/src/libparser/node/listsetrollnode.cpp @@ -42,14 +42,8 @@ QStringList ListSetRollNode::getList() const } QString ListSetRollNode::toString(bool wl) const { - if(wl) - { - return QString("%1 [label=\"ListSetRoll list:%2\"]").arg(m_id, m_values.join(",")); - } - else - { - return m_id; - } + return wl ? QString("%1 [label=\"ListSetRoll list:%2\"]").arg(m_id, m_values.join(",")) : + ExecutionNode::toString(wl); } qint64 ListSetRollNode::getPriority() const { diff --git a/src/libparser/node/mergenode.cpp b/src/libparser/node/mergenode.cpp index 8f30289..befeede 100644 --- a/src/libparser/node/mergenode.cpp +++ b/src/libparser/node/mergenode.cpp @@ -23,7 +23,8 @@ #include <diceparser/parsingtoolbox.h> -MergeNode::MergeNode(std::vector<ExecutionNode*>& startList) : m_startList(startList), m_diceResult(new DiceResult()) +MergeNode::MergeNode(std::vector<ExecutionNode*>& startList) + : ExecutionNode("%1 [label=\"Merge Node\"]"), m_startList(startList), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -111,17 +112,7 @@ ExecutionNode* MergeNode::getLatestNode(ExecutionNode* node) } return next; } -QString MergeNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"Merge Node\"]").arg(m_id); - } - else - { - return m_id; - } -} + qint64 MergeNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/mergenode.h b/src/libparser/node/mergenode.h index 1b32352..4d0b1e6 100644 --- a/src/libparser/node/mergenode.h +++ b/src/libparser/node/mergenode.h @@ -33,7 +33,6 @@ class MergeNode : public ExecutionNode public: MergeNode(std::vector<ExecutionNode*>& startList); void run(ExecutionNode* previous); - virtual QString toString(bool withLabel) const; virtual qint64 getPriority() const; virtual ExecutionNode* getCopy() const; diff --git a/src/libparser/node/numbernode.cpp b/src/libparser/node/numbernode.cpp index 499a0a2..ad71229 100644 --- a/src/libparser/node/numbernode.cpp +++ b/src/libparser/node/numbernode.cpp @@ -50,14 +50,8 @@ void NumberNode::setNumber(qint64 a) } QString NumberNode::toString(bool withLabel) const { - if(withLabel) - { - return QString("%1 [label=\"NumberNode %2\"]").arg(m_id).arg(m_number); - } - else - { - return m_id; - } + return withLabel ? QString("%1 [label=\"NumberNode %2\"]").arg(m_id).arg(m_number) : + ExecutionNode::toString(withLabel); } qint64 NumberNode::getPriority() const { diff --git a/src/libparser/node/occurencecountnode.cpp b/src/libparser/node/occurencecountnode.cpp index 780ca08..588bc91 100644 --- a/src/libparser/node/occurencecountnode.cpp +++ b/src/libparser/node/occurencecountnode.cpp @@ -23,7 +23,7 @@ #include "validatorlist.h" #include <QVector> -OccurenceCountNode::OccurenceCountNode() : ExecutionNode() {} +OccurenceCountNode::OccurenceCountNode() : ExecutionNode("%1 [label=\"OccurenceCountNode\"]") {} void OccurenceCountNode::run(ExecutionNode* previous) { @@ -58,17 +58,7 @@ void OccurenceCountNode::run(ExecutionNode* previous) else runForDiceResult(mapOccurence); } -QString OccurenceCountNode::toString(bool label) const -{ - if(label) - { - return QString("%1 [label=\"OccurenceCountNode %2\"]").arg(m_id); - } - else - { - return m_id; - } -} + ExecutionNode* OccurenceCountNode::getCopy() const { return nullptr; diff --git a/src/libparser/node/occurencecountnode.h b/src/libparser/node/occurencecountnode.h index 4801bfb..10f0789 100644 --- a/src/libparser/node/occurencecountnode.h +++ b/src/libparser/node/occurencecountnode.h @@ -31,7 +31,6 @@ public: OccurenceCountNode(); void run(ExecutionNode* previous= nullptr); - virtual QString toString(bool withLabel) const; ExecutionNode* getCopy() const; qint64 getPriority() const; diff --git a/src/libparser/node/paintnode.cpp b/src/libparser/node/paintnode.cpp index 0289622..dcf2016 100644 --- a/src/libparser/node/paintnode.cpp +++ b/src/libparser/node/paintnode.cpp @@ -45,7 +45,7 @@ void ColorItem::setColor(const QString& color) /// @brief PainterNode::PainterNode /////////////////////////////////// -PainterNode::PainterNode() : ExecutionNode() +PainterNode::PainterNode() : ExecutionNode("%1 [label=\"PainterNode\"]") { m_nextNode= nullptr; } @@ -86,18 +86,6 @@ void PainterNode::run(ExecutionNode* previous) m_result= m_diceResult; } -QString PainterNode::toString(bool wl) const -{ - if(wl) - { - return QString("%1 [label=\"PainterNode\"]").arg(m_id); - } - else - { - return m_id; - } -} - qint64 PainterNode::getPriority() const { return 4; diff --git a/src/libparser/node/paintnode.h b/src/libparser/node/paintnode.h index 06d849e..9f98608 100644 --- a/src/libparser/node/paintnode.h +++ b/src/libparser/node/paintnode.h @@ -46,11 +46,10 @@ class PainterNode : public ExecutionNode public: PainterNode(); virtual ~PainterNode(); - virtual void run(ExecutionNode* previous= nullptr); - virtual QString toString(bool) const; - virtual qint64 getPriority() const; + virtual void run(ExecutionNode* previous= nullptr) override; + virtual qint64 getPriority() const override; void insertColorItem(QString color, int value); - virtual ExecutionNode* getCopy() const; + virtual ExecutionNode* getCopy() const override; protected: QList<ColorItem> m_colors; diff --git a/src/libparser/node/parenthesesnode.cpp b/src/libparser/node/parenthesesnode.cpp index 17db85a..53d4a40 100644 --- a/src/libparser/node/parenthesesnode.cpp +++ b/src/libparser/node/parenthesesnode.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "parenthesesnode.h" -ParenthesesNode::ParenthesesNode() : m_internalNode(nullptr) {} +ParenthesesNode::ParenthesesNode() : ExecutionNode("%1 [label=\"ParenthesesNode\"]"), m_internalNode(nullptr) {} void ParenthesesNode::setInternelNode(ExecutionNode* node) { m_internalNode= node; @@ -55,17 +55,7 @@ void ParenthesesNode::run(ExecutionNode* previous) m_nextNode= nullptr; } } -QString ParenthesesNode::toString(bool b) const -{ - if(b) - { - return QString("%1 [label=\"ParenthesesNode\"]").arg(m_id); - } - else - { - return m_id; - } -} + qint64 ParenthesesNode::getPriority() const { qint64 priority= 3; diff --git a/src/libparser/node/parenthesesnode.h b/src/libparser/node/parenthesesnode.h index 153dfc1..a12f3a6 100644 --- a/src/libparser/node/parenthesesnode.h +++ b/src/libparser/node/parenthesesnode.h @@ -34,10 +34,9 @@ public: virtual void run(ExecutionNode* previous= nullptr); void setInternelNode(ExecutionNode* node); - virtual QString toString(bool) const; - virtual qint64 getPriority() const; - virtual ExecutionNode* getCopy() const; - virtual void generateDotTree(QString&); + virtual qint64 getPriority() const override; + virtual ExecutionNode* getCopy() const override; + virtual void generateDotTree(QString&) override; private: ExecutionNode* m_internalNode; diff --git a/src/libparser/node/repeaternode.cpp b/src/libparser/node/repeaternode.cpp index 11a0728..3dd793f 100644 --- a/src/libparser/node/repeaternode.cpp +++ b/src/libparser/node/repeaternode.cpp @@ -61,7 +61,7 @@ std::vector<ExecutionNode*> makeCopy(std::vector<ExecutionNode*> cmds) return copy; } -RepeaterNode::RepeaterNode() {} +RepeaterNode::RepeaterNode() : ExecutionNode("%1 [label=\"RepeaterNode\"]") {} void RepeaterNode::run(ExecutionNode* previousNode) { @@ -130,11 +130,6 @@ void RepeaterNode::run(ExecutionNode* previousNode) m_startingNodes= startingNodes; } -QString RepeaterNode::toString(bool withLabel) const -{ - return withLabel ? QStringLiteral("%1 [label=\"RepeaterNode\"]").arg(m_id) : m_id; -} - qint64 RepeaterNode::getPriority() const { return 4; diff --git a/src/libparser/node/repeaternode.h b/src/libparser/node/repeaternode.h index f6c4c39..fd2e77f 100644 --- a/src/libparser/node/repeaternode.h +++ b/src/libparser/node/repeaternode.h @@ -29,7 +29,6 @@ class RepeaterNode : public ExecutionNode public: RepeaterNode(); void run(ExecutionNode* previous) override; - virtual QString toString(bool withLabel) const override; virtual qint64 getPriority() const override; virtual ExecutionNode* getCopy() const override; diff --git a/src/libparser/node/replacevaluenode.cpp b/src/libparser/node/replacevaluenode.cpp index 0ab5cfd..a9d3b51 100644 --- a/src/libparser/node/replacevaluenode.cpp +++ b/src/libparser/node/replacevaluenode.cpp @@ -23,7 +23,7 @@ #include <QDebug> #include <diceparser/parsingtoolbox.h> -ReplaceValueNode::ReplaceValueNode() : m_diceResult(new DiceResult) +ReplaceValueNode::ReplaceValueNode() : ExecutionNode("%1 [label=\"ReplaceValueNode\"]"), m_diceResult(new DiceResult) { m_result= m_diceResult; } @@ -79,18 +79,6 @@ void ReplaceValueNode::run(ExecutionNode* previous) } } -QString ReplaceValueNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"ReplaceValueNode\"]").arg(m_id); - } - else - { - return m_id; - } -} - qint64 ReplaceValueNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/replacevaluenode.h b/src/libparser/node/replacevaluenode.h index 36bdec2..434f93a 100644 --- a/src/libparser/node/replacevaluenode.h +++ b/src/libparser/node/replacevaluenode.h @@ -35,7 +35,6 @@ public: void run(ExecutionNode* previous= nullptr) override; - QString toString(bool withLabel) const override; qint64 getPriority() const override; ExecutionNode* getCopy() const override; diff --git a/src/libparser/node/rerolldicenode.cpp b/src/libparser/node/rerolldicenode.cpp index 7e5bda3..ec261c7 100644 --- a/src/libparser/node/rerolldicenode.cpp +++ b/src/libparser/node/rerolldicenode.cpp @@ -65,7 +65,7 @@ void RerollDiceNode::run(ExecutionNode* previous) maxVal= maxCondition->valueToScalar(); } - for(auto const& die : list1) + for(auto const& die : std::as_const(list1)) { if(!die) return; @@ -143,16 +143,10 @@ void RerollDiceNode::setValidatorList(ValidatorList* val) } QString RerollDiceNode::toString(bool wl) const { - if(wl) - { - return QString("%1 [label=\"RerollDiceNode validatior: %2\"]").arg(m_id, m_validatorList->toString()); - } - else - { - return m_id; - } - // return QString("RerollDiceNode [label=\"RerollDiceNode validatior:%1\""); + return wl ? QString("%1 [label=\"RerollDiceNode validatior: %2\"]").arg(m_id, m_validatorList->toString()) : + ExecutionNode::toString(wl); } + qint64 RerollDiceNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/roundnode.cpp b/src/libparser/node/roundnode.cpp index 8f825f5..1514f4a 100644 --- a/src/libparser/node/roundnode.cpp +++ b/src/libparser/node/roundnode.cpp @@ -2,7 +2,10 @@ #include <diceparser/parsingtoolbox.h> -RoundNode::RoundNode(Mode mode) : m_scalarResult(new ScalarResult), m_mode(mode) {} +RoundNode::RoundNode(Mode mode) + : ExecutionNode("%1 [label=\"RoundNode\"]"), m_scalarResult(new ScalarResult), m_mode(mode) +{ +} void RoundNode::run(ExecutionNode* previous) { @@ -38,12 +41,6 @@ void RoundNode::run(ExecutionNode* previous) m_result= m_scalarResult.get(); } -QString RoundNode::toString(bool withLabel) const -{ - - return withLabel ? QString("%1 [label=\"RoundNode\"]").arg(m_id) : m_id; -} - qint64 RoundNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/roundnode.h b/src/libparser/node/roundnode.h index a16e886..92b5166 100644 --- a/src/libparser/node/roundnode.h +++ b/src/libparser/node/roundnode.h @@ -18,7 +18,6 @@ public: // ExecutionNode interface public: void run(ExecutionNode* previous); - QString toString(bool withLabel) const; qint64 getPriority() const; ExecutionNode* getCopy() const; void setCommand(ExecutionNode* cmd); diff --git a/src/libparser/node/splitnode.cpp b/src/libparser/node/splitnode.cpp index ff5fc40..ec5d450 100644 --- a/src/libparser/node/splitnode.cpp +++ b/src/libparser/node/splitnode.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "splitnode.h" -SplitNode::SplitNode() : m_diceResult(new DiceResult()) +SplitNode::SplitNode() : ExecutionNode("%1 [label=\"SplitNode Node\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -58,17 +58,6 @@ void SplitNode::run(ExecutionNode* previous) } } -QString SplitNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"SplitNode Node\"]").arg(m_id); - } - else - { - return m_id; - } -} qint64 SplitNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/splitnode.h b/src/libparser/node/splitnode.h index 0ceeb00..f4923bb 100644 --- a/src/libparser/node/splitnode.h +++ b/src/libparser/node/splitnode.h @@ -33,7 +33,6 @@ class SplitNode : public ExecutionNode public: SplitNode(); void run(ExecutionNode* previous); - virtual QString toString(bool withLabel) const; virtual qint64 getPriority() const; virtual ExecutionNode* getCopy() const; diff --git a/src/libparser/node/startingnode.cpp b/src/libparser/node/startingnode.cpp index ef2c2ca..46d6a2f 100644 --- a/src/libparser/node/startingnode.cpp +++ b/src/libparser/node/startingnode.cpp @@ -20,7 +20,7 @@ #include "startingnode.h" #include <QDebug> -StartingNode::StartingNode() {} +StartingNode::StartingNode() : ExecutionNode("%1 [label=\"StartingNode\"]") {} void StartingNode::run(ExecutionNode*) { m_previousNode= nullptr; @@ -29,17 +29,6 @@ void StartingNode::run(ExecutionNode*) m_nextNode->run(this); }*/ } -QString StartingNode::toString(bool withlabel) const -{ - if(withlabel) - { - return QString("%1 [label=\"StartingNode\"]").arg(m_id); - } - else - { - return m_id; - } -} qint64 StartingNode::getPriority() const { diff --git a/src/libparser/node/startingnode.h b/src/libparser/node/startingnode.h index eea72a9..8147ce7 100644 --- a/src/libparser/node/startingnode.h +++ b/src/libparser/node/startingnode.h @@ -38,11 +38,6 @@ public: */ virtual void run(ExecutionNode*); /** - * @brief toString - * @return - */ - virtual QString toString(bool withlabel) const; - /** * @brief getPriority * @return */ diff --git a/src/libparser/node/switchcasenode.cpp b/src/libparser/node/switchcasenode.cpp index 61942ca..dd00cd6 100644 --- a/src/libparser/node/switchcasenode.cpp +++ b/src/libparser/node/switchcasenode.cpp @@ -24,7 +24,7 @@ #include <diceparser/parsingtoolbox.h> #include <memory> -SwitchCaseNode::SwitchCaseNode() : m_stringResult(new StringResult) +SwitchCaseNode::SwitchCaseNode() : ExecutionNode("%1 [label=\"SwitchCaseNode\"]"), m_stringResult(new StringResult) { m_result= m_stringResult; } @@ -131,18 +131,6 @@ void SwitchCaseNode::run(ExecutionNode* previous) return; } -QString SwitchCaseNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"SwitchCaseNode\"]").arg(m_id); - } - else - { - return m_id; - } -} - qint64 SwitchCaseNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/switchcasenode.h b/src/libparser/node/switchcasenode.h index a0f658d..1b7d282 100644 --- a/src/libparser/node/switchcasenode.h +++ b/src/libparser/node/switchcasenode.h @@ -35,7 +35,6 @@ public: void run(ExecutionNode* previous= nullptr) override; - QString toString(bool withLabel) const override; qint64 getPriority() const override; ExecutionNode* getCopy() const override; diff --git a/src/libparser/node/uniquenode.cpp b/src/libparser/node/uniquenode.cpp index e5ede7b..30d8567 100644 --- a/src/libparser/node/uniquenode.cpp +++ b/src/libparser/node/uniquenode.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "uniquenode.h" -UniqueNode::UniqueNode() : m_diceResult(new DiceResult()) +UniqueNode::UniqueNode() : ExecutionNode("%1 [label=\"UniqueNode Node\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -58,17 +58,6 @@ void UniqueNode::run(ExecutionNode* previous) } } -QString UniqueNode::toString(bool withLabel) const -{ - if(withLabel) - { - return QString("%1 [label=\"UniqueNode Node\"]").arg(m_id); - } - else - { - return m_id; - } -} qint64 UniqueNode::getPriority() const { qint64 priority= 0; diff --git a/src/libparser/node/uniquenode.h b/src/libparser/node/uniquenode.h index adab4fc..7ff70db 100644 --- a/src/libparser/node/uniquenode.h +++ b/src/libparser/node/uniquenode.h @@ -34,7 +34,6 @@ class UniqueNode : public ExecutionNode public: UniqueNode(); void run(ExecutionNode* previous); - virtual QString toString(bool withLabel) const; virtual qint64 getPriority() const; virtual ExecutionNode* getCopy() const; diff --git a/src/libparser/node/valueslistnode.cpp b/src/libparser/node/valueslistnode.cpp index 588dae2..b077778 100644 --- a/src/libparser/node/valueslistnode.cpp +++ b/src/libparser/node/valueslistnode.cpp @@ -2,7 +2,7 @@ #include "variablenode.h" -ValuesListNode::ValuesListNode() : m_diceResult(new DiceResult()) +ValuesListNode::ValuesListNode() : ExecutionNode("%1 [label=\"ValuesListNode list\"]"), m_diceResult(new DiceResult()) { m_result= m_diceResult; } @@ -39,17 +39,7 @@ ExecutionNode* ValuesListNode::getCopy() const } return node; } -QString ValuesListNode::toString(bool wl) const -{ - if(wl) - { - return QString("%1 [label=\"ValuesListNode list:\"]").arg(m_id); - } - else - { - return m_id; - } -} + qint64 ValuesListNode::getPriority() const { qint64 priority= 4; diff --git a/src/libparser/node/valueslistnode.h b/src/libparser/node/valueslistnode.h index e37babd..22b3723 100644 --- a/src/libparser/node/valueslistnode.h +++ b/src/libparser/node/valueslistnode.h @@ -10,10 +10,8 @@ public: ValuesListNode(); virtual void run(ExecutionNode* previous= nullptr) override; - virtual QString toString(bool) const override; virtual qint64 getPriority() const override; virtual ExecutionNode* getCopy() const override; - void insertValue(ExecutionNode*); private: diff --git a/src/libparser/parsingtoolbox.cpp b/src/libparser/parsingtoolbox.cpp index ec4693c..0c65ba0 100644 --- a/src/libparser/parsingtoolbox.cpp +++ b/src/libparser/parsingtoolbox.cpp @@ -1490,7 +1490,7 @@ bool ParsingToolBox::readRoundArguments(RoundNode* node, QString& source) if(startNode == nullptr || !instruction) { - m_errorMap.insert(Dice::ERROR_CODE::BAD_SYNTAXE, QObject::tr("Can read the parameter for Round Function.")); + m_errorMap.insert(Dice::ERROR_CODE::BAD_SYNTAXE, QObject::tr("Can read the parameter for Round Function.")); return false; } |