commit 0b2d2dcf95932306722aaffb227dfcc6671d0b2f
author Olli Etuaho <oetuaho@nvidia.com> Wed Nov 04 16:35:32 2015 +0200
committer Olli Etuaho <oetuaho@nvidia.com> Fri Nov 06 08:51:03 2015 +0000
tree b34af2a4ccc24daa517c3787f24493488dde8013
parent cdeafd20505e6f3cf1470cb29592f9092255b843

Move comma operator parsing to ParseContext

This change is pure refactoring. It will help with fixing comma operator
return value qualifier bug.

BUG=angleproject:911
BUG=angleproject:1201

Change-Id: I481c337adbaf789cc959c8a1106f99ad7275e1e5
Reviewed-on: https://chromium-review.googlesource.com/311170
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 03a4fd3..8e145c6 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -3746,6 +3746,20 @@
     return node;
 }
 
+TIntermTyped *TParseContext::addComma(TIntermTyped *left,
+                                      TIntermTyped *right,
+                                      const TSourceLoc &loc)
+{
+    TIntermTyped *node = intermediate.addComma(left, right, loc);
+    if (node == nullptr)
+    {
+        binaryOpError(loc, ",", left->getCompleteString(), right->getCompleteString());
+        recover();
+        return right;
+    }
+    return node;
+}
+
 TIntermBranch *TParseContext::addBranch(TOperator op, const TSourceLoc &loc)
 {
     switch (op)