cppcheckdata.py: fixed Value::tokvalue

danmar · danmar · commit ec301b2447d8 · 2021-08-22T05:56:16.000+02:00
diff --git a/addons/cppcheckdata.py b/addons/cppcheckdata.py
@@ -383,6 +383,7 @@ def setId(self, IdMap):
                     self.impossible_values.append(v)
                 else:
                     self.values.append(v)
+                v.setId(IdMap)
         self.typeScope = IdMap[self.typeScopeId]
         self.astParent = IdMap[self.astParentId]
         self.astOperand1 = IdMap[self.astOperand1Id]
@@ -688,7 +689,7 @@ def __init__(self, element):
         self.intvalue = element.get('intvalue')
         if self.intvalue:
             self.intvalue = int(self.intvalue)
-        self.tokvalue = element.get('tokvalue')
+        self._tokvalueId = element.get('tokvalue')
         self.floatvalue = element.get('floatvalue')
         self.containerSize = element.get('container-size')
         self.condition = element.get('condition-line')
@@ -703,6 +704,9 @@ def __init__(self, element):
         if element.get('inconclusive'):
             self.inconclusive = True
 
+    def setId(self, IdMap):
+        self.tokvalue = IdMap.get(self._tokvalueId)
+
     def __repr__(self):
         attrs = ["intvalue", "tokvalue", "floatvalue", "containerSize",
                     "condition", "valueKind", "inconclusive"]
