From 4c5c615f9561e774c43cca353a3a4025c9dfa774 Mon Sep 17 00:00:00 2001 From: "Wolfgang (Blub) Bumiller" Date: Tue, 14 Aug 2012 17:48:22 +0200 Subject: [PATCH] combine 2 ifs to shorten code a little --- parser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/parser.c b/parser.c index de62485..eedea46 100644 --- a/parser.c +++ b/parser.c @@ -613,13 +613,9 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy) break; case opid2('+','='): case opid2('-','='): - if (exprs[0]->expression.vtype != exprs[1]->expression.vtype) { - parseerror(parser, "invalid types used in expression: cannot add or subtract type %s and %s", - 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) { + if (exprs[0]->expression.vtype != exprs[1]->expression.vtype || + (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", type_name[exprs[0]->expression.vtype], type_name[exprs[1]->expression.vtype]);