Merge branch 'rangeInList'

resolved conflicts and merge rangeInList in master.

Conflicts:
	HelpMe.md
	diceparser.cpp
	parsingtoolbox.cpp
	result/result.cpp
	result/stringresult.h

1 files changed, 118 insertions, 0 deletions

diff --git a/compositevalidator.cpp b/compositevalidator.cpp
new file mode 100644
index 0000000..cc52fdd
--- /dev/null
+++ b/compositevalidator.cpp
@@ -0,0 +1,118 @@
+/***************************************************************************
+* Copyright (C) 2014 by Renaud Guezennec                                   *
+* http://renaudguezennec.homelinux.org/accueil,3.html                      *
+*                                                                          *
+*  This file is part of DiceParser                                         *
+*                                                                          *
+* DiceParser is free software; you can redistribute it and/or modify       *
+* it under the terms of the GNU General Public License as published by     *
+* the Free Software Foundation; either version 2 of the License, or        *
+* (at your option) any later version.                                      *
+*                                                                          *
+* This program is distributed in the hope that it will be useful,          *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             *
+* GNU General Public License for more details.                             *
+*                                                                          *
+* You should have received a copy of the GNU General Public License        *
+* along with this program; if not, write to the                            *
+* Free Software Foundation, Inc.,                                          *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.                 *
+***************************************************************************/
+#include "compositevalidator.h"
+
+
+CompositeValidator::CompositeValidator()
+{
+}
+qint64 CompositeValidator::hasValid(Die* b,bool recursive,bool unhighlight) const
+{
+
+	int i = 0;
+	qint64 sum = 0;
+    foreach(const Validator* validator, *m_validatorList)
+	{
+		qint64 val = validator->hasValid(b,recursive,unhighlight);
+		if(i==0)
+		{
+			sum = val;
+		}
+		else
+		{
+            switch(m_operators->at(i-1))
+			{
+				case OR:
+					sum |= val;
+				break;
+				case EXCLUSIVE_OR:
+					sum ^= val;/// @todo may required to be done by hand
+				break;
+				case AND:
+					sum &= val;
+				break;
+			}
+		}
+		++i;
+	}
+
+    return sum;
+}
+
+QString CompositeValidator::toString()
+{
+	QString str="";
+	/*switch (m_operator)
+	{
+	case Equal:
+		str.append("=");
+		break;
+	case GreaterThan:
+		str.append(">");
+		break;
+	case LesserThan:
+		str.append("<");
+		break;
+	case GreaterOrEqual:
+		str.append(">=");
+		break;
+	case LesserOrEqual:
+		str.append("<=");
+		break;
+	}
+	return QString("[%1%2]").arg(str).arg(m_value);*/
+	return str;
+}
+quint64 CompositeValidator::getValidRangeSize(quint64 faces) const
+{
+    quint64 sum =0;
+    int i = -1;
+    foreach(Validator* tmp,*m_validatorList)
+    {
+        quint64 rel = tmp->getValidRangeSize(faces);
+        LogicOperation opt;
+        if(i>=0)
+        {
+            opt = m_operators->at(i);
+        }
+        if(opt == OR)
+        {
+            sum += rel;
+        }
+        else if((opt == AND)&&(opt == EXCLUSIVE_OR))
+        {
+            sum = qMax(rel,sum);
+        }
+        ++i;
+    }
+
+    return sum;
+}
+void CompositeValidator::setOperationList(QVector<LogicOperation>* m)
+{
+    m_operators = m;
+}
+
+void CompositeValidator::setValidatorList(QList<Validator*>* m)
+{
+    m_validatorList = m;
+}