aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceparser.cpp
diff options
context:
space:
mode:
authorRenaud Guezennec <renaud.guezennec@softbankrobotics.com>2017-11-28 11:26:09 +0100
committerRenaud Guezennec <renaud.guezennec@softbankrobotics.com>2017-11-28 11:26:09 +0100
commitf0ade121f9cef3b39c41816536f4e400f43dd4af (patch)
treedb484da8c9bf02ecdf86e117def96f555191787b /diceparser.cpp
parent4516fab0081b0db73b7401816a521453ab77ecc6 (diff)
downloadOneRoll-f0ade121f9cef3b39c41816536f4e400f43dd4af.tar.gz
OneRoll-f0ade121f9cef3b39c41816536f4e400f43dd4af.zip
-fix copy of if operator
Compare method was not shared.
Diffstat (limited to 'diceparser.cpp')
-rw-r--r--diceparser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/diceparser.cpp b/diceparser.cpp
index d9871e2..44e69b4 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -282,6 +282,7 @@ bool DiceParser::readOptionFromNull(QString& str,ExecutionNode* & node)
if(readOption(str,&nodePrevious))
{
auto nodeNext = nodePrevious.getNextNode();
+ nodePrevious.setNextNode(nullptr);
node = nodeNext;
return true;
}
@@ -301,7 +302,7 @@ bool DiceParser::readNode(QString& str,ExecutionNode* & node)
return false;
}
-void DiceParser::Start()
+void DiceParser::start()
{
for(auto start : m_startNodes)
{
@@ -1176,7 +1177,7 @@ bool DiceParser::readBlocInstruction(QString& str,ExecutionNode*& resultnode)
if(str.startsWith('{'))
{
str=str.remove(0,1);
- ExecutionNode* node;
+ ExecutionNode* node = nullptr;
Die::ArithmeticOperator op;
ScalarOperatorNode* scalarNode = nullptr;
if(m_parsingToolbox->readArithmeticOperator(str,op))