efae14e96c
Seems I had a problem with my version of grep, when run by lit, not supporting the \s escape. This seems to fix it for me & I'll be getting the buildbots to run these tests too to keep an eye on them (actually loop-convert tests still fail when run via a make build, so that'll be addressed in a future commit). I could use [[:space:]] to generalize over other whitespace but that seemed unnecessarily verbose when the flexibility wasn't actually required by the current text of the tests. Also I just simplified a lot of the loop-convert tests (removing the unecessary temp file deletion at the start, removing the unnecessary && for FileCheck, etc). The remove-cstr-calls/basic.cpp changes were necessitated by an out of tree lit-like test runner that's a bit less fantastic about escaping. They were modeled on existing tooling test cases in Clang, with thanks to Manuel Klimek for the pointers. llvm-svn: 163009
104 lines
3.4 KiB
C++
104 lines
3.4 KiB
C++
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
|
|
// RUN: loop-convert . %t.cpp -- -I %S/Inputs
|
|
// RUN: FileCheck -input-file=%t.cpp %s
|
|
|
|
#include "structures.h"
|
|
|
|
void f() {
|
|
/// begin()/end() - based for loops here:
|
|
T t;
|
|
for (T::iterator it = t.begin(), e = t.end(); it != e; ++it) {
|
|
printf("I found %d\n", *it);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]+&? ?}}[[VAR:[a-z_]+]] : t)
|
|
// CHECK-NEXT: printf("I found %d\n", [[VAR]]);
|
|
|
|
T *pt;
|
|
for (T::iterator it = pt->begin(), e = pt->end(); it != e; ++it) {
|
|
printf("I found %d\n", *it);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]+&? ?}}[[VAR:[a-z_]+]] : *pt)
|
|
// CHECK-NEXT: printf("I found %d\n", [[VAR]]);
|
|
|
|
S s;
|
|
for (S::const_iterator it = s.begin(), e = s.end(); it != e; ++it) {
|
|
printf("s has value %d\n", (*it).x);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : s)
|
|
// CHECK-NEXT: printf("s has value %d\n", ([[VAR]]).x);
|
|
|
|
S *ps;
|
|
for (S::const_iterator it = ps->begin(), e = ps->end(); it != e; ++it) {
|
|
printf("s has value %d\n", (*it).x);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : *ps)
|
|
// CHECK-NEXT: printf("s has value %d\n", ([[VAR]]).x);
|
|
|
|
for (S::const_iterator it = s.begin(), e = s.end(); it != e; ++it) {
|
|
printf("s has value %d\n", it->x);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : s)
|
|
// CHECK-NEXT: printf("s has value %d\n", [[VAR]].x);
|
|
|
|
for (S::iterator it = s.begin(), e = s.end(); it != e; ++it) {
|
|
it->x = 3;
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : s)
|
|
// CHECK-NEXT: [[VAR]].x = 3;
|
|
|
|
for (S::iterator it = s.begin(), e = s.end(); it != e; ++it) {
|
|
(*it).x = 3;
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : s)
|
|
// CHECK-NEXT: ([[VAR]]).x = 3;
|
|
|
|
for (S::iterator it = s.begin(), e = s.end(); it != e; ++it) {
|
|
it->nonConstFun(4, 5);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : s)
|
|
// CHECK-NEXT: [[VAR]].nonConstFun(4, 5);
|
|
|
|
U u;
|
|
for (U::iterator it = u.begin(), e = u.end(); it != e; ++it) {
|
|
printf("s has value %d\n", it->x);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : u)
|
|
// CHECK-NEXT: printf("s has value %d\n", [[VAR]].x);
|
|
|
|
for (U::iterator it = u.begin(), e = u.end(); it != e; ++it) {
|
|
printf("s has value %d\n", (*it).x);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : u)
|
|
// CHECK-NEXT: printf("s has value %d\n", ([[VAR]]).x);
|
|
|
|
U::iterator A;
|
|
for (U::iterator i = u.begin(), e = u.end(); i != e; ++i)
|
|
int k = A->x + i->x;
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : u)
|
|
// CHECK-NEXT: int k = A->x + [[VAR]].x;
|
|
|
|
dependent<int> v;
|
|
for (dependent<int>::const_iterator it = v.begin(), e = v.end();
|
|
it != e; ++it) {
|
|
printf("Fibonacci number is %d\n", *it);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : v)
|
|
// CHECK-NEXT: printf("Fibonacci number is %d\n", [[VAR]]);
|
|
|
|
for (dependent<int>::const_iterator it(v.begin()), e = v.end();
|
|
it != e; ++it) {
|
|
printf("Fibonacci number is %d\n", *it);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : v)
|
|
// CHECK-NEXT: printf("Fibonacci number is %d\n", [[VAR]]);
|
|
|
|
doublyDependent<int,int> intmap;
|
|
for (doublyDependent<int,int>::iterator it = intmap.begin(), e = intmap.end();
|
|
it != e; ++it) {
|
|
printf("intmap[%d] = %d", it->first, it->second);
|
|
}
|
|
// CHECK: for ({{[a-zA-Z_ ]*&? ?}}[[VAR:[a-z_]+]] : intmap)
|
|
// CHECK-NEXT: printf("intmap[%d] = %d", [[VAR]].first, [[VAR]].second);
|
|
|
|
}
|