Commit e88dcaf3 by Zhenyao Mo Committed by Shannon Woods

Style violation cleanup for IntermTraverse.cpp

Per suggested by kbr in https://codereview.appspot.com/14366043/, we clean up the stype violation in a separate CL. BUG= TEST=no behavioral change TBR=kbr@chromium.org Review URL: https://codereview.appspot.com/14371043 Change-Id: I27e15f632eff3a9d0d22ae955b5a952793128661 Reviewed-on: https://chromium-review.googlesource.com/178991Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent c5a63124
......@@ -23,12 +23,12 @@
//
// Traversal functions for terminals are straighforward....
//
void TIntermSymbol::traverse(TIntermTraverser* it)
void TIntermSymbol::traverse(TIntermTraverser *it)
{
it->visitSymbol(this);
}
void TIntermConstantUnion::traverse(TIntermTraverser* it)
void TIntermConstantUnion::traverse(TIntermTraverser *it)
{
it->visitConstantUnion(this);
}
......@@ -36,59 +36,45 @@ void TIntermConstantUnion::traverse(TIntermTraverser* it)
//
// Traverse a binary node.
//
void TIntermBinary::traverse(TIntermTraverser* it)
void TIntermBinary::traverse(TIntermTraverser *it)
{
bool visit = true;
//
// visit the node before children if pre-visiting.
//
if(it->preVisit)
{
if (it->preVisit)
visit = it->visitBinary(PreVisit, this);
}
//
// Visit the children, in the right order.
//
if(visit)
if (visit)
{
it->incrementDepth();
if(it->rightToLeft)
{
if(right)
if (it->rightToLeft)
{
if (right)
right->traverse(it);
}
if(it->inVisit)
{
if (it->inVisit)
visit = it->visitBinary(InVisit, this);
}
if(visit && left)
{
if (visit && left)
left->traverse(it);
}
}
else
{
if(left)
{
if (left)
left->traverse(it);
}
if(it->inVisit)
{
if (it->inVisit)
visit = it->visitBinary(InVisit, this);
}
if(visit && right)
{
if (visit && right)
right->traverse(it);
}
}
it->decrementDepth();
}
......@@ -97,16 +83,14 @@ void TIntermBinary::traverse(TIntermTraverser* it)
// Visit the node after the children, if requested and the traversal
// hasn't been cancelled yet.
//
if(visit && it->postVisit)
{
if (visit && it->postVisit)
it->visitBinary(PostVisit, this);
}
}
//
// Traverse a unary node. Same comments in binary node apply here.
//
void TIntermUnary::traverse(TIntermTraverser* it)
void TIntermUnary::traverse(TIntermTraverser *it)
{
bool visit = true;
......@@ -126,63 +110,55 @@ void TIntermUnary::traverse(TIntermTraverser* it)
//
// Traverse an aggregate node. Same comments in binary node apply here.
//
void TIntermAggregate::traverse(TIntermTraverser* it)
void TIntermAggregate::traverse(TIntermTraverser *it)
{
bool visit = true;
if(it->preVisit)
{
if (it->preVisit)
visit = it->visitAggregate(PreVisit, this);
}
if(visit)
if (visit)
{
it->incrementDepth();
if(it->rightToLeft)
if (it->rightToLeft)
{
for(TIntermSequence::reverse_iterator sit = sequence.rbegin(); sit != sequence.rend(); sit++)
for (TIntermSequence::reverse_iterator sit = sequence.rbegin(); sit != sequence.rend(); sit++)
{
(*sit)->traverse(it);
if(visit && it->inVisit)
{
if(*sit != sequence.front())
if (visit && it->inVisit)
{
if (*sit != sequence.front())
visit = it->visitAggregate(InVisit, this);
}
}
}
}
else
{
for(TIntermSequence::iterator sit = sequence.begin(); sit != sequence.end(); sit++)
for (TIntermSequence::iterator sit = sequence.begin(); sit != sequence.end(); sit++)
{
(*sit)->traverse(it);
if(visit && it->inVisit)
{
if(*sit != sequence.back())
if (visit && it->inVisit)
{
if (*sit != sequence.back())
visit = it->visitAggregate(InVisit, this);
}
}
}
}
it->decrementDepth();
}
if(visit && it->postVisit)
{
if (visit && it->postVisit)
it->visitAggregate(PostVisit, this);
}
}
//
// Traverse a selection node. Same comments in binary node apply here.
//
void TIntermSelection::traverse(TIntermTraverser* it)
void TIntermSelection::traverse(TIntermTraverser *it)
{
bool visit = true;
......@@ -214,67 +190,51 @@ void TIntermSelection::traverse(TIntermTraverser* it)
//
// Traverse a loop node. Same comments in binary node apply here.
//
void TIntermLoop::traverse(TIntermTraverser* it)
void TIntermLoop::traverse(TIntermTraverser *it)
{
bool visit = true;
if(it->preVisit)
{
if (it->preVisit)
visit = it->visitLoop(PreVisit, this);
}
if(visit)
if (visit)
{
it->incrementDepth();
if(it->rightToLeft)
{
if(expr)
if (it->rightToLeft)
{
if (expr)
expr->traverse(it);
}
if(body)
{
if (body)
body->traverse(it);
}
if(cond)
{
if (cond)
cond->traverse(it);
}
}
else
{
if(cond)
{
if (cond)
cond->traverse(it);
}
if(body)
{
if (body)
body->traverse(it);
}
if(expr)
{
if (expr)
expr->traverse(it);
}
}
it->decrementDepth();
}
if(visit && it->postVisit)
{
if (visit && it->postVisit)
it->visitLoop(PostVisit, this);
}
}
//
// Traverse a branch node. Same comments in binary node apply here.
//
void TIntermBranch::traverse(TIntermTraverser* it)
void TIntermBranch::traverse(TIntermTraverser *it)
{
bool visit = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment