darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-24 04:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

allow vec/float

Browse source
This commit is contained in:
Wolfgang Bumiller 2013-01-13 20:49:16 +01:00
parent e0504ce482
commit 3d62cb37f1
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
parser.c
View file

@ -921,16 +921,39 @@ static bool parser_sy_apply_operator(parser_t *parser, shunt *sy)
}; };
break; break;
case opid1('/'): case opid1('/'):
if (NotSameType(TYPE_FLOAT)) { if (exprs[1]->expression.vtype != TYPE_FLOAT) {
compile_error(ctx, "invalid types used in expression: cannot divide types %s and %s", ast_type_to_string(exprs[0], ty1, sizeof(ty1));
type_name[exprs[0]->expression.vtype], ast_type_to_string(exprs[1], ty2, sizeof(ty2));
type_name[exprs[1]->expression.vtype]); compile_error(ctx, "invalid types used in expression: cannot divide tyeps %s and %s", ty1, ty2);
return false; return false;
} }
if (CanConstFold(exprs[0], exprs[1])) if (exprs[0]->expression.vtype == TYPE_FLOAT) {
out = (ast_expression*)parser_const_float(parser, ConstF(0) / ConstF(1)); if (CanConstFold(exprs[0], exprs[1]))
out = (ast_expression*)parser_const_float(parser, ConstF(0) / ConstF(1));
else
out = (ast_expression*)ast_binary_new(ctx, INSTR_DIV_F, exprs[0], exprs[1]);
}
else if (exprs[0]->expression.vtype == TYPE_VECTOR) {
if (CanConstFold(exprs[0], exprs[1]))
out = (ast_expression*)parser_const_vector(parser, vec3_mulvf(ConstV(0), 1.0/ConstF(1)));
else {
out = (ast_expression*)ast_binary_new(ctx, INSTR_DIV_F,
(ast_expression*)parser_const_float_1(parser),
exprs[1]);
if (!out) {
compile_error(ctx, "internal error: failed to generate division");
return false;
}
out = (ast_expression*)ast_binary_new(ctx, INSTR_MUL_VF, exprs[0], out);
}
}
else else
out = (ast_expression*)ast_binary_new(ctx, INSTR_DIV_F, exprs[0], exprs[1]); {
ast_type_to_string(exprs[0], ty1, sizeof(ty1));
ast_type_to_string(exprs[1], ty2, sizeof(ty2));
compile_error(ctx, "invalid types used in expression: cannot divide tyeps %s and %s", ty1, ty2);
return false;
}
break; break;
case opid1('%'): case opid1('%'):
case opid2('%','='): case opid2('%','='):