darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-23 20:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

*= and /= operators

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-23 14:24:58 +01:00
parent 5867167a70
commit 553f3df5df
3 changed files with 63 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
parser.c
View file

@ -971,6 +971,50 @@ static bool parser_sy_pop(parser_t *parser, shunt *sy)
return false;
};
break;
case opid2('*','='):
case opid2('/','='):
if (exprs[1]->expression.vtype != TYPE_FLOAT ||
!(exprs[0]->expression.vtype == TYPE_FLOAT ||
exprs[0]->expression.vtype == TYPE_VECTOR))
{
ast_type_to_string(exprs[0], ty1, sizeof(ty1));
ast_type_to_string(exprs[1], ty2, sizeof(ty2));
parseerror(parser, "invalid types used in expression: %s and %s",
ty1, ty2);
return false;
}
if (ast_istype(exprs[0], ast_entfield))
assignop = type_storep_instr[exprs[0]->expression.vtype];
else
assignop = type_store_instr[exprs[0]->expression.vtype];
switch (exprs[0]->expression.vtype) {
case TYPE_FLOAT:
out = (ast_expression*)ast_binstore_new(ctx, assignop,
(op->id == opid2('*','=') ? INSTR_MUL_F : INSTR_DIV_F),
exprs[0], exprs[1]);
break;
case TYPE_VECTOR:
if (op->id == opid2('*','=')) {
out = (ast_expression*)ast_binstore_new(ctx, assignop, INSTR_MUL_VF,
exprs[0], exprs[1]);
} else {
/* there's no DIV_VF */
out = (ast_expression*)ast_binary_new(ctx, INSTR_DIV_F,
(ast_expression*)parser_const_float_1(parser),
exprs[1]);
if (!out)
return false;
out = (ast_expression*)ast_binstore_new(ctx, assignop, INSTR_MUL_VF,
exprs[0], out);
}
break;
default:
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;
};
break;
}
#undef NotSameType

18
tests/operators.qc
View file

@ -1,6 +1,7 @@
void print(...) = #1;
string ftos (float) = #2;
entity() spawn = #3;
void print(...) = #1;
string ftos (float) = #2;
string vtos (vector) = #5;
entity spawn() = #3;
.float mem;
@ -39,4 +40,15 @@ void main() {
// postfix on members
print(ftos(e.mem--), " = ");
print(ftos(e.mem+1), "\n");
// compounds in general
a = 3;
print(ftos(a *= 2), " = 6\n");
print(ftos(a /= 2), " = 3\n");
// compounds on vectors
vector v;
v = '3 4 5';
print(vtos(v *= 2), " = '6 8 10'\n");
print(vtos(v /= 2), " = '3 4 5'\n");
}

4
tests/operators.tmpl
View file

@ -12,3 +12,7 @@ M: 11 = 11
M: 4
M: 2
M: 12 = 12
M: 6 = 6
M: 3 = 3
M: '6 8 10' = '6 8 10'
M: '3 4 5' = '3 4 5'