3606f5508b
The loop convert tests for conflicting names have been extended to check for macro names, types, and language keywords including language extensions. Tests have also been added. Fixes PR15322 Author: Jack Yang <jack.yang@intel.com> Reviewer: gribozavr, klimek, revane llvm-svn: 176690
58 lines
1.9 KiB
C++
58 lines
1.9 KiB
C++
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
|
|
// RUN: cpp11-migrate -loop-convert %t.cpp -- -I %S/Inputs
|
|
// RUN: FileCheck -input-file=%t.cpp %s
|
|
|
|
#include "structures.h"
|
|
|
|
void f() {
|
|
const int N = 10;
|
|
const int M = 15;
|
|
Val Arr[N];
|
|
for (int i = 0; i < N; ++i) {
|
|
for (int j = 0; j < N; ++j) {
|
|
int k = Arr[i].x + Arr[j].x;
|
|
// The repeat is there to allow FileCheck to make sure the two variable
|
|
// names aren't the same.
|
|
int l = Arr[i].x + Arr[j].x;
|
|
}
|
|
}
|
|
// CHECK: for (auto & elem : Arr)
|
|
// CHECK-NEXT: for (auto & Arr_j : Arr)
|
|
// CHECK-NEXT: int k = elem.x + Arr_j.x;
|
|
// CHECK-NOT: int l = elem.x + elem.x;
|
|
|
|
Val Nest[N][M];
|
|
for (int i = 0; i < N; ++i) {
|
|
for (int j = 0; j < M; ++j) {
|
|
printf("Got item %d", Nest[i][j].x);
|
|
}
|
|
}
|
|
// The inner loop is also convertible, but doesn't need to be converted
|
|
// immediately. Update this test when that changes!
|
|
// CHECK: for (auto & elem : Nest)
|
|
// CHECK-NEXT: for (int j = 0; j < M; ++j)
|
|
// CHECK-NEXT: printf("Got item %d", elem[j].x);
|
|
|
|
// Note that the order of M and N are switched for this test.
|
|
for (int j = 0; j < M; ++j) {
|
|
for (int i = 0; i < N; ++i) {
|
|
printf("Got item %d", Nest[i][j].x);
|
|
}
|
|
}
|
|
// CHECK-NOT: for (auto & {{[a-zA-Z_]+}} : Nest[i])
|
|
// CHECK: for (int j = 0; j < M; ++j)
|
|
// CHECK-NEXT: for (auto & elem : Nest)
|
|
// CHECK-NEXT: printf("Got item %d", elem[j].x);
|
|
Nested<T> NestT;
|
|
for (Nested<T>::iterator I = NestT.begin(), E = NestT.end(); I != E; ++I) {
|
|
for (T::iterator TI = (*I).begin(), TE = (*I).end(); TI != TE; ++TI) {
|
|
printf("%d", *TI);
|
|
}
|
|
}
|
|
// The inner loop is also convertible, but doesn't need to be converted
|
|
// immediately. Update this test when that changes!
|
|
// CHECK: for (auto & elem : NestT) {
|
|
// CHECK-NEXT: for (T::iterator TI = (elem).begin(), TE = (elem).end(); TI != TE; ++TI) {
|
|
// CHECK-NEXT: printf("%d", *TI);
|
|
}
|