paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 12:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* only convert widechar to widestring when both operands are

Browse Source 
constant
  * support widechar-widechar operations in orddef part
This commit is contained in:
peter 2004-05-23 14:08:39 +00:00
parent cd81fa77ea
commit 324144db92
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
compiler/nadd.pas
View File

@ -215,16 +215,17 @@ implementation
end; end;
end; end;
{ if one operand is a widechar or a widestring, both operands } { If both operands are constant and there is a widechar
{ are converted to widestring. This must be done before constant } or widestring then convert everything to widestring. This
{ folding to allow char+widechar etc. } allows constant folding like char+widechar }
if is_widestring(right.resulttype.def) or if is_constnode(right) and is_constnode(left) and
is_widestring(left.resulttype.def) or (is_widestring(right.resulttype.def) or
is_widechar(right.resulttype.def) or is_widestring(left.resulttype.def) or
is_widechar(left.resulttype.def) then is_widechar(right.resulttype.def) or
is_widechar(left.resulttype.def)) then
begin begin
inserttypeconv(right,cwidestringtype); inserttypeconv(right,cwidestringtype);
inserttypeconv(left,cwidestringtype); inserttypeconv(left,cwidestringtype);
end; end;
{ load easier access variables } { load easier access variables }
@ -737,6 +738,25 @@ implementation
end; end;
end; end;
end end
{ There is a widechar? }
else if is_widechar(rd) or is_widechar(ld) then
begin
{ widechar+widechar gives widestring }
if nodetype=addn then
begin
inserttypeconv(left,cwidestringtype);
if (torddef(rd).typ<>uwidechar) then
inserttypeconv(right,cwidechartype);
resulttype:=cwidestringtype;
end
else
begin
if (torddef(ld).typ<>uwidechar) then
inserttypeconv(left,cwidechartype);
if (torddef(rd).typ<>uwidechar) then
inserttypeconv(right,cwidechartype);
end;
end
{ is there a currency type ? } { is there a currency type ? }
else if ((torddef(rd).typ=scurrency) or (torddef(ld).typ=scurrency)) then else if ((torddef(rd).typ=scurrency) or (torddef(ld).typ=scurrency)) then
begin begin
@ -1957,7 +1977,12 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.120 2004-05-21 13:08:14 florian Revision 1.121 2004-05-23 14:08:39 peter
* only convert widechar to widestring when both operands are
constant
* support widechar-widechar operations in orddef part
Revision 1.120 2004/05/21 13:08:14 florian
* fixed <ordinal>+<pointer> * fixed <ordinal>+<pointer>
Revision 1.119 2004/05/20 21:54:33 florian Revision 1.119 2004/05/20 21:54:33 florian