add check for range based for loop

danmar · Jan 9, 2025 · 571eef6 · 571eef6
1 parent c727c82
commit 571eef6
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -1540,15 +1540,29 @@ void CheckUnusedVar::checkStructMemberUsage()
                 continue;
 
             const Token *tok = var->nameToken()->linkAt(-1);
-            if (!Token::Match(tok, "] %assign%"))
-                continue;
+            if (Token::Match(tok, "] %assign%"))
+            {
+                tok = tok->next()->astOperand2();
+                const ValueType *valueType = tok->valueType();
 
-            tok = tok->next()->astOperand2();
-            const ValueType *valueType = tok->valueType();
+                if (valueType && valueType->typeScope == &scope) {
+                    bailout = true;
+                    break;
+                }
+            }
 
-            if (valueType && valueType->typeScope == &scope) {
-                bailout = true;
-                break;
+            if (Token::Match(tok, "] :")) {
+                tok = tok->next()->astOperand2();
+                const ValueType *valueType = tok->valueType();
+
+                if (!valueType->containerTypeToken)
+                    continue;
+
+                const Type *type = valueType->containerTypeToken->type();
+                if (type && type->classScope == &scope) {
+                    bailout = true;
+                    break;
+                }
             }
         }
         if (bailout)