diff options
| author |   Renaud G <renaud@rolisteam.org> | 2020-01-29 23:15:11 +0100 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2020-03-28 02:00:12 +0100 |
| commit | 932d863c2a2c9b08d8ce1f4e1041e5795daedc6d (patch) | |
| tree | df4d0c7ac293788c9030a02c6ee4947c32be0f33 /parsingtoolbox.cpp | |
| parent | 6f3db8cf7f703de57d490e48a6da5f8291e7477d (diff) | |
| download | OneRoll-932d863c2a2c9b08d8ce1f4e1041e5795daedc6d.tar.gz OneRoll-932d863c2a2c9b08d8ce1f4e1041e5795daedc6d.zip | |
Remove ambiguous syntax.
Range [X..Y]
Pow: 2**2
Diffstat (limited to 'parsingtoolbox.cpp')
| -rw-r--r-- | parsingtoolbox.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index c4cbf6f..6ad1c62 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -60,7 +60,7 @@ ParsingToolBox::ParsingToolBox() m_arithmeticOperation->insert(QStringLiteral("|"), Die::INTEGER_DIVIDE); m_arithmeticOperation->insert(QStringLiteral("/"), Die::DIVIDE); m_arithmeticOperation->insert(QStringLiteral("÷"), Die::DIVIDE); - m_arithmeticOperation->insert(QStringLiteral("^"), Die::POW); + m_arithmeticOperation->insert(QStringLiteral("**"), Die::POW); } ParsingToolBox::ParsingToolBox(const ParsingToolBox&) {} @@ -220,9 +220,9 @@ Validator* ParsingToolBox::readValidator(QString& str, bool hasSquare) else if(readOperand(str, operandNode)) { bool isRange= false; - if(str.startsWith("-") && hasSquare) + if(str.startsWith("..") && hasSquare) { - str= str.remove(0, 1); + str= str.remove(0, 2); qint64 end= 0; if(readNumber(str, end)) { @@ -233,10 +233,6 @@ Validator* ParsingToolBox::readValidator(QString& str, bool hasSquare) returnVal= range; isRange= true; } - else - { - str.prepend("-"); - } } if(!isRange) |