Use the old index identifier by default, instead of 'elem'.

Summary: Use the old index name in the cases where the check would come up with an invented name.

Reviewers: klimek

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D14438

llvm-svn: 252308

1 files changed, 4 insertions, 48 deletions

diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp b/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp
index c8e5c10d11a..50044de6665 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp
+++ b/clang-tools-extra/test/clang-tidy/modernize-loop-convert-camelback.cpp
@@ -13,8 +13,8 @@ void naming() {
     printf("%d\n", arr[i]);
   }
   // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead [modernize-loop-convert]
-  // CHECK-FIXES: for (int elem : arr)
-  // CHECK-FIXES-NEXT: printf("%d\n", elem);
+  // CHECK-FIXES: for (int i : arr)
+  // CHECK-FIXES-NEXT: printf("%d\n", i);
 
   for (int i = 0; i < n; ++i) {
     printf("%d\n", nums[i]);
@@ -28,50 +28,6 @@ void naming() {
     printf("%d\n", nums[i] + num);
   }
   // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int elem : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", elem + num);
-
-  int elem = 0;
-  for (int i = 0; i < n; ++i) {
-    printf("%d\n", nums[i] + num + elem);
-  }
-  // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int numsI : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", numsI + num + elem);
-
-  int numsI = 0;
-  for (int i = 0; i < n; ++i) {
-    printf("%d\n", nums[i] + num + elem + numsI);
-  }
-  // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int numsElem : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", numsElem + num + elem + numsI);
-
-  int numsElem = 0;
-  for (int i = 0; i < n; ++i) {
-    printf("%d\n", nums[i] + num + elem + numsI + numsElem);
-  }
-  // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int giveMeName0 : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", giveMeName0 + num + elem + numsI + numsElem);
-
-  int giveMeName0 = 0;
-  for (int i = 0; i < n; ++i) {
-    printf("%d\n", nums[i] + num + elem + numsI + numsElem + giveMeName0);
-  }
-  // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int giveMeName1 : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", giveMeName1 + num + elem + numsI + numsElem + giveMeName0);
-
-  int numsJ = 0;
-  for (int i = 0; i < n; ++i) {
-    for (int j = 0; j < n; ++j) {
-      printf("%d\n", nums[i] + nums[j] + num + elem + numsI + numsJ + numsElem);
-    }
-  }
-  // CHECK-MESSAGES: :[[@LINE-5]]:3: warning: use range-based for loop instead
-  // CHECK-MESSAGES: :[[@LINE-5]]:5: warning: use range-based for loop instead
-  // CHECK-FIXES: for (int giveMeName0 : nums)
-  // CHECK-FIXES: for (int giveMeName1 : nums)
-  // CHECK-FIXES-NEXT: printf("%d\n", giveMeName0 + giveMeName1 + num + elem + numsI + numsJ + numsElem);
+  // CHECK-FIXES: for (int i : nums)
+  // CHECK-FIXES-NEXT: printf("%d\n", i + num);
 }