qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-12-02 09:02:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[util] Correct element order for vector expressions

Browse source
This commit is contained in:
Bill Currie 2021-02-23 14:37:13 +09:00
parent cbc8ad271a
commit 0cd2ece38e
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libs/util/cexpr-parse.y
View file

@ -321,9 +321,22 @@ vector_expr (exprlist_t *list, exprctx_t *context)
{ {
exprlist_t *l; exprlist_t *l;
exprval_t *val = cexpr_value (&cexpr_vector, context); exprval_t *val = cexpr_value (&cexpr_vector, context);
float *vector = val->value;
int i; int i;
exprlist_t *rlist = 0;
// list is built in reverse order, so need to reverse it to make converting
// to an array easier
while (list) {
exprlist_t *t = list->next;
list->next = rlist;
rlist = list;
list = t;
}
list = rlist;
for (i = 0; i < 4 && list; i++, list = l) { for (i = 0; i < 4 && list; i++, list = l) {
exprval_t dst = { &cexpr_float, ((float *) val->value) + i }; exprval_t dst = { &cexpr_float, &vector[i] };
exprval_t *src = list->value; exprval_t *src = list->value;
binop_t *cast = cexpr_find_cast (&cexpr_float, src->type); binop_t *cast = cexpr_find_cast (&cexpr_float, src->type);
if (cast) { if (cast) {
@ -335,12 +348,12 @@ vector_expr (exprlist_t *list, exprctx_t *context)
l = list->next; l = list->next;
cmemfree (context->memsuper, list); cmemfree (context->memsuper, list);
} }
for ( ; i < 4; i++) {
((float *) val->value)[i] = 0;
}
if (i == 4 && list) { if (i == 4 && list) {
cexpr_error (context, "excess elements in vector expression"); cexpr_error (context, "excess elements in vector expression");
} }
for ( ; i < 4; i++) {
vector[i] = 0;
}
return val; return val;
} }