aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/operationcondition.h
diff options
context:
space:
mode:
authorrenaud guezennec <renaud@rolisteam.org>2019-07-29 20:35:52 +0000
committerrenaud guezennec <renaud@rolisteam.org>2019-07-29 20:35:52 +0000
commit1a902d383eef1e042d4462cd07b9384fcdf4d118 (patch)
tree766b8ab720fa5da11730d2fc2388f51b9d14de49 /operationcondition.h
parentf5906125576a8323a731c9456ce3dfc53b67ef59 (diff)
parent0d4b68221bda594cc695d216dfa21306ddb69c85 (diff)
downloadOneRoll-1a902d383eef1e042d4462cd07b9384fcdf4d118.tar.gz
OneRoll-1a902d383eef1e042d4462cd07b9384fcdf4d118.zip
Merge branch 'liberation' into 'master'
Add fuzzer on the DiceParser See merge request kde/rolisteam-diceparser!2
Diffstat (limited to 'operationcondition.h')
-rw-r--r--operationcondition.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/operationcondition.h b/operationcondition.h
index 86562e6..002a669 100644
--- a/operationcondition.h
+++ b/operationcondition.h
@@ -34,27 +34,29 @@ public:
Modulo
};
OperationCondition();
- virtual ~OperationCondition();
+ virtual ~OperationCondition() override;
- virtual qint64 hasValid(Die* b, bool recursive, bool unhighlight= false) const;
+ virtual qint64 hasValid(Die* b, bool recursive, bool unhighlight= false) const override;
void setOperator(ConditionOperator m);
// void setValue(qint64);
void setValueNode(ExecutionNode* node);
- QString toString();
+ QString toString() override;
- virtual bool isValidRangeSize(std::pair<qint64, qint64> range) const;
+ virtual Dice::CONDITION_STATE isValidRangeSize(const std::pair<qint64, qint64>& range) const override;
BooleanCondition* getBoolean() const;
void setBoolean(BooleanCondition* boolean);
- virtual Validator* getCopy() const;
+ virtual Validator* getCopy() const override;
+
+ const std::set<qint64>& getPossibleValues(const std::pair<qint64, qint64>& range) override;
private:
qint64 valueToScalar() const;
private:
- ConditionOperator m_operator;
+ ConditionOperator m_operator= Modulo;
BooleanCondition* m_boolean= nullptr;
// qint64 m_value;
ExecutionNode* m_value= nullptr;