From 53d4f802d3e9327c45c5e437bcfea474e6ad943a Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 18 Oct 2017 18:15:32 +0200
Subject: add group

---
 cli/CMakeLists.txt | 65 +++++++++++++++++++++++++++---------------------------
 cli/main.cpp       |  1 +
 2 files changed, 34 insertions(+), 32 deletions(-)

(limited to 'cli')

diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 150e90e..58c28cf 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -59,40 +59,41 @@ if(Qt5Core_FOUND)
 endif()
 
 SET( dice_sources 
-   ../diceparser.cpp
-   ../range.cpp
-   ../booleancondition.cpp
-   ../validator.cpp
-   ../compositevalidator.cpp
-   ../operationcondition.cpp
-   ../die.cpp
-   ../parsingtoolbox.cpp
-   ../dicealias.cpp
-   ../result/result.cpp
-   ../result/scalarresult.cpp
-   ../result/stringresult.cpp
-   ../result/diceresult.cpp
-   ../node/countexecutenode.cpp
-   ../node/dicerollernode.cpp
-   ../node/executionnode.cpp
-   ../node/explosedicenode.cpp
-   ../node/helpnode.cpp
-   ../node/mergenode.cpp
-   ../node/jumpbackwardnode.cpp
-   ../node/keepdiceexecnode.cpp
-   ../node/listaliasnode.cpp
-   ../node/listsetrollnode.cpp
-   ../node/numbernode.cpp
-   ../node/parenthesesnode.cpp
-   ../node/paintnode.cpp
-   ../node/rerolldicenode.cpp
-   ../node/scalaroperatornode.cpp
-   ../node/sortresult.cpp
-   ../node/startingnode.cpp
-   ../node/filternode.cpp
-   ../node/stringnode.cpp
+    ../diceparser.cpp
+    ../range.cpp
+    ../booleancondition.cpp
+    ../validator.cpp
+    ../compositevalidator.cpp
+    ../operationcondition.cpp
+    ../die.cpp
+    ../parsingtoolbox.cpp
+    ../dicealias.cpp
+    ../result/result.cpp
+    ../result/scalarresult.cpp
+    ../result/stringresult.cpp
+    ../result/diceresult.cpp
+    ../node/countexecutenode.cpp
+    ../node/dicerollernode.cpp
+    ../node/executionnode.cpp
+    ../node/explosedicenode.cpp
+    ../node/helpnode.cpp
+    ../node/mergenode.cpp
+    ../node/jumpbackwardnode.cpp
+    ../node/keepdiceexecnode.cpp
+    ../node/listaliasnode.cpp
+    ../node/listsetrollnode.cpp
+    ../node/numbernode.cpp
+    ../node/parenthesesnode.cpp
+    ../node/paintnode.cpp
+    ../node/rerolldicenode.cpp
+    ../node/scalaroperatornode.cpp
+    ../node/sortresult.cpp
+    ../node/startingnode.cpp
+    ../node/filternode.cpp
+    ../node/stringnode.cpp
     ../node/ifnode.cpp
     ../node/splitnode.cpp
+    ../node/groupnode.cpp
     main.cpp
     ../highlightdice.cpp
 )
diff --git a/cli/main.cpp b/cli/main.cpp
index b871df8..bb5d104 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -325,6 +325,7 @@ void startDiceParsing(QStringList& cmds,QString& treeFile,bool highlight)
         out << parser->humanReadableError()<< "\n";;
     }
     }
+    delete parser;
 }
 
 void usage()
-- 
cgit v1.2.3-70-g09d2