From f85cdd3f77722b1963ab916928e11491fb88d9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sun, 28 Jun 2020 10:52:50 +0200
Subject: [PATCH] ExprEngine: DataIndex update to get better debug output

---
 lib/exprengine.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp
index b38cda6b3..74682f5bd 100644
--- a/lib/exprengine.cpp
+++ b/lib/exprengine.cpp
@@ -229,10 +229,10 @@ static ExprEngine::ValuePtr getValueRangeFromValueType(const std::string &name,
 namespace {
     class TrackExecution {
     public:
-        TrackExecution() : mDataIndex(0), mAbortLine(-1) {}
+        TrackExecution() : mDataIndexCounter(0), mAbortLine(-1) {}
 
         int getNewDataIndex() {
-            return mDataIndex++;
+            return mDataIndexCounter++;
         }
 
         void symbolRange(const Token *tok, ExprEngine::ValuePtr value) {
@@ -321,7 +321,7 @@ namespace {
 
         std::map<const Token *, std::vector<std::string>> mMap;
 
-        int mDataIndex;
+        int mDataIndexCounter;
         int mAbortLine;
         std::set<std::string> mSymbols;
         std::set<int> mErrors;
@@ -487,7 +487,7 @@ namespace {
                 return;
             const SymbolDatabase * const symbolDatabase = tokenizer->getSymbolDatabase();
             std::ostringstream s;
-            s << "{"; // << mDataIndex << ":";
+            s << mDataIndex << ":" << "{";
             for (auto mem : memory) {
                 ExprEngine::ValuePtr value = mem.second;
                 const Variable *var = symbolDatabase->getVariableFromVarId(mem.first);