paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-01 23:39:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

* moved typechecking stuff from taddnode.simplify to taddnode.pass_typechec

Browse Source 
This is needed to be able to call simplify after pass_1, because
    otherwise the inserttypeconv's inserted new type conversions which
    where never firstpassed (if you want to do something like that, you
    have to return a new node as well so it will be firstpassed properly
    -- but in this case it seems this is not needed, since inserting
    those typeconversions are part of typechecking and not of simplifying,
    and typechecking must be done before simplifying anyway)

git-svn-id: trunk@6836 -
This commit is contained in:
Jonas Maebe 2007-03-13 23:17:12 +00:00
parent f07349a774
commit 31c29a280a
1 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
compiler/nadd.pas
View File

@ -151,50 +151,6 @@ implementation
b : boolean;
begin
result:=nil;
{ is one a real float, then both need to be floats, this
need to be done before the constant folding so constant
operation on a float and int are also handled }
resultrealdef:=pbestrealtype^;
if (right.resultdef.typ=floatdef) or (left.resultdef.typ=floatdef) then
begin
{ when both floattypes are already equal then use that
floattype for results }
if (right.resultdef.typ=floatdef) and
(left.resultdef.typ=floatdef) and
(tfloatdef(left.resultdef).floattype=tfloatdef(right.resultdef).floattype) then
resultrealdef:=left.resultdef
{ when there is a currency type then use currency, but
only when currency is defined as float }
else
if (is_currency(right.resultdef) or
is_currency(left.resultdef)) and
((s64currencytype.typ = floatdef) or
(nodetype <> slashn)) then
begin
resultrealdef:=s64currencytype;
inserttypeconv(right,resultrealdef);
inserttypeconv(left,resultrealdef);
end
else
begin
resultrealdef:=getbestreal(left.resultdef,right.resultdef);
inserttypeconv(right,resultrealdef);
inserttypeconv(left,resultrealdef);
end;
end;
{ If both operands are constant and there is a widechar
or widestring then convert everything to widestring. This
allows constant folding like char+widechar }
if is_constnode(right) and is_constnode(left) and
(is_widestring(right.resultdef) or
is_widestring(left.resultdef) or
is_widechar(right.resultdef) or
is_widechar(left.resultdef)) then
begin
inserttypeconv(right,cwidestringtype);
inserttypeconv(left,cwidestringtype);
end;
{ load easier access variables }
rd:=right.resultdef;
@ -748,6 +704,51 @@ implementation
end;
end;
{ is one a real float, then both need to be floats, this
need to be done before the constant folding so constant
operation on a float and int are also handled }
resultrealdef:=pbestrealtype^;
if (right.resultdef.typ=floatdef) or (left.resultdef.typ=floatdef) then
begin
{ when both floattypes are already equal then use that
floattype for results }
if (right.resultdef.typ=floatdef) and
(left.resultdef.typ=floatdef) and
(tfloatdef(left.resultdef).floattype=tfloatdef(right.resultdef).floattype) then
resultrealdef:=left.resultdef
{ when there is a currency type then use currency, but
only when currency is defined as float }
else
if (is_currency(right.resultdef) or
is_currency(left.resultdef)) and
((s64currencytype.typ = floatdef) or
(nodetype <> slashn)) then
begin
resultrealdef:=s64currencytype;
inserttypeconv(right,resultrealdef);
inserttypeconv(left,resultrealdef);
end
else
begin
resultrealdef:=getbestreal(left.resultdef,right.resultdef);
inserttypeconv(right,resultrealdef);
inserttypeconv(left,resultrealdef);
end;
end;
{ If both operands are constant and there is a widechar
or widestring then convert everything to widestring. This
allows constant folding like char+widechar }
if is_constnode(right) and is_constnode(left) and
(is_widestring(right.resultdef) or
is_widestring(left.resultdef) or
is_widechar(right.resultdef) or
is_widechar(left.resultdef)) then
begin
inserttypeconv(right,cwidestringtype);
inserttypeconv(left,cwidestringtype);
end;
result:=simplify;
if assigned(result) then
exit;