Fix style issues in updateTree()

"entry" is an old C keyword, so it's better not to use it as a variable name. Also fix a few other minor style issues in the code. TEST=angle_unittests BUG=angleproject:941 Change-Id: I59470555227985262b3e914ff6ca11e88d15fd8c Reviewed-on: https://chromium-review.googlesource.com/265647Tested-by: Olli Etuaho <oetuaho@nvidia.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix style issues in updateTree()
cd94ef96 · Olli Etuaho · 87717702 · cd94ef96
Commit cd94ef96 authored Apr 16, 2015 by Olli Etuaho
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

IntermNode.cpp src/compiler/translator/IntermNode.cpp +9 -9

No files found.
--- a/src/compiler/translator/IntermNode.cpp
+++ b/src/compiler/translator/IntermNode.cpp
@@ -1211,23 +1211,23 @@ void TIntermTraverser::updateTree()
 {
    for (size_t ii = 0; ii < mReplacements.size(); ++ii)
    {
-        const NodeUpdateEntry& entry = mReplacements[ii];
+        const NodeUpdateEntry &replacement = mReplacements[ii];
-        ASSERT(entry.parent);
+        ASSERT(replacement.parent);
-        bool replaced = entry.parent->replaceChildNode(
+        bool replaced = replacement.parent->replaceChildNode(
-            entry.original, entry.replacement);
+            replacement.original, replacement.replacement);
        ASSERT(replaced);
-        if (!entry.originalBecomesChildOfReplacement)
+        if (!replacement.originalBecomesChildOfReplacement)
        {
            // In AST traversing, a parent is visited before its children.
-            // After we replace a node, if an immediate child is to
+            // After we replace a node, if its immediate child is to
            // be replaced, we need to make sure we don't update the replaced
            // node; instead, we update the replacement node.
            for (size_t jj = ii + 1; jj < mReplacements.size(); ++jj)
            {
-                NodeUpdateEntry& entry2 = mReplacements[jj];
+                NodeUpdateEntry &replacement2 = mReplacements[jj];
-                if (entry2.parent == entry.original)
+                if (replacement2.parent == replacement.original)
-                    entry2.parent = entry.replacement;
+                    replacement2.parent = replacement.replacement;
            }
        }
    }