paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-13 14:39:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

codetools: fix for-in enumeration type. Issue #29192

Browse Source 
git-svn-id: trunk@50825 -
This commit is contained in:
ondrej 2015-12-15 21:04:06 +00:00
parent b285b769c4
commit 44119ab600
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/finddeclarationtool.pas
View File

@ -782,7 +782,7 @@ type
function FindEnumerationTypeOfSetType(SetTypeNode: TCodeTreeNode;
out Context: TFindContext): boolean;
function FindElementTypeOfArrayType(ArrayNode: TCodeTreeNode;
out ExprType: TExpressionType): boolean;
out ExprType: TExpressionType; AliasType: PFindContext): boolean;
function CheckOperatorEnumerator(Params: TFindDeclarationParams;
const FoundContext: TFindContext): TIdentifierFoundResult;
function CheckModifierEnumeratorCurrent({%H-}Params: TFindDeclarationParams;
@ -11619,9 +11619,9 @@ begin
end;
ctnRangedArrayType,ctnOpenArrayType:
if TermExprType.Context.Tool.FindElementTypeOfArrayType(
TermExprType.Context.Node,ExprType)
TermExprType.Context.Node,ExprType,@AliasType)
then begin
Result:=FindExprTypeAsString(ExprType,TermPos.StartPos);
Result:=FindExprTypeAsString(ExprType,TermPos.StartPos,@AliasType);
end;
else
RaiseTermHasNoIterator;
@ -11949,13 +11949,15 @@ begin
end;
function TFindDeclarationTool.FindElementTypeOfArrayType(
ArrayNode: TCodeTreeNode; out ExprType: TExpressionType): boolean;
ArrayNode: TCodeTreeNode; out ExprType: TExpressionType;
AliasType: PFindContext): boolean;
var
Params: TFindDeclarationParams;
p: LongInt;
begin
Result:=false;
ExprType:=CleanExpressionType;
AliasType^:=CleanFindContext;
if (ArrayNode=nil) then exit;
if (ArrayNode.Desc<>ctnOpenArrayType) and (ArrayNode.Desc<>ctnRangedArrayType)
then exit;
@ -11976,7 +11978,7 @@ begin
Params.ContextNode:=ArrayNode;
p:=CurPos.StartPos;
Params.SetIdentifier(Self,@Src[p],nil);
ExprType:=FindExpressionResultType(Params,p,-1);
ExprType:=FindExpressionResultType(Params,p,-1,AliasType);
Result:=true;
finally
Params.Free;