Merge branch 'repeat2' into 'master'

All new features

See merge request kde/rolisteam-diceparser!4

1 files changed, 84 insertions, 0 deletions

diff --git a/validator.cpp b/validator.cpp
index 9f717f8..3d0b7af 100644
--- a/validator.cpp
+++ b/validator.cpp
@@ -24,7 +24,91 @@
 Validator::Validator() {}
 Validator::~Validator() {}
 
+template <typename Functor>
+qint64 Validator::onEach(const std::vector<Die*>& b, bool recursive, bool unlight, Functor functor) const
+{
+    qint64 result= 0;
+    std::for_each(b.begin(), b.end(), [this, recursive, unlight, functor, &result](Die* die) {
+        if(hasValid(die, recursive, unlight))
+        {
+            ++result;
+            functor(die, recursive, unlight);
+        }
+    });
+    return result;
+}
+
+template <typename Functor>
+qint64 Validator::oneOfThem(const std::vector<Die*>& b, bool recursive, bool unlight, Functor functor) const
+{
+    auto oneOfThem= std::any_of(b.begin(), b.end(),
+                                [this, recursive, unlight](Die* die) { return hasValid(die, recursive, unlight); });
+    if(oneOfThem)
+        functor(recursive, unlight);
+    return oneOfThem ? 1 : 0;
+}
+
+template <typename Functor>
+qint64 Validator::allOfThem(const std::vector<Die*>& b, bool recursive, bool unlight, Functor functor) const
+{
+    auto all= std::all_of(b.begin(), b.end(),
+                          [this, recursive, unlight](Die* die) { return hasValid(die, recursive, unlight); });
+    if(all)
+        functor(recursive, unlight);
+    return all ? 1 : 0;
+}
+
+template <typename Functor>
+qint64 Validator::onScalar(const std::vector<Die*>& b, bool recursive, bool unlight, Functor functor) const
+{
+    qint64 result= 0;
+    for(const auto& die : b)
+    {
+        result+= die->getValue();
+    }
+    Die die;
+    die.setValue(result);
+    if(hasValid(&die, recursive, unlight))
+    {
+        functor(recursive, unlight);
+        return 1;
+    }
+    return 0;
+}
+
 const std::set<qint64>& Validator::getPossibleValues(const std::pair<qint64, qint64>&)
 {
     return m_values;
 }
+
+template <typename Functor>
+qint64 Validator::validResult(const std::vector<Die*>& b, bool recursive, bool unlight, Functor functor) const
+{
+    qint64 result;
+    switch(m_conditionType)
+    {
+    case Dice::OnEach:
+        result= onEach(b, recursive, unlight, functor);
+        break;
+    case Dice::OneOfThem:
+        result= oneOfThem(b, recursive, unlight, functor);
+        break;
+    case Dice::AllOfThem:
+        result= allOfThem(b, recursive, unlight, functor);
+        break;
+    case Dice::OnScalar:
+        result= onScalar(b, recursive, unlight, functor);
+        break;
+    }
+    return result;
+}
+
+Dice::ConditionType Validator::getConditionType() const
+{
+    return m_conditionType;
+}
+
+void Validator::setConditionType(const Dice::ConditionType& conditionType)
+{
+    m_conditionType= conditionType;
+}