@@ -78,7 +78,7 @@ class MergeSampleUsageVisitor : public ProgramVisitor {
78
78
79
79
SampleUsage visit (const Program& program) {
80
80
fUsage = SampleUsage (); // reset to none
81
- this -> INHERITED ::visit (program);
81
+ INHERITED::visit (program);
82
82
return fUsage ;
83
83
}
84
84
@@ -125,7 +125,7 @@ class MergeSampleUsageVisitor : public ProgramVisitor {
125
125
}
126
126
}
127
127
128
- return this -> INHERITED ::visitExpression (e);
128
+ return INHERITED::visitExpression (e);
129
129
}
130
130
131
131
using INHERITED = ProgramVisitor;
@@ -141,7 +141,7 @@ class BuiltinVariableVisitor : public ProgramVisitor {
141
141
const VariableReference& var = e.as <VariableReference>();
142
142
return var.fVariable ->fModifiers .fLayout .fBuiltin == fBuiltin ;
143
143
}
144
- return this -> INHERITED ::visitExpression (e);
144
+ return INHERITED::visitExpression (e);
145
145
}
146
146
147
147
int fBuiltin ;
@@ -160,17 +160,17 @@ class NodeCountVisitor : public ProgramVisitor {
160
160
161
161
bool visitExpression (const Expression& e) override {
162
162
++fCount ;
163
- return this -> INHERITED ::visitExpression (e);
163
+ return INHERITED::visitExpression (e);
164
164
}
165
165
166
166
bool visitProgramElement (const ProgramElement& p) override {
167
167
++fCount ;
168
- return this -> INHERITED ::visitProgramElement (p);
168
+ return INHERITED::visitProgramElement (p);
169
169
}
170
170
171
171
bool visitStatement (const Statement& s) override {
172
172
++fCount ;
173
- return this -> INHERITED ::visitStatement (s);
173
+ return INHERITED::visitStatement (s);
174
174
}
175
175
176
176
private:
@@ -197,7 +197,7 @@ class VariableWriteVisitor : public ProgramVisitor {
197
197
return true ;
198
198
}
199
199
}
200
- return this -> INHERITED ::visitExpression (e);
200
+ return INHERITED::visitExpression (e);
201
201
}
202
202
203
203
private:
@@ -254,7 +254,6 @@ bool ProgramVisitor::visitExpression(const Expression& e) {
254
254
case Expression::Kind::kBoolLiteral :
255
255
case Expression::Kind::kDefined :
256
256
case Expression::Kind::kExternalValue :
257
- case Expression::Kind::kFieldAccess :
258
257
case Expression::Kind::kFloatLiteral :
259
258
case Expression::Kind::kFunctionReference :
260
259
case Expression::Kind::kIntLiteral :
@@ -279,6 +278,8 @@ bool ProgramVisitor::visitExpression(const Expression& e) {
279
278
if (this ->visitExpression (*arg)) { return true ; }
280
279
}
281
280
return false ; }
281
+ case Expression::Kind::kFieldAccess :
282
+ return this ->visitExpression (*e.as <FieldAccess>().fBase );
282
283
case Expression::Kind::kFunctionCall : {
283
284
const FunctionCall& c = e.as <FunctionCall>();
284
285
for (const auto & arg : c.fArguments ) {
0 commit comments