Re: [PATCH] D14438: Use the old index identifier by default, instead of 'elem'.

[Manuel Klimek via cfe-commits]

klimek accepted this revision.
klimek added a comment.
This revision is now accepted and ready to land.

lg


http://reviews.llvm.org/D14438



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D14438: Use the old index identifier by default, instead of 'elem'.

[Angel Garcia via cfe-commits]

angelgarcia created this revision.
angelgarcia added a reviewer: klimek.
angelgarcia added a subscriber: cfe-commits.

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

http://reviews.llvm.org/D14438

Files:
  clang-tidy/modernize/LoopConvertUtils.cpp
  test/clang-tidy/modernize-loop-convert-basic.cpp
  test/clang-tidy/modernize-loop-convert-camelback.cpp
  test/clang-tidy/modernize-loop-convert-const.cpp
  test/clang-tidy/modernize-loop-convert-extra.cpp
  test/clang-tidy/modernize-loop-convert-lowercase.cpp
  test/clang-tidy/modernize-loop-convert-uppercase.cpp

Index: test/clang-tidy/modernize-loop-convert-uppercase.cpp
===
--- test/clang-tidy/modernize-loop-convert-uppercase.cpp
+++ test/clang-tidy/modernize-loop-convert-uppercase.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);
 }
Index: test/clang-tidy/modernize-loop-convert-lowercase.cpp
===
--- test/clang-tidy/modernize-loop-convert-lowercase.cpp
+++ 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] +