Merge pull request #37 from Rolisteam/stringParsing

String parsing

1 files changed, 6 insertions, 4 deletions

diff --git a/cli/main.cpp b/cli/main.cpp
index e261d63..2f0d8e4 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -352,18 +352,20 @@ int startDiceParsing(QStringList& cmds, QString& treeFile, bool withColor, EXPOR
                 bool ok;
                 QStringList allStringlist= parser.getAllStringResult(ok);
                 QString stringResult= allStringlist.join(" ; ");
+
                 stringResult.replace("%1", scalarText);
                 stringResult.replace("%2", listOfDiceResult.join(",").trimmed());
                 stringResult.replace("%3", lastScalarText);
                 stringResult.replace("\\n", "\n");
 
-                int i= strLst.size();
-                for(auto it= strLst.rbegin(); it != strLst.rend(); ++it)
+                stringResult= ParsingToolBox::replaceVariableToValue(stringResult, strLst);
+                /*for(auto it= strLst.rbegin(); it != strLst.rend(); ++it)
                 {
                     stringResult.replace(QStringLiteral("$%1").arg(i), (*it));
                     --i;
-                }
-                i= listFull.size();
+                }*/
+
+                int i= strLst.size();
                 for(auto it= strLst.rbegin(); it != strLst.rend(); ++it)
                 {
                     stringResult.replace(QStringLiteral("µ%1").arg(i), (*it));