aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/parsingtoolbox.cpp
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2018-08-27 01:03:08 +0200
committerRenaud G <renaud@rolisteam.org>2018-08-27 01:03:08 +0200
commit64e9988ba715e6e196b84e4a69c871c761562bbd (patch)
tree4159ff6831ac34c01069604bebf6b99aad99954a /parsingtoolbox.cpp
parent45d618b710483ee1ae42cbdfcaa0406f1132f384 (diff)
downloadOneRoll-64e9988ba715e6e196b84e4a69c871c761562bbd.tar.gz
OneRoll-64e9988ba715e6e196b84e4a69c871c761562bbd.zip
-New API for validating validor.
Prevent endless loop in R operator.
Diffstat (limited to 'parsingtoolbox.cpp')
-rw-r--r--parsingtoolbox.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp
index bd326e2..a56c098 100644
--- a/parsingtoolbox.cpp
+++ b/parsingtoolbox.cpp
@@ -575,14 +575,16 @@ bool ParsingToolBox::readAscending(QString& str)
bool ParsingToolBox::isValidValidator(ExecutionNode* previous, Validator* val)
{
DiceRollerNode* node = getDiceRollerNode(previous);
+ bool valid = false;
if(nullptr!=node)
{
- return (val->getValidRangeSize(node->getFaces())<node->getFaces());
+ valid = val->isValidRangeSize(node->getRange());
}
else
{
- return true;
+ valid = true;
}
+ return valid;
}
DiceRollerNode* ParsingToolBox::getDiceRollerNode(ExecutionNode* previous)
{