aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2017-12-15 10:37:10 +0100
committerRenaud G <renaud@rolisteam.org>2018-01-11 18:37:00 +0100
commited08178a88b61191a7be8de7bc97d31888aadc1b (patch)
treee40358f2da7efe91ba797ae3568b79567dad34bc /parsingtoolbox.cpp
parent592c8271364fee6471be333dccbcf30cad9e3655 (diff)
downloadOneRoll-ed08178a88b61191a7be8de7bc97d31888aadc1b.tar.gz
OneRoll-ed08178a88b61191a7be8de7bc97d31888aadc1b.zip
fix readDynamicVariable
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index 5da06fc..ea74a00 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -350,9 +350,8 @@ bool ParsingToolBox::readDynamicVariable(QString& str, qint64& index)
return false;
if(str.startsWith('$'))
{
- str=str.remove(0,1);
QString number;
- int i=0;
+ int i=1;
while(i<str.length() && (str[i].isNumber()))
{
number+=str[i];
@@ -363,7 +362,7 @@ bool ParsingToolBox::readDynamicVariable(QString& str, qint64& index)
index = number.toLongLong(&ok);
if(ok)
{
- str=str.remove(0,number.size());
+ str=str.remove(0,number.size()+1);
return true;
}
}
@@ -438,6 +437,7 @@ bool ParsingToolBox::readVariable(QString &str, qint64 &myNumber, QString& reaso
{
if(str.isEmpty())
return false;
+
if(str.startsWith("${"))
{
str=str.remove(0,2);
@@ -694,7 +694,6 @@ void ParsingToolBox::readProbability(QStringList& str,QList<Range>& ranges)
tmp.setEnd(realStart+truc);
realStart = tmp.getEnd();
- //qDebug() <<"start:"<< tmp.getStart() << "end:"<< realStart;
ranges[i]=tmp;
}
}