Skip to content

Commit

Permalink
Rename helper functions, to be consistent with (una|bin)Semantic
Browse files Browse the repository at this point in the history
  • Loading branch information
@9rnsr
9rnsr committed Sep 2, 2015
1 parent 880f45d commit e3ddc90
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions src/optimize.c
View file
Expand Up @@ -184,37 +184,37 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
}

bool optimizeChildren(BinExp *e, int flags)
bool unaOptimize(UnaExp *e, int flags)
{
assert(e->e1);
assert(e->e2);
e->e1 = e->e1->optimize(flags);
e->e2 = e->e2->optimize(flags);
if (e->e1->op == TOKerror)
{
ret = e->e1;
return false;
}
else if (e->e2->op == TOKerror)
{
ret = e->e2;
return false;
}
else
{
return true;
}
}

bool optimizeChildren(UnaExp *e, int flags)
bool binOptimize(BinExp *e, int flags)
{
assert(e->e1);
assert(e->e2);
e->e1 = e->e1->optimize(flags);
e->e2 = e->e2->optimize(flags);
if (e->e1->op == TOKerror)
{
ret = e->e1;
return false;
}
else if (e->e2->op == TOKerror)
{
ret = e->e2;
return false;
}
else
{
return true;
Expand Down Expand Up @@ -299,13 +299,13 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
void visit(UnaExp *e)
{
//printf("UnaExp::optimize() %s\n", e->toChars());
if (!optimizeChildren(e, result))
if (!unaOptimize(e, result))
return;
}

void visit(NegExp *e)
{
if (!optimizeChildren(e, result))
if (!unaOptimize(e, result))
return;

if (e->e1->isConst() == 1)
Expand All @@ -316,7 +316,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(ComExp *e)
{
if (!optimizeChildren(e, result))
if (!unaOptimize(e, result))
return;

if (e->e1->isConst() == 1)
Expand All @@ -327,7 +327,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(NotExp *e)
{
if (!optimizeChildren(e, result))
if (!unaOptimize(e, result))
return;

if (e->e1->isConst() == 1)
Expand All @@ -338,7 +338,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(BoolExp *e)
{
if (!optimizeChildren(e, result))
if (!unaOptimize(e, result))
return;

if (e->e1->isConst() == 1)
Expand Down Expand Up @@ -690,7 +690,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("AddExp::optimize(%s)\n", e->toChars());

if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() && e->e2->isConst())
Expand All @@ -703,7 +703,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(MinExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() && e->e2->isConst())
Expand All @@ -718,7 +718,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("MulExp::optimize(result = %d) %s\n", result, e->toChars());

if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() == 1 && e->e2->isConst() == 1)
Expand All @@ -731,7 +731,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("DivExp::optimize(%s)\n", e->toChars());

if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() == 1 && e->e2->isConst() == 1)
Expand All @@ -742,7 +742,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(ModExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() == 1 && e->e2->isConst() == 1)
Expand All @@ -753,7 +753,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void shift_optimize(BinExp *e, UnionExp (*shift)(Type *, Expression *, Expression *))
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e2->isConst() == 1)
Expand Down Expand Up @@ -791,7 +791,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(AndExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() == 1 && e->e2->isConst() == 1)
Expand All @@ -800,7 +800,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(OrExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e2->op == TOKerror)
Expand All @@ -814,7 +814,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(XorExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->isConst() == 1 && e->e2->isConst() == 1)
Expand All @@ -823,7 +823,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)

void visit(PowExp *e)
{
if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

// Replace 1 ^^ x or 1.0^^x by (x, 1)
Expand Down Expand Up @@ -942,7 +942,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("ArrayLengthExp::optimize(result = %d) %s\n", result, e->toChars());

if (!optimizeChildren(e, WANTexpand))
if (!unaOptimize(e, WANTexpand))
return;

// CTFE interpret static immutable arrays (to get better diagnostics)
Expand Down Expand Up @@ -991,7 +991,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("IdentityExp::optimize(result = %d) %s\n", result, e->toChars());

if (!optimizeChildren(e, WANTvalue))
if (!binOptimize(e, WANTvalue))
return;

if ((e->e1->isConst() && e->e2->isConst()) ||
Expand Down Expand Up @@ -1194,7 +1194,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
{
//printf("CatExp::optimize(%d) %s\n", result, e->toChars());

if (!optimizeChildren(e, result))
if (!binOptimize(e, result))
return;

if (e->e1->op == TOKcat)
Expand Down

0 comments on commit e3ddc90

Please sign in to comment.