diff options
| -rw-r--r-- | compositevalidator.cpp | 8 | ||||
| -rw-r--r-- | diceparser.cpp | 2 | ||||
| -rw-r--r-- | include/diceparserhelper.h | 2 | ||||
| -rw-r--r-- | operationcondition.cpp | 2 | ||||
| -rw-r--r-- | parsingtoolbox.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/compositevalidator.cpp b/compositevalidator.cpp index 5116b16..158df72 100644 --- a/compositevalidator.cpp +++ b/compositevalidator.cpp @@ -136,15 +136,15 @@ Dice::CONDITION_STATE CompositeValidator::isValidRangeSize(const std::pair<qint6 m_validatorList.begin(), m_validatorList.end(), std::back_inserter(vec), [range](Validator* validator) -> Dice::CONDITION_STATE { return validator->isValidRangeSize(range); }); - auto itError= std::find(vec.begin(), vec.end(), Dice::CONDITION_STATE::ERROR); + auto itError= std::find(vec.begin(), vec.end(), Dice::CONDITION_STATE::ERROR_STATE); if((static_cast<int>(vec.size()) != m_operators.size() + 1) || (itError != vec.end())) { - return Dice::CONDITION_STATE::ERROR; + return Dice::CONDITION_STATE::ERROR_STATE; } std::size_t i= 0; - Dice::CONDITION_STATE val; + Dice::CONDITION_STATE val = Dice::CONDITION_STATE::ERROR_STATE; for(const auto& op : m_operators) { auto currentState= vec[i + 1]; @@ -164,7 +164,7 @@ Dice::CONDITION_STATE CompositeValidator::isValidRangeSize(const std::pair<qint6 val= testXOR(val, currentState); break; case NONE: - val= Dice::CONDITION_STATE::ERROR; + val= Dice::CONDITION_STATE::ERROR_STATE; break; } diff --git a/diceparser.cpp b/diceparser.cpp index 702c47f..9eb3a4d 100644 --- a/diceparser.cpp +++ b/diceparser.cpp @@ -1134,7 +1134,7 @@ bool DiceParser::readOption(QString& str, ExecutionNode* previous) //, .arg(symbol)); } break; - case Dice::CONDITION_STATE::ERROR: + case Dice::CONDITION_STATE::ERROR_STATE: default: break; } diff --git a/include/diceparserhelper.h b/include/diceparserhelper.h index 00b9362..1b91285 100644 --- a/include/diceparserhelper.h +++ b/include/diceparserhelper.h @@ -6,7 +6,7 @@ namespace Dice enum class CONDITION_STATE : int { - ERROR, + ERROR_STATE, ALWAYSTRUE, UNREACHABLE, REACHABLE diff --git a/operationcondition.cpp b/operationcondition.cpp index 9ef8e1e..851aa1f 100644 --- a/operationcondition.cpp +++ b/operationcondition.cpp @@ -116,7 +116,7 @@ Dice::CONDITION_STATE OperationCondition::isValidRangeSize(const std::pair<qint6 die.insertRollValue(range.first); if(nullptr == m_boolean) - return Dice::CONDITION_STATE::ERROR; + return Dice::CONDITION_STATE::ERROR_STATE; if(rangeIsClose && m_boolean->hasValid(&die, false, false)) valid= Dice::CONDITION_STATE::ALWAYSTRUE; diff --git a/parsingtoolbox.cpp b/parsingtoolbox.cpp index e3d4955..94dd098 100644 --- a/parsingtoolbox.cpp +++ b/parsingtoolbox.cpp @@ -604,7 +604,7 @@ Dice::CONDITION_STATE ParsingToolBox::isValidValidator(ExecutionNode* previous, { DiceRollerNode* node= getDiceRollerNode(previous); if(nullptr == node) - return Dice::CONDITION_STATE::ERROR; + return Dice::CONDITION_STATE::ERROR_STATE; return val->isValidRangeSize(node->getRange()); } |