paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 02:49:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: ctnGenericParam changed form compatible to exact, bug #15317

Browse Source 
git-svn-id: trunk@23087 -
This commit is contained in:
mattias 2009-12-11 21:32:05 +00:00
parent 1b68eafebe
commit 842f26f8f3
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/codetools/finddeclarationtool.pas
View File

@ -7730,6 +7730,13 @@ begin
// same base type // same base type
Result:=tcExact; Result:=tcExact;
end end
else if (TargetContext.Node.Desc=ctnGenericParameter)
or ((ExpressionType.Desc=xtContext)
and (ExpressionType.Context.Node.Desc=ctnGenericParameter))
then begin
// generic type is always preferred
Result:=tcExact;
end
else if (TargetContext.Node.Desc=ctnSetType) then begin else if (TargetContext.Node.Desc=ctnSetType) then begin
{$IFDEF ShowExprEval} {$IFDEF ShowExprEval}
DebugLn('[TFindDeclarationTool.IsCompatible] TargetContext.Node.Desc=ctnSetType', DebugLn('[TFindDeclarationTool.IsCompatible] TargetContext.Node.Desc=ctnSetType',
@ -7769,12 +7776,18 @@ function TFindDeclarationTool.IsCompatible(TargetType,
ExpressionType: TExpressionType; Params: TFindDeclarationParams ExpressionType: TExpressionType; Params: TFindDeclarationParams
): TTypeCompatibility; ): TTypeCompatibility;
begin begin
if TargetType.Desc=xtContext then if TargetType.Desc=xtContext then begin
if TargetType.Context.Node.Desc=ctnGenericParameter then
exit(tcExact);
TargetType:=TargetType.Context.Tool.ConvertNodeToExpressionType( TargetType:=TargetType.Context.Tool.ConvertNodeToExpressionType(
TargetType.Context.Node,Params); TargetType.Context.Node,Params);
if ExpressionType.Desc=xtContext then end;
if ExpressionType.Desc=xtContext then begin
if ExpressionType.Context.Node.Desc=ctnGenericParameter then
exit(tcExact);
ExpressionType:=ExpressionType.Context.Tool.ConvertNodeToExpressionType( ExpressionType:=ExpressionType.Context.Tool.ConvertNodeToExpressionType(
ExpressionType.Context.Node,Params); ExpressionType.Context.Node,Params);
end;
Result:=IsBaseCompatible(TargetType,ExpressionType,Params); Result:=IsBaseCompatible(TargetType,ExpressionType,Params);
end; end;
@ -7996,6 +8009,12 @@ begin
' ExpressionType=',ExprTypeToString(ExpressionType)); ' ExpressionType=',ExprTypeToString(ExpressionType));
{$ENDIF} {$ENDIF}
Result:=tcIncompatible; Result:=tcIncompatible;
if (TargetType.Desc=xtContext)
and (TargetType.Context.Node.Desc=ctnGenericParameter) then
exit(tcExact);
if (ExpressionType.Desc=xtContext)
and (ExpressionType.Context.Node.Desc=ctnGenericParameter) then
exit(tcExact);
if (TargetType.Desc=ExpressionType.Desc) then begin if (TargetType.Desc=ExpressionType.Desc) then begin
case TargetType.Desc of case TargetType.Desc of