fix to regular expression, added rawString() and implemented valid()

functions for DiceRoll class

Author: R-Rudolph

core/client/util/diceroll.cpp

@@ -14,9 +14,14 @@ const QRegularExpression DiceRoll::completeStringRegEx_ =
                          "(?<"+signString_+">[+-]?)[\\s\\t]*"                                                   /// sign of first roll
                          "(((?<"+numString_+">\\d+)?(?<"+diceString_+">d))?(?<"+valueString_+">\\d+))[\\s\\t]*" /// dice of first roll
                          "(\\((?<"+nameString_+">.*?)\\))?[\\s\\t]*"                                            /// name of first roll
-                         "(?<"+remainingString_+">[+-][\\s\\t]*((\\d+)?(d))?(\\d+)[\\s\\t]*(.*?)[\\s\\t]*?)*"   ///remaining rolls
+                         "(?<"+remainingString_+">([+-][\\s\\t]*((\\d+)?(d))?(\\d+)[\\s\\t]*(.*?)[\\s\\t]*?)*)"   ///remaining rolls
                          "$");
 
+QString DiceRoll::rawString() const
+{
+  return rawString_;
+}
+
 DiceRoll::DiceRoll()
 {
   valid_ = false;
@@ -25,6 +30,7 @@ DiceRoll::DiceRoll()
 DiceRoll::DiceRoll(const QString& diceRollString)
   : DiceRoll()
 {
+  rawString_ = diceRollString;
   QString currentString = diceRollString;
   auto matches = completeStringRegEx_.match(currentString);
   if(!matches.hasMatch())
@@ -48,6 +54,11 @@ DiceRoll::DiceRoll(const QString& diceRollString)
   }
 }
 
+bool DiceRoll::valid() const
+{
+  return valid_;
+}
+
 QString DiceRoll::roll() const
 {
   QString result = name_ + ":";

core/client/util/diceroll.h

@@ -21,13 +21,15 @@ class DiceRoll
   bool valid_;
   QString name_;
   QVector<DiceRollEntry> rolls_;
+  QString rawString_;
 public:
   DiceRoll();
   DiceRoll(const QString& diceRollString);
 
   bool valid() const;
   DiceRoll operator+(const DiceRoll& other);
   QString roll() const;
+  QString rawString() const;
 };
 
 #endif // DICEROLL_H