From 932d863c2a2c9b08d8ce1f4e1041e5795daedc6d Mon Sep 17 00:00:00 2001
From: Renaud G <renaud@rolisteam.org>
Date: Wed, 29 Jan 2020 23:15:11 +0100
Subject: Remove ambiguous syntax. Range [X..Y] Pow: 2**2

---
 parsingtoolbox.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'parsingtoolbox.cpp')

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)
-- 
cgit v1.2.3-70-g09d2