aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--diceParser.pro18
-rw-r--r--main.cpp5
-rw-r--r--node/countexecutenode.cpp2
-rw-r--r--node/countexecutenode.h2
-rw-r--r--node/dicerollernode.h2
-rw-r--r--node/executionnode.h2
-rw-r--r--node/explosedicenode.h2
-rw-r--r--node/helpnode.h2
-rw-r--r--node/jumpbackwardnode.h2
-rw-r--r--node/keepdiceexecnode.h2
-rw-r--r--node/node.pri6
-rw-r--r--node/numbernode.h2
-rw-r--r--node/rerolldicenode.h2
-rw-r--r--node/scalaroperatornode.cpp2
-rw-r--r--node/scalaroperatornode.h2
-rw-r--r--node/sortresult.h2
16 files changed, 29 insertions, 26 deletions
diff --git a/diceParser.pro b/diceParser.pro
index b3ed2a0..2d72fcb 100644
--- a/diceParser.pro
+++ b/diceParser.pro
@@ -35,28 +35,28 @@ DEFINES+= HAVE_GUI
SOURCES += main.cpp \
diceparser.cpp \
- diceresult.cpp \
+ result/diceresult.cpp \
range.cpp \
booleancondition.cpp \
validator.cpp \
die.cpp \
- result.cpp \
- scalarresult.cpp \
+ result/result.cpp \
+ result/scalarresult.cpp \
parsingtoolbox.cpp \
- stringresult.cpp
+ result/stringresult.cpp
HEADERS += \
diceparser.h \
- diceresult.h \
+ result/diceresult.h \
range.h \
booleancondition.h \
validator.h \
die.h \
- result.h \
- scalarresult.h \
- parsingtoolbox.h \
- stringresult.h
+ result/result.h \
+ result/scalarresult.h \
+ result/parsingtoolbox.h \
+ result/stringresult.h
OTHER_FILES += README.md \
HelpMe.md
diff --git a/main.cpp b/main.cpp
index 126e788..986bc2c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,8 @@ int main(int argc, char *argv[])
QStringList commands;
- commands << "10d10c[>=6]-@c[=1]"
+ commands << "1L[cheminée,chocolat,épée,arc,chute de pierre]" ;
+ /*<< "10d10c[>=6]-@c[=1]"
<< "10d10c[>=6]-@c[=1]-@c[=1]"
<< "10d10c[>6]+@c[=10]"
<< "1+1D10"
@@ -68,7 +69,7 @@ int main(int argc, char *argv[])
<< "100/8"
<< "100*3*8"
<< "help"
- << "100*3*8";
+ << "100*3*8";*/
if(argc>1)
{
diff --git a/node/countexecutenode.cpp b/node/countexecutenode.cpp
index d0084a3..281fc80 100644
--- a/node/countexecutenode.cpp
+++ b/node/countexecutenode.cpp
@@ -1,5 +1,5 @@
#include "countexecutenode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
diff --git a/node/countexecutenode.h b/node/countexecutenode.h
index dc90f74..c7ecdfd 100644
--- a/node/countexecutenode.h
+++ b/node/countexecutenode.h
@@ -4,7 +4,7 @@
#include "executionnode.h"
#include "validator.h"
-#include "scalarresult.h"
+#include "result/scalarresult.h"
/**
* @brief The CountExecuteNode class
diff --git a/node/dicerollernode.h b/node/dicerollernode.h
index 67d4c2d..472a5d8 100644
--- a/node/dicerollernode.h
+++ b/node/dicerollernode.h
@@ -6,7 +6,7 @@
#include <QMutex>
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
class DiceRoller : public QRunnable
{
public:
diff --git a/node/executionnode.h b/node/executionnode.h
index 2a82470..e0fc563 100644
--- a/node/executionnode.h
+++ b/node/executionnode.h
@@ -1,7 +1,7 @@
#ifndef EXECUTIONNODE_H
#define EXECUTIONNODE_H
-#include "result.h"
+#include "result/result.h"
#include <QDebug>
/**
* @brief The ExecutionNode class
diff --git a/node/explosedicenode.h b/node/explosedicenode.h
index a9238b8..b00af1a 100644
--- a/node/explosedicenode.h
+++ b/node/explosedicenode.h
@@ -2,7 +2,7 @@
#define EXPLOSEDICENODE_H
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
#include "validator.h"
#include <QDebug>
diff --git a/node/helpnode.h b/node/helpnode.h
index 27f38b3..3a949d9 100644
--- a/node/helpnode.h
+++ b/node/helpnode.h
@@ -5,7 +5,7 @@
#include <QObject>
#include <QString>
-#include "stringresult.h"
+#include "result/stringresult.h"
/**
* @brief The HelpNode class
diff --git a/node/jumpbackwardnode.h b/node/jumpbackwardnode.h
index ba25c7b..4ea3d11 100644
--- a/node/jumpbackwardnode.h
+++ b/node/jumpbackwardnode.h
@@ -2,7 +2,7 @@
#define JUMPBACKWARDNODE_H
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
class JumpBackwardNode : public ExecutionNode
{
public:
diff --git a/node/keepdiceexecnode.h b/node/keepdiceexecnode.h
index 615b70c..96e66c4 100644
--- a/node/keepdiceexecnode.h
+++ b/node/keepdiceexecnode.h
@@ -2,7 +2,7 @@
#define KEEPDICEEXECNODE_H
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
class KeepDiceExecNode : public ExecutionNode
{
diff --git a/node/node.pri b/node/node.pri
index d65d3e7..7ed357c 100644
--- a/node/node.pri
+++ b/node/node.pri
@@ -11,7 +11,8 @@ HEADERS += \
node/explosedicenode.h \
node/parenthesesnode.h \
node/helpnode.h \
- $$PWD/jumpbackwardnode.h
+ $$PWD/jumpbackwardnode.h \
+ node/listsetrollnode.h
SOURCES += \
node/dicerollernode.cpp \
@@ -26,4 +27,5 @@ SOURCES += \
node/explosedicenode.cpp \
node/parenthesesnode.cpp \
node/helpnode.cpp \
- $$PWD/jumpbackwardnode.cpp
+ $$PWD/jumpbackwardnode.cpp \
+ node/listsetrollnode.cpp
diff --git a/node/numbernode.h b/node/numbernode.h
index 49d2881..f653595 100644
--- a/node/numbernode.h
+++ b/node/numbernode.h
@@ -2,7 +2,7 @@
#define NUMBERNODE_H
#include "node/executionnode.h"
-#include "scalarresult.h"
+#include "result/scalarresult.h"
class NumberNode : public ExecutionNode
{
diff --git a/node/rerolldicenode.h b/node/rerolldicenode.h
index fcdd5df..4674a3e 100644
--- a/node/rerolldicenode.h
+++ b/node/rerolldicenode.h
@@ -3,7 +3,7 @@
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
#include "validator.h"
/**
* @brief The RerollDiceNode class reroll dice given a condition and replace(or add) the result.
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index 67fc344..95fd077 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -1,7 +1,7 @@
#include "scalaroperatornode.h"
#include <QDebug>
-#include "diceresult.h"
+#include "result/diceresult.h"
ScalarOperatorNode::ScalarOperatorNode()
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index 2b4f68a..a67e296 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -5,7 +5,7 @@
#include <QChar>
#include "executionnode.h"
-#include "scalarresult.h"
+#include "result/scalarresult.h"
class ScalarOperatorNode : public ExecutionNode
{
diff --git a/node/sortresult.h b/node/sortresult.h
index 339dcbe..8ce03a2 100644
--- a/node/sortresult.h
+++ b/node/sortresult.h
@@ -2,7 +2,7 @@
#define SORTRESULT_H
#include "executionnode.h"
-#include "diceresult.h"
+#include "result/diceresult.h"
class SortResultNode : public ExecutionNode
{