aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2020-04-17 19:58:30 +0200
committerRenaud G <renaud@rolisteam.org>2020-04-17 19:58:30 +0200
commitbfce7e0dca2a05f8fecc7b4881683bf2c25a3ae3 (patch)
tree69b88b85e0a09a4f8909fe4894a05800bc096cbd
parent06b763bde2b7f4983277dc2b057889d6fb875222 (diff)
downloadOneRoll-bfce7e0dca2a05f8fecc7b4881683bf2c25a3ae3.tar.gz
OneRoll-bfce7e0dca2a05f8fecc7b4881683bf2c25a3ae3.zip
Fix compilation on master
Add API to access aliases list.
-rw-r--r--diceparser.cpp15
-rw-r--r--diceparser.pri4
-rw-r--r--include/diceparser.h3
-rw-r--r--include/parsingtoolbox.h2
-rw-r--r--parsingtoolbox.cpp11
5 files changed, 35 insertions, 0 deletions
diff --git a/diceparser.cpp b/diceparser.cpp
index 3541e45..9ef36a8 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -42,6 +42,16 @@ const QList<DiceAlias*>& DiceParser::getAliases() const
{
return m_parsingToolbox->getAliases();
}
+
+QList<DiceAlias*>* DiceParser::aliases() const
+{
+ return m_parsingToolbox->aliases();
+}
+
+void DiceParser::cleanAliases()
+{
+ m_parsingToolbox->cleanUpAliases();
+}
void DiceParser::insertAlias(DiceAlias* dice, int i)
{
m_parsingToolbox->insertAlias(dice, i);
@@ -80,6 +90,11 @@ bool DiceParser::parseLine(QString str, bool allowAlias)
return value;
}
+QString DiceParser::convertAlias(const QString& cmd) const
+{
+ return m_parsingToolbox->convertAlias(cmd);
+}
+
void DiceParser::start()
{
for(auto start : m_parsingToolbox->getStartNodes())
diff --git a/diceparser.pri b/diceparser.pri
index 082feb2..3c63a84 100644
--- a/diceparser.pri
+++ b/diceparser.pri
@@ -42,11 +42,13 @@ SOURCES += $$PWD/diceparser.cpp \
$$PWD/node/splitnode.cpp \
$$PWD/node/valueslistnode.cpp \
$$PWD/node/uniquenode.cpp \
+ $$PWD/node/repeatnode.cpp \
$$PWD/node/listsetrollnode.cpp\
$$PWD/node/variablenode.cpp\
$$PWD/node/bind.cpp\
$$PWD/node/occurencecountnode.cpp\
$$PWD/diceroller.cpp\
+ $$PWD/validatorlist.cpp\
$$PWD/qmltypesregister.cpp
@@ -89,11 +91,13 @@ HEADERS += \
$$PWD/node/ifnode.h \
$$PWD/node/bind.h\
$$PWD/node/splitnode.h \
+ $$PWD/node/repeatnode.h \
$$PWD/node/uniquenode.h \
$$PWD/node/paintnode.h \
$$PWD/node/listsetrollnode.h \
$$PWD/node/occurencecountnode.h\
$$PWD/diceroller.h \
+ $$PWD/validatorlist.cpp\
$$PWD/include/diceparserhelper.h \
$$PWD/qmltypesregister.h
diff --git a/include/diceparser.h b/include/diceparser.h
index 95f033f..3f642e0 100644
--- a/include/diceparser.h
+++ b/include/diceparser.h
@@ -69,6 +69,7 @@ public:
* @return bool every thing is fine or not
*/
bool parseLine(QString str, bool allowAlias= true);
+ QString convertAlias(const QString& cmd) const;
/**
* @brief getStartNodeCount
* @return
@@ -134,6 +135,8 @@ public:
* @return
*/
const QList<DiceAlias*>& getAliases() const;
+ QList<DiceAlias*>* aliases() const;
+ void cleanAliases();
/**
* @brief insertAlias
*/
diff --git a/include/parsingtoolbox.h b/include/parsingtoolbox.h
index bb2ba4d..f8e88af 100644
--- a/include/parsingtoolbox.h
+++ b/include/parsingtoolbox.h
@@ -374,6 +374,8 @@ public:
void insertAlias(DiceAlias* dice, int i);
const QList<DiceAlias*>& getAliases() const;
+ QList<DiceAlias*>* aliases();
+ void cleanUpAliases();
private:
QMap<QString, BooleanCondition::LogicOperator> m_logicOp;
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index fa72f6a..1854abe 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -121,6 +121,12 @@ void ParsingToolBox::clearUp()
m_errorMap.clear();
m_comment= QString("");
}
+
+void ParsingToolBox::cleanUpAliases()
+{
+ m_aliasList.clear();
+}
+
ExecutionNode* ParsingToolBox::addSort(ExecutionNode* e, bool b)
{
SortResultNode* nodeSort= new SortResultNode();
@@ -1862,6 +1868,11 @@ const QList<DiceAlias*>& ParsingToolBox::getAliases() const
return m_aliasList;
}
+QList<DiceAlias*>* ParsingToolBox::aliases()
+{
+ return &m_aliasList;
+}
+
std::vector<ExecutionNode*> ParsingToolBox::readInstructionList(QString& str, bool global)
{
if(str.isEmpty())