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

* fixed assignment operator checking for typecast

Browse Source
This commit is contained in:
peter 2003-01-03 17:16:04 +00:00
parent 69ec4efe4d
commit 8b2dbde7c8
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compiler/defcmp.pas
View File

@ -947,16 +947,6 @@ implementation
begin begin
doconv:=tc_intf_2_guid; doconv:=tc_intf_2_guid;
eq:=te_convert_l1; eq:=te_convert_l1;
end
else
begin
{ assignment overwritten ?? }
if check_operator then
begin
operatorpd:=assignment_overloaded(def_from,def_to);
if assigned(operatorpd) then
eq:=te_convert_operator;
end;
end; end;
end; end;
@ -967,17 +957,7 @@ implementation
else else
{ Just about everything can be converted to a formaldef...} { Just about everything can be converted to a formaldef...}
if not (def_from.deftype in [abstractdef,errordef]) then if not (def_from.deftype in [abstractdef,errordef]) then
eq:=te_convert_l1 eq:=te_convert_l1;
else
begin
{ assignment overwritten ?? }
if check_operator then
begin
operatorpd:=assignment_overloaded(def_from,def_to);
if assigned(operatorpd) then
eq:=te_convert_operator;
end;
end;
end; end;
end; end;
@ -985,8 +965,8 @@ implementation
there is a variant involved then we search also the := operator } there is a variant involved then we search also the := operator }
if (eq=te_incompatible) and if (eq=te_incompatible) and
check_operator and check_operator and
((def_from.deftype=variantdef) or ((def_from.deftype in [objectdef,recorddef,arraydef,stringdef,variantdef]) or
(def_to.deftype=variantdef)) then (def_to.deftype in [objectdef,recorddef,arraydef,stringdef,variantdef])) then
begin begin
operatorpd:=assignment_overloaded(def_from,def_to); operatorpd:=assignment_overloaded(def_from,def_to);
if assigned(operatorpd) then if assigned(operatorpd) then
@ -1198,7 +1178,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.13 2002-12-29 18:15:19 peter Revision 1.14 2003-01-03 17:16:04 peter
* fixed assignment operator checking for typecast
Revision 1.13 2002/12/29 18:15:19 peter
* varargs is not checked in proc->procvar for delphi * varargs is not checked in proc->procvar for delphi
Revision 1.12 2002/12/29 14:57:50 peter Revision 1.12 2002/12/29 14:57:50 peter