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

[qfcc] Tighten up type_promotes

Browse source 
Mainly to prevent promotion between different vector and matrix sizes,
but also to be consistent in that double doesn't promote to itself (same
as other scalar types). Also fix up type_rows and type_cols for matrices
and make type_assignable, type_promotes, and type_compatible null-safe
(always false if either src or dst is null).
This commit is contained in:
Bill Currie 2024-08-11 14:37:10 +09:00
parent d0a9e1f54f
commit cd973c6809
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tools/qfcc/source/type.c
View file

@ -1370,6 +1370,10 @@ is_structural (const type_t *type)
int int
type_compatible (const type_t *dst, const type_t *src) type_compatible (const type_t *dst, const type_t *src)
{ {
if (!dst || !src) {
return 0;
}
// same type // same type
if (dst == src) { if (dst == src) {
return 1; return 1;
@ -1389,7 +1393,9 @@ type_compatible (const type_t *dst, const type_t *src)
int int
type_assignable (const type_t *dst, const type_t *src) type_assignable (const type_t *dst, const type_t *src)
{ {
int ret; if (!dst || !src) {
return 0;
}
dst = unalias_type (dst); dst = unalias_type (dst);
src = unalias_type (src); src = unalias_type (src);
@ -1423,7 +1429,7 @@ type_assignable (const type_t *dst, const type_t *src)
// pointer = pointer // pointer = pointer
// give the object system first shot because the pointee types might have // give the object system first shot because the pointee types might have
// protocols attached. // protocols attached.
ret = obj_types_assignable (dst, src); int ret = obj_types_assignable (dst, src);
// ret < 0 means obj_types_assignable can't decide // ret < 0 means obj_types_assignable can't decide
if (ret >= 0) if (ret >= 0)
return ret; return ret;
@ -1443,8 +1449,16 @@ type_assignable (const type_t *dst, const type_t *src)
int int
type_promotes (const type_t *dst, const type_t *src) type_promotes (const type_t *dst, const type_t *src)
{ {
if (!dst || !src) {
return 0;
}
dst = unalias_type (dst); dst = unalias_type (dst);
src = unalias_type (src); src = unalias_type (src);
if (type_rows (dst) != type_rows (src)
|| type_cols (dst) != type_cols (src)) {
return 0;
}
// nothing promotes to int // nothing promotes to int
if (is_int (dst)) { if (is_int (dst)) {
return 0; return 0;
@ -1462,8 +1476,9 @@ type_promotes (const type_t *dst, const type_t *src)
return 1; return 1;
} }
//XXX what to do with (u)long<->float? //XXX what to do with (u)long<->float?
// everything promotes to double if (is_double (dst)
if (is_double (dst)) { && (is_int (src) || is_uint (src) || is_long (src) || is_ulong (src)
|| is_float (src))) {
return 1; return 1;
} }
return 0; return 0;
@ -1561,23 +1576,20 @@ int
type_cols (const type_t *type) type_cols (const type_t *type)
{ {
if (is_matrix (type)) { if (is_matrix (type)) {
return 0; //FIXME type = unalias_type (type);
return type->columns;
} else { } else {
// non-matrices have only 1 column // non-matrices have only 1 column
return type_width (type); return 1;
} }
} }
int int
type_rows (const type_t *type) type_rows (const type_t *type)
{ {
if (is_matrix (type)) { // vectors are vertical (includes vector and quaternion), other types
return 0; //FIXME // have width of 1, thus rows == width
} else { return type_width (type);
// vectors are vertical (includes vector and quaternion), other types
// have width of 1, thus rows == width
return type_width (type);
}
} }
int int