mirror of
https://github.com/ZDoom/gzdoom.git
synced 2025-02-17 01:31:25 +00:00
Add signed->unsigned promotion for binary operators
The C-style rules for integer promotion are that when you have a signed int and an unsigned int, if you can't promote to a wider type, then the signed type is promoted to an unsigned type.
This commit is contained in:
parent
15c5728f01
commit
7ce29fe855
1 changed files with 13 additions and 0 deletions
|
@ -2685,6 +2685,19 @@ bool FxBinary::Promote(FCompileContext &ctx, bool forceint)
|
||||||
{
|
{
|
||||||
ValueType = TypeUInt32;
|
ValueType = TypeUInt32;
|
||||||
}
|
}
|
||||||
|
// If one side is an unsigned 32-bit int and the other side is a signed 32-bit int, the signed side is implicitly converted to unsigned.
|
||||||
|
else if (!ctx.FromDecorate && left->ValueType == TypeUInt32 && right->ValueType == TypeSInt32)
|
||||||
|
{
|
||||||
|
right = new FxIntCast(right, false, false, true);
|
||||||
|
right = right->Resolve(ctx);
|
||||||
|
ValueType = TypeUInt32;
|
||||||
|
}
|
||||||
|
else if (!ctx.FromDecorate && left->ValueType == TypeSInt32 && right->ValueType == TypeUInt32)
|
||||||
|
{
|
||||||
|
left = new FxIntCast(left, false, false, true);
|
||||||
|
left = left->Resolve(ctx);
|
||||||
|
ValueType = TypeUInt32;
|
||||||
|
}
|
||||||
else if (left->IsInteger() && right->IsInteger())
|
else if (left->IsInteger() && right->IsInteger())
|
||||||
{
|
{
|
||||||
ValueType = TypeSInt32; // Addition and subtraction forces all integer-derived types to signed int.
|
ValueType = TypeSInt32; // Addition and subtraction forces all integer-derived types to signed int.
|
||||||
|
|
Loading…
Reference in a new issue