@@ -38,28 +38,28 @@ TEST(RefactoringCallbacksTest, ReplacesStmtsWithString) {
38
38
std::string Code = " void f() { int i = 1; }" ;
39
39
std::string Expected = " void f() { ; }" ;
40
40
ReplaceStmtWithText Callback (" id" , " ;" );
41
- expectRewritten (Code, Expected, id ( " id" , declStmt () ), Callback);
41
+ expectRewritten (Code, Expected, declStmt (). bind ( " id" ), Callback);
42
42
}
43
43
44
44
TEST (RefactoringCallbacksTest, ReplacesStmtsInCalledMacros) {
45
45
std::string Code = " #define A void f() { int i = 1; }\n A" ;
46
46
std::string Expected = " #define A void f() { ; }\n A" ;
47
47
ReplaceStmtWithText Callback (" id" , " ;" );
48
- expectRewritten (Code, Expected, id ( " id" , declStmt () ), Callback);
48
+ expectRewritten (Code, Expected, declStmt (). bind ( " id" ), Callback);
49
49
}
50
50
51
51
TEST (RefactoringCallbacksTest, IgnoresStmtsInUncalledMacros) {
52
52
std::string Code = " #define A void f() { int i = 1; }" ;
53
53
std::string Expected = " #define A void f() { int i = 1; }" ;
54
54
ReplaceStmtWithText Callback (" id" , " ;" );
55
- expectRewritten (Code, Expected, id ( " id" , declStmt () ), Callback);
55
+ expectRewritten (Code, Expected, declStmt (). bind ( " id" ), Callback);
56
56
}
57
57
58
58
TEST (RefactoringCallbacksTest, ReplacesInteger) {
59
59
std::string Code = " void f() { int i = 1; }" ;
60
60
std::string Expected = " void f() { int i = 2; }" ;
61
61
ReplaceStmtWithText Callback (" id" , " 2" );
62
- expectRewritten (Code, Expected, id ( " id " , expr (integerLiteral ())), Callback);
62
+ expectRewritten (Code, Expected, expr (integerLiteral ()). bind ( " id " ), Callback);
63
63
}
64
64
65
65
TEST (RefactoringCallbacksTest, ReplacesStmtWithStmt) {
@@ -68,38 +68,38 @@ TEST(RefactoringCallbacksTest, ReplacesStmtWithStmt) {
68
68
ReplaceStmtWithStmt Callback (" always-false" , " should-be" );
69
69
expectRewritten (
70
70
Code, Expected,
71
- id ( " always- false" ,
72
- conditionalOperator ( hasCondition ( cxxBoolLiteral ( equals ( false ))),
73
- hasFalseExpression ( id ( " should-be " , expr ()))) ),
71
+ conditionalOperator ( hasCondition ( cxxBoolLiteral ( equals ( false ))) ,
72
+ hasFalseExpression ( expr (). bind ( " should-be " )))
73
+ . bind ( " always-false " ),
74
74
Callback);
75
75
}
76
76
77
77
TEST (RefactoringCallbacksTest, ReplacesIfStmt) {
78
78
std::string Code = " bool a; void f() { if (a) f(); else a = true; }" ;
79
79
std::string Expected = " bool a; void f() { f(); }" ;
80
80
ReplaceIfStmtWithItsBody Callback (" id" , true );
81
- expectRewritten (
82
- Code, Expected,
83
- id ( " id " , ifStmt ( hasCondition ( implicitCastExpr ( hasSourceExpression (
84
- declRefExpr ( to ( varDecl ( hasName ( " a " )))))))) ),
85
- Callback);
81
+ expectRewritten (Code, Expected,
82
+ ifStmt ( hasCondition ( implicitCastExpr ( hasSourceExpression (
83
+ declRefExpr ( to ( varDecl ( hasName ( " a " ))))))))
84
+ . bind ( " id " ),
85
+ Callback);
86
86
}
87
87
88
88
TEST (RefactoringCallbacksTest, RemovesEntireIfOnEmptyElse) {
89
89
std::string Code = " void f() { if (false) int i = 0; }" ;
90
90
std::string Expected = " void f() { }" ;
91
91
ReplaceIfStmtWithItsBody Callback (" id" , false );
92
- expectRewritten (Code, Expected,
93
- id ( " id " , ifStmt ( hasCondition ( cxxBoolLiteral ( equals ( false ))))) ,
94
- Callback);
92
+ expectRewritten (
93
+ Code, Expected ,
94
+ ifStmt ( hasCondition ( cxxBoolLiteral ( equals ( false )))). bind ( " id " ), Callback);
95
95
}
96
96
97
97
TEST (RefactoringCallbacksTest, TemplateJustText) {
98
98
std::string Code = " void f() { int i = 1; }" ;
99
99
std::string Expected = " void f() { FOO }" ;
100
100
auto Callback = ReplaceNodeWithTemplate::create (" id" , " FOO" );
101
101
EXPECT_FALSE (Callback.takeError ());
102
- expectRewritten (Code, Expected, id ( " id" , declStmt () ), **Callback);
102
+ expectRewritten (Code, Expected, declStmt (). bind ( " id" ), **Callback);
103
103
}
104
104
105
105
TEST (RefactoringCallbacksTest, TemplateSimpleSubst) {
@@ -108,7 +108,7 @@ TEST(RefactoringCallbacksTest, TemplateSimpleSubst) {
108
108
auto Callback = ReplaceNodeWithTemplate::create (" decl" , " long x = ${init}" );
109
109
EXPECT_FALSE (Callback.takeError ());
110
110
expectRewritten (Code, Expected,
111
- id ( " decl " , varDecl (hasInitializer (id ( " init" , expr ( )))) ),
111
+ varDecl (hasInitializer (expr (). bind ( " init" ))). bind ( " decl " ),
112
112
**Callback);
113
113
}
114
114
@@ -119,7 +119,7 @@ TEST(RefactoringCallbacksTest, TemplateLiteral) {
119
119
" string x = \" $$-${init}\" " );
120
120
EXPECT_FALSE (Callback.takeError ());
121
121
expectRewritten (Code, Expected,
122
- id ( " decl " , varDecl (hasInitializer (id ( " init" , expr ( )))) ),
122
+ varDecl (hasInitializer (expr (). bind ( " init" ))). bind ( " decl " ),
123
123
**Callback);
124
124
}
125
125
0 commit comments