This is an archive of the discontinued LLVM Phabricator instance.

Differential D23158

[clang-rename] merge tests when possible
ClosedPublic

Authored by omtcyfz on Aug 4 2016, 2:22 AM.

Details

Reviewers
klimek
alexfh
Commits
rG77f522cb42b4: [clang-rename] merge tests when possible
rCTE278221: [clang-rename] merge tests when possible
rL278221: [clang-rename] merge tests when possible
Summary

The only difference between some tests is -offset passed to clang-rename. It makes sense to merge them into a single file and add multiple tool invocations.

Diff Detail

Event Timeline

omtcyfz updated this revision to Diff 66775.Aug 4 2016, 2:22 AM
omtcyfz retitled this revision from to [clang-rename] merge tests when possible.
omtcyfz updated this object.
omtcyfz added reviewers: alexfh, klimek.
omtcyfz added a subscriber: cfe-commits.
alexfh edited edge metadata.Aug 4 2016, 6:32 AM

Awesome! A few improvements are still possible though. See inline comments.

test/clang-rename/ClassAsTemplateArgument.cpp
16

Since clang-rename can output the result to stdout, it makes sense to avoid copying files and switch to a single pipeline for each test case.

17

Please add instruction on how to find offsets (something along the lines of "n-th line of grep -b Foo test-file.cpp").

alexfh requested changes to this revision.Aug 4 2016, 6:54 AM
alexfh edited edge metadata.
This revision now requires changes to proceed.Aug 4 2016, 6:54 AM
omtcyfz updated this revision to Diff 66801.Aug 4 2016, 7:08 AM
omtcyfz updated this revision to Diff 66803.
omtcyfz edited edge metadata.
omtcyfz marked an inline comment as done.
omtcyfz edited edge metadata.

Rebased on master. Removed unneeded file copying etc since clang-rename can output to the stdout.

alexfh added a comment.Aug 4 2016, 8:09 AM

Much better now, please also add instruction on how to find offsets.

omtcyfz updated this revision to Diff 66818.Aug 4 2016, 9:16 AM

Make testset great again.

omtcyfz added a parent revision: D23193: [clang-rename] fix bug with initializer lists.Aug 8 2016, 1:50 AM
alexfh requested changes to this revision.Aug 8 2016, 2:57 PM
alexfh edited edge metadata.

Removing from my dashboard until the comments are addressed.

This revision now requires changes to proceed.Aug 8 2016, 2:57 PM
omtcyfz updated this revision to Diff 67501.Aug 10 2016, 3:39 AM
omtcyfz edited edge metadata.

Address comments.

alexfh accepted this revision.Aug 10 2016, 5:13 AM
alexfh edited edge metadata.

Looks good. Thank you!

This revision is now accepted and ready to land.Aug 10 2016, 5:13 AM
omtcyfz updated this revision to Diff 67515.Aug 10 2016, 6:26 AM
omtcyfz edited edge metadata.

Update files not previouysly added with git add.

omtcyfz updated this revision to Diff 67516.Aug 10 2016, 6:28 AM

Delete two more files.

Closed by commit rL278221: [clang-rename] merge tests when possible (authored by omtcyfz). · Explain WhyAug 10 2016, 6:36 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 67516

test/clang-rename/ClassAsTemplateArgument.cpp

  • This file was added.
class Foo /* Test 1 */ {}; // CHECK: class Bar /* Test 1 */ {};
template <typename T>
void func() {}
template <typename T>
class Baz {};
int main() {
func<Foo>(); // CHECK: func<Bar>();
Baz<Foo> /* Test 2 */ obj; // CHECK: Baz<Bar> /* Test 2 */ obj;
return 0;
}
// Test 1.
// RUN: clang-rename -offset=7 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
alexfhUnsubmitted
Done
ReplyInline Actions

Since clang-rename can output the result to stdout, it makes sense to avoid copying files and switch to a single pipeline for each test case.

alexfh: Since clang-rename can output the result to stdout, it makes sense to avoid copying files and…
// Test 2.
alexfhUnsubmitted
Not Done
ReplyInline Actions

Please add instruction on how to find offsets (something along the lines of "n-th line of grep -b Foo test-file.cpp").

alexfh: Please add instruction on how to find offsets (something along the lines of "n-th line of grep…
// RUN: clang-rename -offset=215 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo {}; // CHECK: class Bar {};
template <typename T>
void func() {}
template <typename T>
class Baz {};
int main() {
func<Foo>(); // CHECK: func<Bar>();
Baz<Foo> obj; // CHECK: Baz<Bar> obj;
return 0;
}
// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.

test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=304 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo {}; // CHECK: class Bar {};
template <typename T>
void func() {}
template <typename T>
class Baz {};
int main() {
func<Foo>(); // CHECK: func<Bar>();
Baz<Foo> obj; // CHECK: Baz<Bar> obj;
return 0;
}
// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing
// this file.

test/clang-rename/ClassFindByName.cpp

// RUN: cat %s > %t.cpp class Foo { // CHECK: class Bar {
// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar
}; };
int main() { int main() {
Foo *Pointer = 0; // CHECK: Bar *Pointer = 0; Foo *Pointer = 0; // CHECK: Bar *Pointer = 0;
return 0; return 0;
} }
// Test 1.
// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s

test/clang-rename/ClassNameInFunctionDefinition.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar {
public:
void foo(int x);
};
void Foo::foo(int x) {} // CHECK: void Bar::foo(int x) {}

test/clang-rename/ClassSimpleRenaming.cpp

// RUN: cat %s > %t.cpp class Foo /* Test 1 */ { // CHECK: class Bar /* Test 1 */ {
// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i -- public:
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s void foo(int x);
};
class Foo {}; // CHECK: class Bar void Foo::foo(int x) /* Test 2 */ {} // CHECK: void Bar::foo(int x) /* Test 2 */ {}
int main() { // Test 1.
Foo *Pointer = 0; // CHECK: Bar *Pointer = 0; // RUN: clang-rename -offset=6 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
return 0; // Test 2.
} // RUN: clang-rename -offset=109 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing // To find offsets after modifying the file, use:
// this file. // grep -Ubo 'Foo.*' <file>

test/clang-rename/ClassTestMulti.cpp

// RUN: cat %s > %t.cpp class Foo1 /* Offset 1 */ { // CHECK: class Bar1 /* Offset 1 */ {
// RUN: clang-rename rename-all -offset=174 -new-name=Bar1 -offset=212 -new-name=Bar2 %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo1 { // CHECK: class Bar1
}; };
class Foo2 { // CHECK: class Bar2 class Foo2 /* Offset 2 */ { // CHECK: class Bar2 /* Offset 2 */ {
}; };
// Test 1.
// RUN: clang-rename rename-all -offset=6 -new-name=Bar1 -offset=76 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/ClassTestMultiByName.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename rename-all -old-name=Foo1 -new-name=Bar1 -old-name=Foo2 -new-name=Bar2 %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo1 { // CHECK: class Bar1 class Foo1 { // CHECK: class Bar1
}; };
class Foo2 { // CHECK: class Bar2 class Foo2 { // CHECK: class Bar2
}; };
// Test 1.
// RUN: clang-rename rename-all -old-name=Foo1 -new-name=Bar1 -old-name=Foo2 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s

test/clang-rename/ClassTestMultiByNameYAML.cpp

class Foo1 { // CHECK: class Bar1 class Foo1 { // CHECK: class Bar1
}; };
class Foo2 { // CHECK: class Bar2 class Foo2 { // CHECK: class Bar2
}; };
// Test 1.
// RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAll.yaml %s -- | sed 's,//.*,,' | FileCheck %s // RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAll.yaml %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAt.yaml %s -- | sed 's,//.*,,' | FileCheck %s // RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAt.yaml %s -- | sed 's,//.*,,' | FileCheck %s

test/clang-rename/ComplexFunctionOverride.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=307 -new-name=bar %t.cpp -i -- -std=c++11
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
struct A { struct A {
virtual void foo(); // CHECK: virtual void bar(); virtual void foo() {} /* Test 1 */ // CHECK: virtual void bar() {}
}; };
struct B : A { struct B : A {
void foo() override; // CHECK: void bar() override; void foo() override {} /* Test 2 */ // CHECK: void bar() override {}
}; };
struct C : B { struct C : B {
void foo() override; // CHECK: void bar() override; void foo() override {} /* Test 3 */ // CHECK: void bar() override {}
}; };
struct D : B { struct D : B {
void foo() override; // CHECK: void bar() override; void foo() override {} /* Test 4 */ // CHECK: void bar() override {}
}; };
struct E : D { struct E : D {
void foo() override; // CHECK: void bar() override; void foo() override {} /* Test 5 */ // CHECK: void bar() override {}
}; };
int main() {
A a;
a.foo(); // CHECK: a.bar();
B b;
b.foo(); // CHECK: b.bar();
C c;
c.foo(); // CHECK: c.bar();
D d;
d.foo(); // CHECK: d.bar();
E e;
e.foo(); // CHECK: e.bar();
return 0;
}
// Test 1.
// RUN: clang-rename -offset=26 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=109 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=201 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 4.
// RUN: clang-rename -offset=293 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 5.
// RUN: clang-rename -offset=385 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'foo.*' <file>

test/clang-rename/ComplicatedClassType.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=220 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
// Forward declaration. // Forward declaration.
class Foo; // CHECK: class Bar; class Foo; /* Test 1 */ // CHECK: class Bar; /* Test 1 */
class Baz {
virtual int getValue() const = 0;
};
class Foo { // CHECK: class Bar { class Foo : public Baz { /* Test 2 */// CHECK: class Bar : public Baz {
public: public:
Foo(int value = 0) : x(value) {} // CHECK: Bar(int value = 0) : x(value) {} Foo(int value = 0) : x(value) {} // CHECK: Bar(int value = 0) : x(value) {}
Foo &operator++(int) { // CHECK: Bar &operator++(int) { Foo &operator++(int) { // CHECK: Bar &operator++(int) {
x++; x++;
return *this; return *this;
} }
bool operator<(Foo const &rhs) { // CHECK: bool operator<(Bar const &rhs) { bool operator<(Foo const &rhs) { // CHECK: bool operator<(Bar const &rhs) {
return this->x < rhs.x; return this->x < rhs.x;
} }
int getValue() const {
return 0;
}
private: private:
int x; int x;
}; };
int main() { int main() {
Foo *Pointer = 0; // CHECK: Bar *Pointer = 0; Foo *Pointer = 0; // CHECK: Bar *Pointer = 0;
Foo Variable = Foo(10); // CHECK: Bar Variable = Bar(10); Foo Variable = Foo(10); // CHECK: Bar Variable = Bar(10);
for (Foo it; it < Variable; it++) { // CHECK: for (Bar it; it < Variable; it++) { for (Foo it; it < Variable; it++) { // CHECK: for (Bar it; it < Variable; it++) {
} }
const Foo *C = new Foo(); // CHECK: const Bar *C = new Bar();
const_cast<Foo *>(C)->getValue(); // CHECK: const_cast<Bar *>(C)->getValue();
Foo foo; // CHECK: Bar foo;
const Baz &BazReference = foo;
const Baz *BazPointer = &foo;
dynamic_cast<const Foo &>(BazReference).getValue(); /* Test 3 */ // CHECK: dynamic_cast<const Bar &>(BazReference).getValue();
dynamic_cast<const Foo *>(BazPointer)->getValue(); /* Test 4 */ // CHECK: dynamic_cast<const Bar *>(BazPointer)->getValue();
reinterpret_cast<const Foo *>(BazPointer)->getValue(); /* Test 5 */ // CHECK: reinterpret_cast<const Bar *>(BazPointer)->getValue();
static_cast<const Foo &>(BazReference).getValue(); /* Test 6 */ // CHECK: static_cast<const Bar &>(BazReference).getValue();
static_cast<const Foo *>(BazPointer)->getValue(); /* Test 7 */ // CHECK: static_cast<const Bar *>(BazPointer)->getValue();
return 0; return 0;
} }
// Test 1.
// RUN: clang-rename -offset=30 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=155 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=1133 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 4.
// RUN: clang-rename -offset=1266 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 5.
// RUN: clang-rename -offset=1402 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 6.
// RUN: clang-rename -offset=1533 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 7.
// RUN: clang-rename -offset=1665 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/ConstCastExpr.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar {
public:
int getValue() {
return 0;
}
};
int main() {
const Foo *C = new Foo(); // CHECK: const Bar *C = new Bar();
const_cast<Foo *>(C)->getValue(); // CHECK: const_cast<Bar *>(C)->getValue();
}
// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/ConstructExpr.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=136 -new-name=Boo %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo {}; // CHECK: class Boo {};
int main() {
Foo *C = new Foo(); // CHECK: Boo *C = new Boo();
}
// Use grep -FUbo 'Boo' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/Ctor.cpp

  • This file was added.
class Foo { // CHECK: class Bar {
public:
Foo(); /* Test 1 */ // CHECK: Bar();
};
Foo::Foo() /* Test 2 */ {} // CHECK: Bar::Bar() /* Test 2 */ {}
// Test 1.
// RUN: clang-rename -offset=62 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=116 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/CtorFindByDeclaration.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=174 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar
public:
Foo(); // CHECK: Bar();
};
Foo::Foo() {} // CHECK: Bar::Bar()
// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/CtorFindByDefinition.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=212 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar
public:
Foo(); // CHECK: Bar();
};
Foo::Foo() {} // CHECK: Bar::Bar()
// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/CtorInitializer.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=163 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Baz {}; class Baz {};
class Qux { class Qux {
Baz Foo; // CHECK: Baz Bar; Baz Foo; /* Test 1 */ // CHECK: Baz Bar;
public: public:
Qux(); Qux();
}; };
Qux::Qux() : Foo() {} // CHECK: Qux::Qux() : Bar() {} Qux::Qux() : Foo() /* Test 2 */ {} // CHECK: Qux::Qux() : Bar() /* Test 2 */ {}
// Test 1.
// RUN: clang-rename -offset=33 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=118 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing // To find offsets after modifying the file, use:
// this file. // grep -Ubo 'Foo.*' <file>

test/clang-rename/DeclRefExpr.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=161 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class C { class C {
public: public:
static int Foo; // CHECK: static int Bar; static int Foo; /* Test 1 */ // CHECK: static int Bar;
}; };
int foo(int x) { return 0; } int foo(int x) { return 0; }
#define MACRO(a) foo(a) #define MACRO(a) foo(a)
int main() { int main() {
C::Foo = 1; // CHECK: C::Bar C::Foo = 1; /* Test 2 */ // CHECK: C::Bar = 1;
MACRO(C::Foo); // CHECK: C::Bar MACRO(C::Foo); // CHECK: MACRO(C::Bar);
int y = C::Foo; // CHECK: C::Bar int y = C::Foo; /* Test 3 */ // CHECK: int y = C::Bar;
return 0;
} }
// Use grep -FUbo 'X' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=31 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=152 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=271 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/DtorDeclaration.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=175 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar {
public:
~Foo(); // CHECK: ~Bar();
};
Foo::~Foo() { // CHECK: Bar::~Bar()
}
// Use grep -FUbo 'Bar' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/DtorDefinition.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=219 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar {
public:
~Foo(); // CHECK: ~Bar();
};
Foo::~Foo() {} // CHECK: Bar::~Bar()
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/DynamicCastExpr.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=195 -new-name=Bar %t.cpp -i -- -frtti
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Baz {
virtual int getValue() const = 0;
};
class Foo : public Baz { // CHECK: class Bar : public Baz {
public:
int getValue() const {
return 0;
}
};
int main() {
Foo foo; // FIXME: Bar foo; <- this one fails
const Baz &Reference = foo;
const Baz *Pointer = &foo;
dynamic_cast<const Foo &>(Reference).getValue(); // CHECK: dynamic_cast<const Bar &>(Reference).getValue();
dynamic_cast<const Foo *>(Pointer)->getValue(); // CHECK: dynamic_cast<const Bar *>(Pointer)->getValue();
}
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/FunctionMacro.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=199 -new-name=macro_function %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
#define moo foo // CHECK: #define moo macro_function #define moo foo // CHECK: #define moo macro_function
int foo() { // CHECK: int macro_function() { int foo() /* Test 1 */ { // CHECK: int macro_function() /* Test 1 */ {
return 42; return 42;
} }
void boo(int value) {} void boo(int value) {}
void qoo() { void qoo() {
foo(); // CHECK: macro_function(); foo(); // CHECK: macro_function();
boo(foo()); // CHECK: boo(macro_function()); boo(foo()); // CHECK: boo(macro_function());
moo(); moo();
boo(moo()); boo(moo());
} }
// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=68 -new-name=macro_function %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'foo.*' <file>

test/clang-rename/FunctionOverride.cpp

// RUN: cat %s > %t.cpp class A { virtual void foo(); /* Test 1 */ }; // CHECK: class A { virtual void bar();
// RUN: clang-rename -offset=318 -new-name=bar %t.cpp -i -- class B : public A { void foo(); /* Test 2 */ }; // CHECK: class B : public A { void bar();
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s class C : public B { void foo(); /* Test 3 */ }; // CHECK: class C : public B { void bar();
class A { virtual void foo(); }; // CHECK: class A { virtual void bar(); }; // Test 1.
class B : public A { void foo(); }; // CHECK: class B : public A { void bar(); }; // RUN: clang-rename -offset=23 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
class C : public B { void foo(); }; // CHECK: class C : public B { void bar(); }; // Test 2.
// RUN: clang-rename -offset=116 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=209 -new-name=bar %s -- | sed 's,//.*,,' | FileCheck %s
// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing // To find offsets after modifying the file, use:
// this file. // grep -Ubo 'foo.*' <file>

test/clang-rename/FunctionWithClassFindByName.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
void foo() { void foo() {
} }
class Foo { // CHECK: class Bar class Foo { // CHECK: class Bar
}; };
int main() { int main() {
Foo *Pointer = 0; // CHECK: Bar *Pointer = 0; Foo *Pointer = 0; // CHECK: Bar *Pointer = 0;
return 0; return 0;
} }
// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s

test/clang-rename/MemberExprMacro.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=156 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Baz { class Baz {
public: public:
int Foo; // CHECK: int Bar; int Foo; /* Test 1 */ // CHECK: int Bar;
}; };
int qux(int x) { return 0; } int qux(int x) { return 0; }
#define MACRO(a) qux(a) #define MACRO(a) qux(a)
int main() { int main() {
Baz baz; Baz baz;
baz.Foo = 1; // CHECK: baz.Bar = 1; baz.Foo = 1; /* Test 2 */ // CHECK: baz.Bar = 1;
MACRO(baz.Foo); // CHECK: MACRO(baz.Bar); MACRO(baz.Foo); // CHECK: MACRO(baz.Bar);
int y = baz.Foo; // CHECK: int y = baz.Bar; int y = baz.Foo; // CHECK: int y = baz.Bar;
} }
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=26 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=155 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/Namespace.cpp

// RUN: cat %s > %t.cpp namespace gcc /* Test 1 */ { // CHECK: namespace clang /* Test 1 */ {
// RUN: clang-rename -offset=143 -new-name=llvm %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
namespace foo { // CHECK: namespace llvm {
int x; int x;
} }
void boo() { void boo() {
foo::x = 42; // CHECK: llvm::x = 42; gcc::x = 42; // CHECK: clang::x = 42;
} }
// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=10 -new-name=clang %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/ReinterpretCastExpr.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=133 -new-name=X %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Cla {
public:
int getValue() const {
return 0;
}
};
int main() {
void *C = new Cla();
reinterpret_cast<const Cla *>(C)->getValue(); // CHECK: reinterpret_cast<const X *>
}
// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/StaticCastExpr.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=152 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Baz {
};
class Foo : public Baz { // CHECK: class Bar : public Baz {
public:
int getValue() const {
return 0;
}
};
int main() {
Foo foo; // FIXME: Bar foo;
const Baz &Reference = foo;
const Baz *Pointer = &foo;
static_cast<const Foo &>(Reference).getValue(); // CHECK: static_cast<const Bar &>(Reference).getValue();
static_cast<const Foo *>(Pointer)->getValue(); // CHECK: static_cast<const Bar *>(Pointer)->getValue();
}
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/TemplateClassInstantiation.cpp

template <typename T> template <typename T>
class Foo { // CHECK: class Bar { class Foo { /* Test 1 */ // CHECK: class Bar { /* Test 1 */
public: public:
T foo(T arg, T& ref, T* ptr) { T foo(T arg, T& ref, T* ptr) {
T value; T value;
int number = 42; int number = 42;
value = (T)number; value = (T)number;
value = static_cast<T>(number); value = static_cast<T>(number);
return value; return value;
} }
static void foo(T value) {} static void foo(T value) {}
T member; T member;
}; };
template <typename T> template <typename T>
void func() { void func() {
Foo<T> obj; // CHECK: Bar<T> obj; Foo<T> obj; /* Test 2 */ // CHECK: Bar<T> obj;
obj.member = T(); obj.member = T();
Foo<T>::foo(); // CHECK: Bar<T>::foo(); Foo<T>::foo(); // CHECK: Bar<T>::foo();
} }
int main() { int main() {
Foo<int> i; // CHECK: Bar<int> i; Foo<int> i; /* Test 3 */ // CHECK: Bar<int> i;
i.member = 0; i.member = 0;
Foo<int>::foo(0); // CHECK: Bar<int>::foo(0); Foo<int>::foo(0); // CHECK: Bar<int>::foo(0);
Foo<bool> b; // CHECK: Bar<bool> b; Foo<bool> b; // CHECK: Bar<bool> b;
b.member = false; b.member = false;
Foo<bool>::foo(false); // CHECK: Bar<bool>::foo(false); Foo<bool>::foo(false); // CHECK: Bar<bool>::foo(false);
return 0; return 0;
} }
// RUN: cat %s > %t-0.cpp // Test 1.
// RUN: clang-rename -offset=29 -new-name=Bar %t-0.cpp -i -- -fno-delayed-template-parsing // RUN: clang-rename -offset=29 -new-name=Bar %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// RUN: sed 's,//.*,,' %t-0.cpp | FileCheck %s // Test 2.
// RUN: clang-rename -offset=324 -new-name=Bar %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// RUN: cat %s > %t-1.cpp // Test 3.
// RUN: clang-rename -offset=311 -new-name=Bar %t-1.cpp -i -- -fno-delayed-template-parsing // RUN: clang-rename -offset=463 -new-name=Bar %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// RUN: sed 's,//.*,,' %t-1.cpp | FileCheck %s
// To find offsets after modifying the file, use:
// RUN: cat %s > %t-2.cpp // grep -Ubo 'Foo.*' <file>
// RUN: clang-rename -offset=445 -new-name=Bar %t-2.cpp -i -- -fno-delayed-template-parsing
// RUN: sed 's,//.*,,' %t-2.cpp | FileCheck %s

test/clang-rename/TemplateFunctionFindByDeclaration.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=154 -new-name=bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
template <typename T>
T foo(T value) { // CHECK: T bar(T value) {
return value;
}
int main() {
foo<bool>(false); // CHECK: bar<bool>(false);
foo<int>(0); // CHECK: bar<int>(0);
return 0;
}
// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing
// this file.

test/clang-rename/TemplateFunctionFindByUse.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=233 -new-name=bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
template <typename T>
T foo(T value) { // CHECK: T bar(T value) {
return value;
}
int main() {
foo<bool>(false); // CHECK: bar<bool>(false);
foo<int>(0); // CHECK: bar<int>(0);
return 0;
}

test/clang-rename/TemplateTypename.cpp

// Currently unsupported test. template <typename T /* Test 1 */> // CHECK: template <typename U /* Test 1 */>
// RUN: cat %s > %t.cpp class Foo {
// FIXME: clang-rename should be able to rename template parameters correctly. T foo(T arg, T& ref, T* /* Test 2 */ ptr) { // CHECK: U foo(U arg, U& ref, U* /* Test 2 */ ptr) {
T value; // CHECK: U value;
template <typename T>
T foo(T arg, T& ref, T* ptr) {
T value;
int number = 42; int number = 42;
value = (T)number; value = (T)number; // CHECK: value = (U)number;
value = static_cast<T>(number); value = static_cast<T /* Test 3 */>(number); // CHECK: value = static_cast<U /* Test 3 */>(number);
return value; return value;
} }
static void foo(T value) {} // CHECK: static void foo(U value) {}
T member; // CHECK: U member;
};
// Test 1.
// RUN: clang-rename -offset=19 -new-name=U %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=126 -new-name=U %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=392 -new-name=U %s -- -fno-delayed-template-parsing | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'T.*' <file>

test/clang-rename/TemplateTypenameFindByTemplateParam.cpp

  • This file was deleted.
template <typename T> // CHECK: template <typename U>
class Foo {
T foo(T arg, T& ref, T* ptr) { // CHECK: U foo(U arg, U& ref, U* ptr) {
T value; // CHECK: U value;
int number = 42;
value = (T)number; // CHECK: value = (U)number;
value = static_cast<T>(number); // CHECK: value = static_cast<U>(number);
return value;
}
static void foo(T value) {} // CHECK: static void foo(U value) {}
T member; // CHECK: U member;
};
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=19 -new-name=U %t.cpp -i -- -fno-delayed-template-parsing
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s

test/clang-rename/TemplateTypenameFindByTypeInside.cpp

  • This file was deleted.
template <typename T> // CHECK: template <typename U>
class Foo {
T foo(T arg, T& ref, T* ptr) { // CHECK: U foo(U arg, U& ref, U* ptr) {
T value; // CHECK: U value;
int number = 42;
value = (T)number; // CHECK: value = (U)number;
value = static_cast<T>(number); // CHECK: value = static_cast<U>(number);
return value;
}
static void foo(T value) {} // CHECK: static void foo(U value) {}
T member; // CHECK: U member;
};
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=99 -new-name=U %t.cpp -i -- -fno-delayed-template-parsing
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s

test/clang-rename/UserDefinedConversion.cpp

// RUN: cat %s > %t.cpp class Foo { /* Test 1 */ // CHECK: class Bar {
// RUN: clang-rename -offset=205 -new-name=Bar %t.cpp -i -- public:
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s Foo() {} // CHECK: Bar() {}
};
class Foo {}; // CHECK: class Bar {};
class Baz { class Baz {
operator Foo() const { // CHECK: operator Bar() const { public:
// offset ^ operator Foo() /* Test 2 */ const { // CHECK: operator Bar() /* Test 2 */ const {
Foo foo; // CHECK: Bar foo; Foo foo; // CHECK: Bar foo;
return foo; return foo;
} }
}; };
int main() {
Baz boo;
Foo foo = static_cast<Foo>(boo); // CHECK: Bar foo = static_cast<Bar>(boo);
return 0;
}
// Test 1.
// RUN: clang-rename -offset=7 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=164 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp

  • This file was deleted.
// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
class Foo { // CHECK: class Bar {
// ^ offset must be here
public:
Foo() {} // CHECK: Bar() {}
};
class Baz {
public:
operator Foo() const { // CHECK: operator Bar() const {
Foo foo; // CHECK: Bar foo;
return foo;
}
};
int main() {
Baz boo;
Foo foo = static_cast<Foo>(boo); // CHECK: Bar foo = static_cast<Bar>(boo);
return 0;
}
// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing
// this file.

test/clang-rename/Variable.cpp

// RUN: cat %s > %t.cpp
// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
namespace A { namespace A {
int Foo; // CHECK: int Bar; int Foo; /* Test 1 */ // CHECK: int Bar;
} }
int Foo; // CHECK: int Foo; int Foo; // CHECK: int Foo;
int Qux = Foo; // CHECK: int Qux = Foo; int Qux = Foo; // CHECK: int Qux = Foo;
int Baz = A::Foo; // CHECK: Baz = A::Bar; int Baz = A::Foo; /* Test 2 */ // CHECK: Baz = A::Bar;
void fun() { void fun() {
struct { struct {
int Foo; // CHECK: int Foo; int Foo; // CHECK: int Foo;
} b = {100}; } b = {100};
int Foo = 100; // CHECK: int Foo = 100; int Foo = 100; // CHECK: int Foo = 100;
Baz = Foo; // CHECK: Baz = Foo; Baz = Foo; // CHECK: Baz = Foo;
{ {
extern int Foo; // CHECK: extern int Foo; extern int Foo; // CHECK: extern int Foo;
Baz = Foo; // CHECK: Baz = Foo; Baz = Foo; // CHECK: Baz = Foo;
Foo = A::Foo + Baz; // CHECK: Foo = A::Bar + Baz; Foo = A::Foo /* Test 3 */ + Baz; // CHECK: Foo = A::Bar /* Test 3 */ + Baz;
A::Foo = b.Foo; // CHECK: A::Bar = b.Foo; A::Foo /* Test 4 */ = b.Foo; // CHECK: A::Bar /* Test 4 */ = b.Foo;
} }
Foo = b.Foo; // Foo = b.Foo; Foo = b.Foo; // Foo = b.Foo;
} }
// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=18 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=206 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=613 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 4.
// RUN: clang-rename -offset=688 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>

test/clang-rename/VariableMacro.cpp

// RUN: cat %s > %t.cpp #define Baz Foo // CHECK: #define Baz Bar
// RUN: clang-rename -offset=208 -new-name=Z %t.cpp -i --
// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
#define Y X // CHECK: #define Y Z
void foo(int value) {} void foo(int value) {}
void macro() { void macro() {
int X; // CHECK: int Z; int Foo; /* Test 1 */ // CHECK: int Bar;
X = 42; // CHECK: Z = 42; Foo = 42; /* Test 2 */ // CHECK: Bar = 42;
Y -= 0; Baz -= 0;
foo(X); // CHECK: foo(Z); foo(Foo); /* Test 3 */ // CHECK: foo(Bar);
foo(Y); foo(Baz);
} }
// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing // Test 1.
// this file. // RUN: clang-rename -offset=88 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 2.
// RUN: clang-rename -offset=129 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// Test 3.
// RUN: clang-rename -offset=191 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
// To find offsets after modifying the file, use:
// grep -Ubo 'Foo.*' <file>
test/clang-rename/UserDefinedConversion.cpp