commit 2a4952dcce25d03af095ae2e65c3172355f405c1
author Ethan Nicholas <ethannicholas@google.com> Thu Oct 08 15:35:56 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 09 13:17:33 2020 +0000
tree 334071b3eb9289ee25291096a3d14c2dc1a5fd84
parent c0d69153893f867c3dd418cc1d34e671a88cfff2

refactored more SkSL IRNodes

Change-Id: Iab04e4915715bad56b795993022b24a137339daf
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324125
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLMetalCodeGenerator.cpp

diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index b4ae66c..fbeff90 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -719,9 +719,9 @@
 }
 
 void MetalCodeGenerator::writeIndexExpression(const IndexExpression& expr) {
-    this->writeExpression(*expr.fBase, kPostfix_Precedence);
+    this->writeExpression(*expr.base(), kPostfix_Precedence);
     this->write("[");
-    this->writeExpression(*expr.fIndex, kTopLevel_Precedence);
+    this->writeExpression(*expr.index(), kTopLevel_Precedence);
     this->write("]");
 }
 
@@ -1339,9 +1339,9 @@
 
 void MetalCodeGenerator::writeWhileStatement(const WhileStatement& w) {
     this->write("while (");
-    this->writeExpression(*w.fTest, kTopLevel_Precedence);
+    this->writeExpression(*w.test(), kTopLevel_Precedence);
     this->write(") ");
-    this->writeStatement(*w.fStatement);
+    this->writeStatement(*w.statement());
 }
 
 void MetalCodeGenerator::writeDoStatement(const DoStatement& d) {
@@ -1378,9 +1378,9 @@
 
 void MetalCodeGenerator::writeReturnStatement(const ReturnStatement& r) {
     this->write("return");
-    if (r.fExpression) {
+    if (r.expression()) {
         this->write(" ");
-        this->writeExpression(*r.fExpression, kTopLevel_Precedence);
+        this->writeExpression(*r.expression(), kTopLevel_Precedence);
     }
     this->write(";");
 }
@@ -1706,7 +1706,7 @@
         }
         case Expression::Kind::kIndex: {
             const IndexExpression& idx = e->as<IndexExpression>();
-            return this->requirements(idx.fBase.get()) | this->requirements(idx.fIndex.get());
+            return this->requirements(idx.base().get()) | this->requirements(idx.index().get());
         }
         case Expression::Kind::kPrefix:
             return this->requirements(e->as<PrefixExpression>().fOperand.get());
@@ -1762,7 +1762,7 @@
             return this->requirements(s->as<ExpressionStatement>().expression().get());
         case Statement::Kind::kReturn: {
             const ReturnStatement& r = s->as<ReturnStatement>();
-            return this->requirements(r.fExpression.get());
+            return this->requirements(r.expression().get());
         }
         case Statement::Kind::kIf: {
             const IfStatement& i = s->as<IfStatement>();
@@ -1779,8 +1779,8 @@
         }
         case Statement::Kind::kWhile: {
             const WhileStatement& w = s->as<WhileStatement>();
-            return this->requirements(w.fTest.get()) |
-                   this->requirements(w.fStatement.get());
+            return this->requirements(w.test().get()) |
+                   this->requirements(w.statement().get());
         }
         case Statement::Kind::kDo: {
             const DoStatement& d = s->as<DoStatement>();