diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-04-14 05:30:41 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-04-14 05:30:41 +0200 |
| commit | 711d11ae25c7aa86ae675fd849c7240c9e2cf298 (patch) | |
| tree | 9b1e409781c8d98de6131aa219d30ab1fe54eb81 /parsingtoolbox.h | |
| parent | 8122ac01552c631b14ea096117c775ff6509ea24 (diff) | |
| parent | 9311cabe959739e74b62e46563bace3ebc63e15d (diff) | |
| download | OneRoll-711d11ae25c7aa86ae675fd849c7240c9e2cf298.tar.gz OneRoll-711d11ae25c7aa86ae675fd849c7240c9e2cf298.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'parsingtoolbox.h')
| -rw-r--r-- | parsingtoolbox.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/parsingtoolbox.h b/parsingtoolbox.h index 09ab592..3046570 100644 --- a/parsingtoolbox.h +++ b/parsingtoolbox.h @@ -95,7 +95,13 @@ public: */ static bool readNumber(QString& str, qint64& myNumber); - + /** + * @brief readVariable + * @param str + * @param myNumber + * @return + */ + static bool readVariable(QString& str,qint64& myNumber); /** * @brief readOpenParentheses * @param str @@ -154,11 +160,19 @@ public: bool readArithmeticOperator(QString& str, ScalarOperatorNode::ArithmeticOperator& op); static void readPainterParameter(PainterNode *painter, QString &str); + + static QHash<QString, QString> *getVariableHash(); + static void setVariableHash(QHash<QString, QString> *variableHash); + private: - QMap<QString,BooleanCondition::LogicOperator>* m_logicOp; - QMap<QString,CompositeValidator::LogicOperation>* m_logicOperation; + + QMap<QString,BooleanCondition::LogicOperator>* m_logicOp; + QMap<QString,CompositeValidator::LogicOperation>* m_logicOperation; QMap<QString,OperationCondition::ConditionOperator>* m_conditionOperation; QHash<QString,ScalarOperatorNode::ArithmeticOperator>* m_arithmeticOperation; + + + static QHash<QString,QString>* m_variableHash; }; #endif // PARSINGTOOLBOX_H |