diff options
| author |   Renaud G <renaud@rolisteam.org> | 2016-09-25 10:04:28 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2016-09-25 10:04:28 +0200 |
| commit | fac053c3aacc0e2ede8a85ff41e27eed1c360f6f (patch) | |
| tree | c91ff176e60f1f6e634107b4e7a7282e831975ee /diceparser.cpp | |
| parent | dbb57d52d351e340ce69fccaedbdf758b04ed8fe (diff) | |
| parent | e225f2edfd365d1709df2cb5bb2f752ec8d82c1c (diff) | |
| download | OneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.tar.gz OneRoll-fac053c3aacc0e2ede8a85ff41e27eed1c360f6f.zip | |
Merge branch 'master' of github.com:Rolisteam/DiceParser
Diffstat (limited to 'diceparser.cpp')
| -rw-r--r-- | diceparser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/diceparser.cpp b/diceparser.cpp index 4575bf5..b6081a7 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -221,7 +221,10 @@ bool DiceParser::readExpression(QString& str,ExecutionNode* & node) node = operandNode; operandNode= getLatestNode(operandNode); - while(readOperator(str,operandNode)); + while(readOperator(str,operandNode)) + { + operandNode= getLatestNode(operandNode); + }; } else if(readCommand(str,operandNode)) { @@ -885,7 +888,6 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//, break; case Count: { - //Validator* validator = m_parsingToolbox->readValidator(str); Validator* validator = m_parsingToolbox->readCompositeValidator(str); if(NULL!=validator) { @@ -979,8 +981,8 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//, Validator* validator = m_parsingToolbox->readCompositeValidator(str); if(NULL!=validator) { - ExecutionNode* trueNode; - ExecutionNode* falseNode; + ExecutionNode* trueNode = NULL; + ExecutionNode* falseNode = NULL; if(readIfInstruction(str,trueNode,falseNode)) { nodeif->setInstructionTrue(trueNode); |