diff options
Diffstat (limited to 'src/libparser/include')
| -rw-r--r-- | src/libparser/include/diceparser/diceparserhelper.h | 4 | ||||
| -rw-r--r-- | src/libparser/include/diceparser/parsingtoolbox.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/libparser/include/diceparser/diceparserhelper.h b/src/libparser/include/diceparser/diceparserhelper.h index 6190df2..910b782 100644 --- a/src/libparser/include/diceparser/diceparserhelper.h +++ b/src/libparser/include/diceparser/diceparserhelper.h @@ -31,7 +31,9 @@ enum class ERROR_CODE : int UNEXPECTED_CHARACTER, NO_PREVIOUS_ERROR, NO_VALID_RESULT, - SCALAR_RESULT_EXPECTED + SCALAR_RESULT_EXPECTED, + NO_VALIDATOR_LIST, + NO_INTERNAL_INSTRUCTION }; /** diff --git a/src/libparser/include/diceparser/parsingtoolbox.h b/src/libparser/include/diceparser/parsingtoolbox.h index 207b878..8cd9c25 100644 --- a/src/libparser/include/diceparser/parsingtoolbox.h +++ b/src/libparser/include/diceparser/parsingtoolbox.h @@ -132,7 +132,8 @@ public: void clearUp(); // Build execution tree - DiceRollerNode* getDiceRollerNode(ExecutionNode* previous); + template <typename T> + T* getNode(ExecutionNode* previous); DiceRollerNode* addRollDiceNode(qint64 faces, ExecutionNode*); ExplodeDiceNode* addExplodeDiceNode(qint64 faces, ExecutionNode* previous); Dice::CONDITION_STATE isValidValidator(ExecutionNode* previous, ValidatorList* val); @@ -222,7 +223,7 @@ public: static QString replaceVariableToValue(const QString& source, QStringList values, QMap<Dice::ERROR_CODE, QString>& errorMap); static QString replacePlaceHolderToValue(const QString& source, const QList<ExportedDiceResult>& list, - bool removeUnhighlighted, + bool removeUnhighlighted, QList<std::pair<int, QStringList>> inst2Result, std::function<QString(const QString&, const QString&, bool)> colorize); static SubtituteInfo readVariableFromString(const QString& source, int& start); static SubtituteInfo readPlaceHolderFromString(const QString& source, int& start); |