diff options
| author |   Renaud G <renaud@rolisteam.org> | 2015-10-11 15:49:38 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2015-10-11 15:49:38 +0200 |
| commit | 84691771b54365160f5b1d54033e00187dbbf043 (patch) | |
| tree | dd17a1436659c48993bfdb846864dded708c411e /diceparser.h | |
| parent | a220f89b6f30716883223292b0986c0dc9d941bc (diff) | |
| parent | 114cd6a7990c44f0610dbf2080f101d0edbbaa57 (diff) | |
| download | OneRoll-84691771b54365160f5b1d54033e00187dbbf043.tar.gz OneRoll-84691771b54365160f5b1d54033e00187dbbf043.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceparser.h')
| -rw-r--r-- | diceparser.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/diceparser.h b/diceparser.h index 3eb55f1..6b9056f 100644 --- a/diceparser.h +++ b/diceparser.h @@ -191,6 +191,19 @@ public: * @param l the path. */ void setPathToHelp(QString l); + /** + * @brief getAllStringResult + * @return + */ + QStringList getAllStringResult(bool& hasAlias); + /** + * @brief getAllDiceResult + * @param hasAlias + * @return + */ + QStringList getAllDiceResult(bool& hasAlias); + + bool hasSeparator()const; private: /** @@ -289,6 +302,7 @@ private: QStringList* m_commandList; QMap<ExecutionNode::ERROR_CODE,QString> m_errorMap; + QMap<ExecutionNode::ERROR_CODE,QString> m_warningMap; ExecutionNode* m_start; @@ -296,6 +310,7 @@ private: QString m_command; ParsingToolBox* m_parsingToolbox; QString m_helpPath; + bool m_currentTreeHasSeparator; }; #endif // DICEPARSER_H |