-add group into project and use proper variable.

2 files changed, 7 insertions, 5 deletions

diff --git a/diceparser.cpp b/diceparser.cpp
index 27f2a2c..42f46ac 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -171,17 +171,17 @@ bool DiceParser::parseLine(QString str)
 
     str = convertAlias(str);
     m_command = str;
-    bool keepParsing = readExpression(m_command,newNode);
+    bool keepParsing = readExpression(str,newNode);
 
     if(keepParsing)
     {
         m_current->setNextNode(newNode);
         m_current = getLatestNode(m_current);
-        keepParsing =!m_command.isEmpty();
+        keepParsing =!str.isEmpty();
         if(keepParsing)
         {
             // keepParsing =
-            readOperator(m_command,m_current);
+            readOperator(str,m_current);
             m_current = getLatestNode(m_current);
         }
     }
diff --git a/diceparser.pri b/diceparser.pri
index 1a1a35d..bf6c6b8 100644
--- a/diceparser.pri
+++ b/diceparser.pri
@@ -18,7 +18,8 @@ SOURCES += $$PWD/diceparser.cpp \
     $$PWD/dicealias.cpp \
     $$PWD/operationcondition.cpp \
     $$PWD/node/stringnode.cpp \
-    $$PWD/node/filternode.cpp
+    $$PWD/node/filternode.cpp \
+    $$PWD/node/groupnode.cpp \
 
 
 HEADERS += \
@@ -37,7 +38,8 @@ HEADERS += \
     $$PWD/dicealias.h \
     $$PWD/operationcondition.h \
     $$PWD/node/stringnode.h \
-    $$PWD/node/filternode.h
+    $$PWD/node/filternode.h\
+    $$PWD/node/groupnode.h
 
 
 HEADERS += \