aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2020-08-01 14:05:12 +0200
committerRenaud G <renaud@rolisteam.org>2020-08-01 20:29:20 +0200
commitc35ae0246f09432d4ab54d6216fcab2167318967 (patch)
tree9464593530f450780b46639de8d4013e0abf7bed /parsingtoolbox.cpp
parentfc07b874ed64b065eb59b57485bc6a3379700728 (diff)
downloadOneRoll-c35ae0246f09432d4ab54d6216fcab2167318967.tar.gz
OneRoll-c35ae0246f09432d4ab54d6216fcab2167318967.zip
Group Operator can display complex output
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index ffa5699..de7fe05 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -1508,10 +1508,11 @@ bool ParsingToolBox::readOption(QString& str, ExecutionNode* previous) //,
break;
case Group:
{
+ bool stringResult= readStringResultParameter(str);
qint64 groupNumber= 0;
if(readNumber(str, groupNumber))
{
- GroupNode* groupNode= new GroupNode();
+ GroupNode* groupNode= new GroupNode(stringResult);
groupNode->setGroupValue(groupNumber);
previous->setNextNode(groupNode);
node= groupNode;
@@ -1524,6 +1525,15 @@ bool ParsingToolBox::readOption(QString& str, ExecutionNode* previous) //,
}
return found;
}
+bool ParsingToolBox::readStringResultParameter(QString& str)
+{
+ if(str.startsWith("s"))
+ {
+ str.remove(0, 1);
+ return true;
+ }
+ return false;
+}
bool ParsingToolBox::readIfInstruction(QString& str, ExecutionNode*& trueNode, ExecutionNode*& falseNode)
{
if(readBlocInstruction(str, trueNode))