paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-30 19:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

compiler: compare enumerator operator "current" return type with the loop variable while searching for enumerator

Browse Source 
git-svn-id: trunk@15953 -
This commit is contained in:
paul 2010-09-09 08:22:13 +00:00
parent 22b4860dd7
commit 4718c88f8d
3 changed files with 60 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/nflw.pas
View File

@ -858,7 +858,7 @@ implementation
else
begin
// search for operator first
pd:=search_enumerator_operator(expr.resultdef);
pd:=search_enumerator_operator(expr.resultdef, hloopvar.resultdef);
// if there is no operator then search for class/object enumerator method
if (pd=nil) and (expr.resultdef.typ=objectdef) then
pd:=tobjectdef(expr.resultdef).search_enumerator_get;

39
compiler/symsym.pas
View File

@ -105,7 +105,7 @@ interface
function find_procdef_byoptions(ops:tprocoptions): Tprocdef;
function find_procdef_byprocvardef(d:Tprocvardef):Tprocdef;
function find_procdef_assignment_operator(fromdef,todef:tdef;var besteq:tequaltype):Tprocdef;
function find_procdef_enumerator_operator(typedef:tdef;var besteq:tequaltype):Tprocdef;
function find_procdef_enumerator_operator(fromdef,todef:tdef;var besteq:tequaltype):Tprocdef;
property ProcdefList:TFPObjectList read FProcdefList;
end;
@ -729,8 +729,7 @@ implementation
eq : tequaltype;
begin
{ This function will return the pprocdef of pprocsym that
is the best match for procvardef. When there are multiple
matches it returns nil.}
is the best match for fromdef and todef. }
result:=nil;
bestpd:=nil;
besteq:=te_incompatible;
@ -792,19 +791,19 @@ implementation
result:=bestpd;
end;
function Tprocsym.find_procdef_enumerator_operator(typedef:tdef;var besteq:tequaltype):Tprocdef;
function Tprocsym.find_procdef_enumerator_operator(fromdef,todef:tdef;var besteq:tequaltype):Tprocdef;
var
paraidx, realparamcount,
i, j : longint;
bestpd,
hpd,
pd : tprocdef;
current : tpropertysym;
convtyp : tconverttype;
eq : tequaltype;
begin
{ This function will return the pprocdef of pprocsym that
is the best match for procvardef. When there are multiple
matches it returns nil.}
is the best match for fromdef and todef. }
result:=nil;
bestpd:=nil;
besteq:=te_incompatible;
@ -813,6 +812,24 @@ implementation
pd:=tprocdef(ProcdefList[i]);
if (pd.owner.symtabletype=staticsymtable) and not pd.owner.iscurrentunit then
continue;
if not is_class_or_interface_or_object(pd.returndef) then
continue;
current := tpropertysym(tobjectdef(pd.returndef).search_enumerator_current);
if (current = nil) then
continue;
// compare current result def with the todef
if (equal_defs(todef, current.propdef) or
{ shortstrings of different lengths are ok as result }
(is_shortstring(todef) and is_shortstring(current.propdef))) and
{ the result type must be always really equal and not an alias,
if you mess with this code, check tw4093 }
((todef=current.propdef) or
(
not(df_unique in todef.defoptions) and
not(df_unique in current.propdef.defoptions)
)
) then
begin
paraidx:=0;
{ ignore vs_hidden parameters }
while (paraidx<pd.paras.count) and
@ -825,16 +842,15 @@ implementation
inc(realparamcount);
if (paraidx<pd.paras.count) and
assigned(pd.paras[paraidx]) and
(realparamcount = 1) and
is_class_or_interface_or_object(pd.returndef) then
(realparamcount = 1) then
begin
eq:=compare_defs_ext(typedef,tparavarsym(pd.paras[paraidx]).vardef,nothingn,convtyp,hpd,[]);
eq:=compare_defs_ext(fromdef,tparavarsym(pd.paras[paraidx]).vardef,nothingn,convtyp,hpd,[]);
{ alias? if yes, only l1 choice,
if you mess with this code, check tw4093 }
if (eq=te_exact) and
(typedef<>tparavarsym(pd.paras[paraidx]).vardef) and
((df_unique in typedef.defoptions) or
(fromdef<>tparavarsym(pd.paras[paraidx]).vardef) and
((df_unique in fromdef.defoptions) or
(df_unique in tparavarsym(pd.paras[paraidx]).vardef.defoptions)) then
eq:=te_convert_l1;
@ -851,6 +867,7 @@ implementation
end;
end;
end;
end;
result:=bestpd;
end;

6
compiler/symtable.pas
View File

@ -211,7 +211,7 @@ interface
function search_named_unit_globaltype(const unitname, typename: TIDString; throwerror: boolean): ttypesym;
function search_class_member(pd : tobjectdef;const s : string):tsym;
function search_assignment_operator(from_def,to_def:Tdef):Tprocdef;
function search_enumerator_operator(type_def:Tdef):Tprocdef;
function search_enumerator_operator(from_def,to_def:Tdef):Tprocdef;
function search_class_helper(pd : tobjectdef;const s : string; out srsym: tsym; out srsymtable: tsymtable):boolean;
function search_objc_method(const s : string; out srsym: tsym; out srsymtable: tsymtable):boolean;
{Looks for macro s (must be given in upper case) in the macrosymbolstack, }
@ -2181,7 +2181,7 @@ implementation
end;
function search_enumerator_operator(type_def:Tdef): Tprocdef;
function search_enumerator_operator(from_def,to_def:Tdef): Tprocdef;
var
sym : Tprocsym;
hashedid : THashedIDString;
@ -2204,7 +2204,7 @@ implementation
internalerror(200910241);
{ if the source type is an alias then this is only the second choice,
if you mess with this code, check tw4093 }
currpd:=sym.find_procdef_enumerator_operator(type_def,curreq);
currpd:=sym.find_procdef_enumerator_operator(from_def,to_def,curreq);
if curreq>besteq then
begin
besteq:=curreq;