Merge branch 'master' of github.com:obiwankennedy/DiceParser

1 files changed, 12 insertions, 3 deletions

diff --git a/diceparser.cpp b/diceparser.cpp
index a946b86..ebe2e0e 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -179,7 +179,7 @@ bool DiceParser::parseLine(QString str)
     }
     else
     {
-        return false;
+      return false;
     }
 
 }
@@ -862,9 +862,9 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous, bool hasDice)/
     return isFine;
 }
 
-QList<ExecutionNode::ERROR_CODE>  DiceParser::getErrorList()
+QMap<ExecutionNode::ERROR_CODE,QString>  DiceParser::getErrorMap()
 {
-	return m_start->getErrorList();
+    return m_start->getExecutionErrorMap();
 }
 QString DiceParser::humanReadableError()
 {
@@ -876,6 +876,15 @@ QString DiceParser::humanReadableError()
         str.append(i.value());
         str.append("\n");
     }
+
+    ///list
+    QMapIterator<ExecutionNode::ERROR_CODE,QString> j(getErrorMap());
+    while(j.hasNext())
+    {
+        j.next();
+        str.append(j.value());
+        str.append("\n");
+    }
     return str;
 }