Apple-2gs-SW/ORCA-C
1
0
Fork 0
mirror of https://github.com/byteworksinc/ORCA-C.git synced 2024-05-28 12:41:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug where constant expressions involving unsigned int and signed long operands would be evaluated as unsigned long.

Browse Source 
The following example demonstrates the problem:

#include <stdio.h>
int main (void)
{
	printf("%i\n", -5L < 10U); /* should print "1" */
}
This commit is contained in:
Stephen Heumann 2016-12-19 00:24:47 -06:00
parent b6b2121a9e
commit 018f5a7548
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Expression.pas
View File

@ -862,7 +862,7 @@ var
op1,op2: longint; {for evaluating constant expressions}
rop1,rop2: double; {for evaluating double expressions}
tp: typePtr; {cast type}
unsigned, unsigned1: boolean; {is the term unsigned?}
unsigned: boolean; {is the term unsigned?}
function Pop: tokenPtr;
@ -917,14 +917,9 @@ var
IntVal := token.ival
else if token.kind = uintconst then begin
IntVal := token.ival & $0000FFFF;
unsigned := true;
end {else if}
else if token.kind = longconst then begin
else {if token.kind in [longconst,ulongconst] then} begin
IntVal := token.lval;
end {else if}
else begin
IntVal := token.lval;
unsigned := true;
end; {else}
end; {IntVal}
@ -1018,12 +1013,9 @@ var
ekind := intconst;
{evaluate a constant operation}
unsigned := false;
unsigned := ekind in [uintconst,ulongconst];
op1 := IntVal(op^.left^.token);
unsigned1 := unsigned;
unsigned := false;
op2 := IntVal(op^.right^.token);
unsigned := unsigned or unsigned1;
dispose(op^.right);
op^.right := nil;
dispose(op^.left);
@ -1077,7 +1069,7 @@ var
ekind := kindLeft;
end;
gtgtop : begin {>>}
if unsigned1 then
if kindLeft in [uintconst,ulongconst] then
op1 := lshr(op1,op2)
else
op1 := op1 >> op2;