qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-05 17:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Respect parentheses when scattering sums

Browse source 
It may not be ideal at all times, but it does conform better with
general requirements for floating-point math.
This commit is contained in:
Bill Currie 2024-09-30 13:51:52 +09:00
parent 91febd50c6
commit b00d4d3b5b
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/qfcc/source/expr_algebra.c
View file

@ -450,10 +450,10 @@ count_terms (const expr_t *expr)
auto e1 = expr->expr.e1;
auto e2 = expr->expr.e2;
int terms = !is_sum (e1) + !is_sum (e2);
if (is_sum (e1)) {
if (!e1->paren && is_sum (e1)) {
terms += count_terms (expr->expr.e1);
}
if (is_sum (e2)) {
if (!e2->paren && is_sum (e2)) {
terms += count_terms (expr->expr.e2);
}
return terms;
@ -593,13 +593,13 @@ scatter_terms_core (const expr_t *sum,
bool subtract = (sum->expr.op == '-') ^ negative;
auto e1 = sum->expr.e1;
auto e2 = sum->expr.e2;
if (is_sum (e1)) {
if (!e1->paren && is_sum (e1)) {
scatter_terms_core (e1, adds, addind, subs, subind, negative);
}
if (is_sum (e2)) {
if (!e2->paren && is_sum (e2)) {
scatter_terms_core (e2, adds, addind, subs, subind, subtract);
}
if (!is_sum (e1)) {
if (e1->paren || !is_sum (e1)) {
auto e = sum->expr.e1;
auto arr = negative ^ is_neg (e) ? subs : adds;
auto ind = negative ^ is_neg (e) ? subind : addind;
@ -608,7 +608,7 @@ scatter_terms_core (const expr_t *sum,
}
arr[(*ind)++] = e;
}
if (!is_sum (e2)) {
if (e2->paren || !is_sum (e2)) {
auto e = sum->expr.e2;
auto arr = subtract ^ is_neg (e) ? subs : adds;
auto ind = subtract ^ is_neg (e) ? subind : addind;

2
tools/qfcc/source/expr_dag.c
View file

@ -58,7 +58,7 @@ edag_add_expr (const expr_t *expr)
}
for (size_t i = 0; i < expr_dag.size; i++) {
auto e = expr_dag.a[i];
if (e->type != expr->type) {
if (e->type != expr->type || e->paren != expr->paren) {
continue;
}
switch (expr->type) {

2
tools/qfcc/source/expr_optimize.c
View file

@ -1,7 +1,7 @@
/*
expr_optimize.c
algebraic expression optimization
algebraic expression optimization
Copyright (C) 2023 Bill Currie <bill@taniwha.org>