paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 11:06:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't allow int64->real for delphi mode

Browse Source
This commit is contained in:
peter 2001-09-02 21:15:34 +00:00
parent eb92d4bdd6
commit d1d504ac2d
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
compiler/types.pas
View File

@ -265,15 +265,16 @@ implementation
constint, constint,
constbool, constbool,
constchar, constchar,
constpointer,
constord : constord :
equal_constsym:=(sym1.value=sym2.value); equal_constsym:=(sym1.valueord=sym2.valueord);
constpointer :
equal_constsym:=(sym1.valueordptr=sym2.valueordptr);
conststring,constresourcestring : conststring,constresourcestring :
begin begin
if sym1.len=sym2.len then if sym1.len=sym2.len then
begin begin
p1:=pchar(tpointerord(sym1.value)); p1:=pchar(sym1.valueptr);
p2:=pchar(tpointerord(sym2.value)); p2:=pchar(sym2.valueptr);
pend:=p1+sym1.len; pend:=p1+sym1.len;
while (p1<pend) do while (p1<pend) do
begin begin
@ -287,9 +288,9 @@ implementation
end; end;
end; end;
constreal : constreal :
equal_constsym:=(pbestreal(tpointerord(sym1.value))^=pbestreal(tpointerord(sym2.value))^); equal_constsym:=(pbestreal(sym1.valueptr)^=pbestreal(sym2.valueptr)^);
constset : constset :
equal_constsym:=(pnormalset(tpointerord(sym1.value))^=pnormalset(tpointerord(sym2.value))^); equal_constsym:=(pnormalset(sym1.valueptr)^=pnormalset(sym2.valueptr)^);
constnil : constnil :
equal_constsym:=true; equal_constsym:=true;
end; end;
@ -1389,8 +1390,13 @@ implementation
begin { ordinal to real } begin { ordinal to real }
if is_integer(def_from) then if is_integer(def_from) then
begin begin
doconv:=tc_int_2_real; { in delphi int64 can not be converted to real }
b:=1; if not((m_tp in aktmodeswitches) and
(torddef(def_from).typ in [u64bit,s64bit])) then
begin
doconv:=tc_int_2_real;
b:=1;
end;
end; end;
end; end;
floatdef : floatdef :
@ -1777,7 +1783,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.45 2001-08-19 21:11:21 florian Revision 1.46 2001-09-02 21:15:34 peter
* don't allow int64->real for delphi mode
Revision 1.45 2001/08/19 21:11:21 florian
* some bugs fix: * some bugs fix:
- overload; with external procedures fixed - overload; with external procedures fixed
- better selection of routine to do an overloaded - better selection of routine to do an overloaded