refactored SkSL VarDeclaration handling

src/sksl/SkSLGLSLCodeGenerator.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
  
 #include "SkSLGLSLCodeGenerator.h"
 
 #include "string.h"
@@ skipping 295 matching lines @@
     fIndentation++;
     for (const auto& f : intf.fVariable.fType.fields()) {
         this->writeModifiers(f.fModifiers);
         this->writeType(*f.fType);
         this->writeLine(" " + f.fName + ";");
     }
     fIndentation--;
     this->writeLine("};");
 }
 
-void GLSLCodeGenerator::writeVarDeclaration(const VarDeclaration& decl) {
+void GLSLCodeGenerator::writeVarDeclarations(const VarDeclarations& decl) {
     ASSERT(decl.fVars.size() > 0);
-    this->writeModifiers(decl.fVars[0]->fModifiers);
+    this->writeModifiers(decl.fVars[0].fVar->fModifiers);
     this->writeType(decl.fBaseType);
     std::string separator = " ";
-    for (size_t i = 0; i < decl.fVars.size(); i++) {
-        ASSERT(decl.fVars[i]->fModifiers == decl.fVars[0]->fModifiers);
+    for (const auto& var : decl.fVars) {
+        ASSERT(var.fVar->fModifiers == decl.fVars[0].fVar->fModifiers);
         this->write(separator);
         separator = ", ";
-        this->write(decl.fVars[i]->fName);
-        for (const auto& size : decl.fSizes[i]) {
+        this->write(var.fVar->fName);
+        for (const auto& size : var.fSizes) {
             this->write("[");
             this->writeExpression(*size, kTopLevel_Precedence);
             this->write("]");
         }
-        if (decl.fValues[i]) {
+        if (var.fValue) {
             this->write(" = ");
-            this->writeExpression(*decl.fValues[i], kTopLevel_Precedence);
+            this->writeExpression(*var.fValue, kTopLevel_Precedence);
         }
     }
     this->write(";");
 }
 
 void GLSLCodeGenerator::writeStatement(const Statement& s) {
     switch (s.fKind) {
         case Statement::kBlock_Kind:
             this->writeBlock((Block&) s);
             break;
         case Statement::kExpression_Kind:
             this->writeExpression(*((ExpressionStatement&) s).fExpression, kTopLevel_Precedence);
             this->write(";");
             break;
         case Statement::kReturn_Kind: 
             this->writeReturnStatement((ReturnStatement&) s);
             break;
-        case Statement::kVarDeclaration_Kind:
-            this->writeVarDeclaration(*((VarDeclarationStatement&) s).fDeclaration);
+        case Statement::kVarDeclarations_Kind:
+            this->writeVarDeclarations(*((VarDeclarationsStatement&) s).fDeclaration);
             break;
         case Statement::kIf_Kind:
             this->writeIfStatement((IfStatement&) s);
             break;
         case Statement::kFor_Kind:
             this->writeForStatement((ForStatement&) s);
             break;
         case Statement::kWhile_Kind:
             this->writeWhileStatement((WhileStatement&) s);
             break;
@@ skipping 85 matching lines @@
     if (fCaps.fStandard == GLCaps::kGLES_Standard) {
         this->write(" es");
     }
     this->writeLine();
     for (const auto& e : program.fElements) {
         switch (e->fKind) {
             case ProgramElement::kExtension_Kind:
                 this->writeExtension((Extension&) *e);
                 break;
             case ProgramElement::kVar_Kind: {
-                VarDeclaration& decl = (VarDeclaration&) *e;
-                if (decl.fVars.size() > 0 && decl.fVars[0]->fModifiers.fLayout.fBuiltin == -1) {
-                    this->writeVarDeclaration(decl);
+                VarDeclarations& decl = (VarDeclarations&) *e;
+                if (decl.fVars.size() > 0 && 
+                    decl.fVars[0].fVar->fModifiers.fLayout.fBuiltin == -1) {
+                    this->writeVarDeclarations(decl);
                     this->writeLine();
                 }
                 break;
             }
             case ProgramElement::kInterfaceBlock_Kind:
                 this->writeInterfaceBlock((InterfaceBlock&) *e);
                 break;
             case ProgramElement::kFunction_Kind:
                 this->writeFunction((FunctionDefinition&) *e);
                 break;
             default:
                 printf("%s\n", e->description().c_str());
                 ABORT("unsupported program element");
         }
     }
     fOut = nullptr;
 }
 
 }