commit 856c497e47988e69afaf17ebec3d8c9d02e340c7
author Olli Etuaho <oetuaho@nvidia.com> Mon Aug 08 11:38:39 2016 +0300
committer Commit Bot <commit-bot@chromium.org> Mon Aug 15 07:31:59 2016 +0000
tree c4f575675c0d7240223b919f21ffd440210cdeec
parent 9371f7ab298e6f50c655760fc9dcbe2e6370199a

Clarify error checking function names in the GLSL parser

Most error checking functions in ParseContext used to follow a format
like <property>ErrorCheck. Sometimes this function would check that
the node/value would have <property>, sometimes it would check that
the node/value would not have it, which was confusing. Change most of
these functions to use a lot more descriptive names, which clearly
communicate what they are checking for.

Also includes a bit of refactoring in constructorErrorCheck(), so that
the function only checks for errors rather than also setting the type
of the constructor node.

Also make TType::arraySize unsigned, and return a sanitized size from
checkIsValidArraySize() instead of using an output parameter.

BUG=angleproject:911
TEST=angle_unittests

Change-Id: Id9767b8c79594ad3f782f801ea68eb96df721a31
Reviewed-on: https://chromium-review.googlesource.com/367070
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/VariableInfo.cpp

diff --git a/src/compiler/translator/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
index 5cc2b84..7e1e5cd 100644
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -477,7 +477,7 @@
     attribute.type = GLVariableType(type);
     attribute.precision = GLVariablePrecision(type);
     attribute.name = variable->getSymbol().c_str();
-    attribute.arraySize = static_cast<unsigned int>(type.getArraySize());
+    attribute.arraySize  = type.getArraySize();
     attribute.mappedName = TIntermTraverser::hash(variable->getSymbol(), mHashFunction).c_str();
     attribute.location = variable->getType().getLayoutQualifier().location;
 
@@ -497,7 +497,7 @@
     attribute.type       = GLVariableType(type);
     attribute.precision  = GLVariablePrecision(type);
     attribute.name       = variable->getSymbol().c_str();
-    attribute.arraySize  = static_cast<unsigned int>(type.getArraySize());
+    attribute.arraySize  = type.getArraySize();
     attribute.mappedName = TIntermTraverser::hash(variable->getSymbol(), mHashFunction).c_str();
     attribute.location   = variable->getType().getLayoutQualifier().location;