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
diff --git a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp b/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp
index 5f5c224..c7bb221 100644
--- a/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp
+++ b/clang-tools-extra/test/clang-tidy/modernize-loop-convert-lowercase.cpp
@@ -14,8 +14,8 @@
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]);
@@ -36,50 +36,6 @@
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 nums_i : nums)
- // CHECK-FIXES-NEXT: printf("%d\n", nums_i + num + elem);
-
- int nums_i = 0;
- for (int i = 0; i < n; ++i) {
- printf("%d\n", nums[i] + num + elem + nums_i);
- }
- // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
- // CHECK-FIXES: for (int nums_elem : nums)
- // CHECK-FIXES-NEXT: printf("%d\n", nums_elem + num + elem + nums_i);
-
- int nums_elem = 0;
- for (int i = 0; i < n; ++i) {
- printf("%d\n", nums[i] + num + elem + nums_i + nums_elem);
- }
- // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
- // CHECK-FIXES: for (int give_me_name_0 : nums)
- // CHECK-FIXES-NEXT: printf("%d\n", give_me_name_0 + num + elem + nums_i + nums_elem);
-
- int give_me_name_0 = 0;
- for (int i = 0; i < n; ++i) {
- printf("%d\n", nums[i] + num + elem + nums_i + nums_elem + give_me_name_0);
- }
- // CHECK-MESSAGES: :[[@LINE-3]]:3: warning: use range-based for loop instead
- // CHECK-FIXES: for (int give_me_name_1 : nums)
- // CHECK-FIXES-NEXT: printf("%d\n", give_me_name_1 + num + elem + nums_i + nums_elem + give_me_name_0);
-
- int nums_j = 0;
- for (int i = 0; i < n; ++i) {
- for (int j = 0; j < n; ++j) {
- printf("%d\n", nums[i] + nums[j] + num + elem + nums_i + nums_j + nums_elem);
- }
- }
- // 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 give_me_name_0 : nums)
- // CHECK-FIXES: for (int give_me_name_1 : nums)
- // CHECK-FIXES-NEXT: printf("%d\n", give_me_name_0 + give_me_name_1 + num + elem + nums_i + nums_j + nums_elem);
+ // CHECK-FIXES: for (int i : nums)
+ // CHECK-FIXES-NEXT: printf("%d\n", i + num);
}