diff options
| -rw-r--r-- | diceparser.cpp | 6 | ||||
| -rw-r--r-- | diceparser.h | 26 |
2 files changed, 21 insertions, 11 deletions
diff --git a/diceparser.cpp b/diceparser.cpp index 56fa72e..1e23c6b 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -63,7 +63,7 @@ DiceParser::DiceParser() m_aliasMap = new QMap<QString,QString>; m_aliasMap->insert("l5r","D10k"); - m_aliasMap->insert("l5R","D10e10k"); + m_aliasMap->insert("l5R","D10K"); m_aliasMap->insert("nwod","D10e10c[>7]"); m_aliasMap->insert("nwod","D10e10c[>7]"); @@ -72,8 +72,8 @@ DiceParser::DiceParser() m_commandList = new QStringList(); - m_commandList->append("help"); - m_commandList->append("la"); + m_commandList->append(tr("help")); + m_commandList->append(tr("la")); } diff --git a/diceparser.h b/diceparser.h index c4f9f6b..65a8b03 100644 --- a/diceparser.h +++ b/diceparser.h @@ -38,12 +38,16 @@ * * The grammar is something like this: * - * Command =: Expression | ScalarOperator Expression + * Line =: Command | Command;Command + * Command =: Expression | ScalarOperator Expression | ScalarOperator NodeAction Expression * Expression =: number | number Dice | Command - * Dice =: DiceOperator Number(faces) - * DiceOperator =: D + * Dice =: DiceOperator Number(faces) | DiceOperator List + * List =: [Word,Number,',']+ + * NodeAction =: @ + * DiceOperator =: [D,L] * ScalarOperator =: [x,-,*,x,/] * number =: [0-9]+ + * Word =: [A-z]+ * */ @@ -64,14 +68,13 @@ public: * @brief The DiceSymbol enum */ enum NodeAction {JumpBackward}; - - - /** * @brief The OptionOperator enum gathering all options availables for result. */ enum OptionOperator {KeepAndExplose,Keep,Reroll,Explosing,Sort,Count,RerollAndAdd}; + enum CommandOperator {}; + /** * @brief DiceParser default constructor */ @@ -95,9 +98,16 @@ public: * @brief displayResult */ QString displayResult(); - + /** + * @brief readExpression + * @param str + * @param node + * @return + */ bool readExpression(QString& str,ExecutionNode* & node); - + /** + * @brief displayDotTree + */ void displayDotTree(); private: |