combine 2 ifs to shorten code a little

This commit is contained in:
Wolfgang (Blub) Bumiller 2012-08-14 17:48:22 +02:00
parent 8dd7943768
commit 4c5c615f95

View file

@ -613,13 +613,9 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
break; break;
case opid2('+','='): case opid2('+','='):
case opid2('-','='): case opid2('-','='):
if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) { if (exprs[0]->expression.vtype != exprs[1]->expression.vtype ||
parseerror(parser, "invalid types used in expression: cannot add or subtract type %s and %s", (exprs[0]->expression.vtype != TYPE_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) )
type_name[exprs[0]->expression.vtype], {
type_name[exprs[1]->expression.vtype]);
return false;
}
if (exprs[0]->expression.vtype != TYPE_VECTOR && exprs[0]->expression.vtype != TYPE_FLOAT) {
parseerror(parser, "invalid types used in expression: cannot add or subtract type %s and %s", parseerror(parser, "invalid types used in expression: cannot add or subtract type %s and %s",
type_name[exprs[0]->expression.vtype], type_name[exprs[0]->expression.vtype],
type_name[exprs[1]->expression.vtype]); type_name[exprs[1]->expression.vtype]);